diff options
| author | Harshavardhana <harsha@harshavardhana.net> | 2014-04-24 17:09:24 -0700 |
|---|---|---|
| committer | Anand Avati <avati@redhat.com> | 2014-04-25 12:02:30 -0700 |
| commit | 841ac48b413f0e108d25af36429568b6d34dab39 (patch) | |
| tree | 02819717e5f40e944c0807c3fa79e7dd37f51b9f | |
| parent | 500a656c91558dd7913f572369f20b8550e9e98d (diff) | |
osx: Compilation fixes
Change-Id: I822936cbeb4ec8af46be8e94644ea666b919ae5c
BUG: 1089172
Signed-off-by: Harshavardhana <harsha@harshavardhana.net>
Reviewed-on: http://review.gluster.org/7556
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Avati <avati@redhat.com>
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | xlators/mount/fuse/src/Makefile.am | 4 |
2 files changed, 11 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 9cc45a41e86..ae945b29109 100644 --- a/configure.ac +++ b/configure.ac @@ -672,6 +672,7 @@ fi AC_SUBST(ARGP_STANDALONE_CPPFLAGS) AC_SUBST(ARGP_STANDALONE_LDADD) +AC_SUBST(ARGP_STANDALONE_DIR) AC_CHECK_HEADER([malloc.h], AC_DEFINE(HAVE_MALLOC_H, 1, [have malloc.h])) @@ -695,7 +696,6 @@ if test "x${have_posix_fallocate}" = "xyes"; then AC_DEFINE(HAVE_POSIX_FALLOCATE, 1, [define if posix_fallocate exists]) fi - # Check the distribution where you are compiling glusterfs on GF_DISTRIBUTION= @@ -884,7 +884,7 @@ case $host_os in LDFLAGS="-L`${PYTHON}-config --prefix`/lib `${PYTHON}-config --ldflags`" ;; darwin*) - CFLAGS="`${PYTHON}-config --cflags` -Wno-error=unused-command-line-argument-hard-error-in-future" + CFLAGS="`${PYTHON}-config --cflags`" CPPFLAGS=$CFLAGS LDFLAGS="-L`${PYTHON}-config --prefix`/lib `${PYTHON}-config --ldflags`" ;; @@ -932,6 +932,12 @@ CFLAGS=$saved_CFLAGS CPPFLAGS=$saved_CPPFLAGS LDFLAGS=$saved_LDFLAGS +case $host_os in + darwin*) + BUILD_GLUPY=no + ;; +esac + if test "x$BUILD_GLUPY" = "xyes"; then BUILD_PYTHON_INC=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_inc()"` BUILD_PYTHON_LIB=python$PYTHON_VERSION diff --git a/xlators/mount/fuse/src/Makefile.am b/xlators/mount/fuse/src/Makefile.am index 653121d18f6..7d1f93447bf 100644 --- a/xlators/mount/fuse/src/Makefile.am +++ b/xlators/mount/fuse/src/Makefile.am @@ -1,7 +1,9 @@ noinst_HEADERS_linux = $(CONTRIBDIR)/fuse-include/fuse_kernel.h\ $(CONTRIBDIR)/fuse-include/mount_util.h\ $(CONTRIBDIR)/fuse-lib/mount-gluster-compat.h -noinst_HEADERS_darwin = $(CONTRIBDIR)/fuse-include/fuse_kernel_macfuse.h +noinst_HEADERS_darwin = $(CONTRIBDIR)/fuse-include/fuse_kernel_macfuse.h\ + $(CONTRIBDIR)/macfuse/fuse_param.h\ + $(CONTRIBDIR)/macfuse/fuse_ioctl.h noinst_HEADERS_common = $(CONTRIBDIR)/fuse-include/fuse-mount.h\ $(CONTRIBDIR)/fuse-include/fuse-misc.h fuse-mem-types.h \ fuse-bridge.h |