AC_CONFIG_SUBDIRS(ldiskfs)
])
+# Define no libcfs by default.
+AC_DEFUN([LB_LIBCFS_DIR],
+[
+case x$libcfs_is_module in
+ xyes)
+ LIBCFS_INCLUDE_DIR="libcfs/include"
+ LIBCFS_SUBDIR="libcfs"
+ ;;
+ x*)
+ LIBCFS_INCLUDE_DIR="lnet/include"
+ LIBCFS_SUBDIR=""
+ ;;
+esac
+AC_SUBST(LIBCFS_SUBDIR)
+AC_SUBST(LIBCFS_INCLUDE_DIR)
+])
+
#
# LB_DEFINE_LDISKFS_OPTIONS
#
#
# 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])
AC_MSG_ERROR([** we assume that sizeof(long long) == 8. Tell phil@clusterfs.com])
fi
-CPPFLAGS="-I\$(top_builddir)/libcfs/include -I\$(top_srcdir)/libcfs/include -I\$(top_builddir)/lnet/include -I\$(top_srcdir)/lnet/include -I\$(top_builddir)/lustre/include -I\$(top_srcdir)/lustre/include $CPPFLAGS"
+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
-EXTRA_KCFLAGS="$EXTRA_KCFLAGS -g -I$PWD/libcfs/include -I$PWD/lnet/include -I$PWD/lustre/include"
+EXTRA_KCFLAGS="$EXTRA_KCFLAGS -g -I$PWD/$LIBCFS_INCLUDE_DIR -I$PWD/lnet/include -I$PWD/lustre/include"
AC_SUBST(EXTRA_KCFLAGS)
])
AC_DEFUN([LB_CONFIGURE],
[LB_CANONICAL_SYSTEM
+LB_LIBCFS_DIR
+
LB_INCLUDE_RULES
LB_CONFIG_CRAY_XT3
# three macros for cmd3
LC_CONFIG_SPLIT
LC_CONFIG_LDISKFS
-LIBCFS_CONFIG_CDEBUG
+LN_CONFIG_CDEBUG
LB_CONFIG_MODULES
LS_CONFIGURE
fi
+
LB_CONDITIONALS
LB_CONFIG_HEADERS