Branch b1_6

[fs/lustre-release.git] / build / autoconf / lustre-build.m4

diff --git a/build/autoconf/lustre-build.m4 b/build/autoconf/lustre-build.m4
index efd894c..51780bc 100644 (file)
--- a/build/autoconf/lustre-build.m4
+++ b/build/autoconf/lustre-build.m4
@@ -357,26 +357,17 @@ AM_CONDITIONAL(POSIX_OSD_ENABLED, test x$posix_osd = xyes)
 
 #
 # LB_PATH_DMU
-# Support for --with-dmu
 #
 AC_DEFUN([LB_PATH_DMU],
 [AC_MSG_CHECKING([whether to enable DMU])
-AC_ARG_WITH([dmu],
-       AC_HELP_STRING([--with-dmu=path],
-                      [set path to a DMU tree (default is included zfs-lustre)]),
-       [
-               DMU_SRC=$with_dmu
-       ],
-       [
-               DMU_SRC="$PWD/zfs-lustre"
-       ])
 if test x$enable_uoss = xyes -a x$enable_posix_osd != xyes; then
+       DMU_SRC="$PWD/lustre/zfs-lustre"
        AC_DEFINE(DMU_OSD, 1, Enable DMU OSD)
        AC_MSG_RESULT([yes])
        LB_CHECK_FILE([$DMU_SRC/src/.patched],[],[
                AC_MSG_ERROR([A complete (patched) DMU tree was not found.])
        ])
-       AC_CONFIG_SUBDIRS(zfs-lustre)
+       AC_CONFIG_SUBDIRS(lustre/zfs-lustre)
        dmu_osd='yes'
 else
        AC_MSG_RESULT([no])
@@ -602,12 +593,19 @@ if test $ac_cv_sizeof_unsigned_long_long != 8 ; then
         AC_MSG_ERROR([** we assume that sizeof(long long) == 8.  Tell phil@clusterfs.com])
 fi
 
+if test $target_cpu == "powerpc64"; then
+       AC_MSG_WARN([set compiler with -m64])
+       CFLAGS="$CFLAGS -m64"
+       CC="$CC -m64"
+fi
+
 CPPFLAGS="-I\$(top_builddir)/$LIBCFS_INCLUDE_DIR -I\$(top_srcdir)/$LIBCFS_INCLUDE_DIR-I\$(top_builddir)/lnet/include -I\$(top_srcdir)/lnet/include -I\$(top_builddir)/lustre/include -I\$(top_srcdir)/lustre/include $CPPFLAGS"
 
 LLCPPFLAGS="-D__arch_lib__ -D_LARGEFILE64_SOURCE=1"
 AC_SUBST(LLCPPFLAGS)
 
-LLCFLAGS="-g -Wall -fPIC"
+# Add _GNU_SOURCE for strnlen on linux
+LLCFLAGS="-g -Wall -fPIC -D_GNU_SOURCE"
 AC_SUBST(LLCFLAGS)
 
 # everyone builds against lnet and lustre
@@ -696,7 +694,7 @@ LC_CONFIG_CLIENT_SERVER
 # three macros for cmd3 
 LC_CONFIG_SPLIT
 LC_CONFIG_LDISKFS
-LIBCFS_CONFIG_CDEBUG
+LN_CONFIG_CDEBUG
 
 LB_CONFIG_MODULES