darwin*)
lb_target_os="darwin"
;;
- solaris2.11*)
+ solaris*)
lb_target_os="SunOS"
;;esac
AC_SUBST(lb_target_os)
])
#
+# LB_PATH_LUSTREIOKIT
+#
+# Handle internal/external lustre-iokit
+#
+AC_DEFUN([LB_PATH_LUSTREIOKIT],
+[AC_ARG_WITH([],
+ AC_HELP_STRING([--with-lustre-iokit=path],
+ [set path to lustre-iokit source (default is included lustre-iokit)]),
+ [],[
+ with_lustre_iokit='yes'
+ ])
+AC_MSG_CHECKING([location of lustre-iokit])
+enable_lustre_iokit="$with_lustre_iokit"
+case x$with_lustre_iokit in
+ xyes)
+ AC_MSG_RESULT([internal])
+ LB_CHECK_FILE([$srcdir/lustre-iokit/ior-survey/ior-survey],[],[
+ AC_MSG_ERROR([A complete internal lustre-iokit was not found.])
+ ])
+ LUSTREIOKIT_SUBDIR="lustre-iokit"
+ LUSTREIOKIT="$PWD/lustre-iokit"
+ ;;
+ xno)
+ AC_MSG_RESULT([disabled])
+ ;;
+ *)
+ AC_MSG_RESULT([$with_lustre_iokit])
+ LB_CHECK_FILE([$with_lustre_iokit/ior-survey/ior_survey],[],[
+ AC_MSG_ERROR([A complete (built) external lustre-iokit was not found.])
+ ])
+ LUSTREIOKIT="$with_lustre_iokit"
+ with_lustre_iokit="yes"
+ ;;
+esac
+AC_SUBST(LUSTREIOKIT_SUBDIR)
+# We have to configure even if we don't build here for make dist to work
+AC_CONFIG_SUBDIRS(lustre-iokit)
+])
+
+#
# LB_PATH_LDISKFS
#
# Handle internal/external ldiskfs
esac
AC_SUBST(LDISKFS_DIR)
AC_SUBST(LDISKFS_SUBDIR)
+AM_CONDITIONAL(LDISKFS_ENABLED, test x$with_ldiskfs != xno)
# We have to configure even if we don't build here for make dist to work
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
#
fi
])
-
#
-# LB_PATH_DMU
-# Support for --with-dmu
+# Support for --enable-uoss
#
-AC_DEFUN([LB_PATH_DMU],
-[AC_ARG_WITH([dmu],
- AC_HELP_STRING([--with-dmu=path],
- [set path to a built dmu]),
- [
- DMU_SRC=$with_dmu
- enable_dmu_osd=yes
- ],
- [
- enable_dmu_osd=no
- DMU_SRC=""
- ])
-AC_MSG_RESULT([$dmu])
-if test x$enable_dmu_osd != xno; then
- AC_DEFINE(ENABLE_DMU, 1, Enable DMU OSD)
- AC_DEFINE(DMU_OSD, 1, Enable DMU OSD)
- AC_DEFINE(UOSS_SUPPORT, 1, Enable user-level OSS)
- AC_DEFINE(LUSTRE_ULEVEL_MT, 1, Multi-threaded user-level lustre port)
+AC_DEFUN([LB_UOSS],
+[AC_MSG_CHECKING([whether to enable uoss])
+AC_ARG_ENABLE([uoss],
+ AC_HELP_STRING([--enable-uoss],
+ [enable userspace OSS]),
+ [enable_uoss='yes'],[enable_uoss='no'])
+AC_MSG_RESULT([$enable_uoss])
+if test x$enable_uoss = xyes; then
+ AC_DEFINE(UOSS_SUPPORT, 1, Enable user-level OSS)
+ AC_DEFINE(LUSTRE_ULEVEL_MT, 1, Multi-threaded user-level lustre port)
+ enable_uoss='yes'
enable_ulevel_mt='yes'
- enable_modules='no'
+ enable_modules='no'
enable_client='no'
enable_tests='no'
enable_liblustre='no'
- with_ldiskfs=no
+ with_ldiskfs='no'
fi
-AC_SUBST(DMU_SRC)
+AC_SUBST(enable_uoss)
])
#
-# Support for --enable-posix-dmu
+# Support for --enable-posix-osd
#
AC_DEFUN([LB_POSIX_OSD],
-[AC_MSG_CHECKING([whether to posix osd])
+[AC_MSG_CHECKING([whether to enable posix osd])
AC_ARG_ENABLE([posix-osd],
AC_HELP_STRING([--enable-posix-osd],
[enable using of posix osd]),
[enable_posix_osd='yes'],[enable_posix_osd='no'])
AC_MSG_RESULT([$enable_posix_osd])
-if test x$enable_posix_osd != xno; then
- AC_DEFINE(POSIX_OSD, 1, Enable POSIX OSD)
- AC_DEFINE(UOSS_SUPPORT, 1, Enable user-level OSS)
- AC_DEFINE(LUSTRE_ULEVEL_MT, 1, Multi-threaded user-level lustre port)
- enable_ulevel_mt='yes'
- enable_modules='no'
- enable_client='no'
- enable_tests='no'
- enable_liblustre='no'
- with_ldiskfs=no
+if test x$enable_uoss = xyes -a x$enable_posix_osd = xyes ; then
+ AC_DEFINE(POSIX_OSD, 1, Enable POSIX OSD)
+ posix_osd='yes'
+fi
+AM_CONDITIONAL(POSIX_OSD_ENABLED, test x$posix_osd = xyes)
+])
+
+#
+# LB_PATH_DMU
+#
+AC_DEFUN([LB_PATH_DMU],
+[AC_MSG_CHECKING([whether to enable DMU])
+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(lustre/zfs-lustre)
+ dmu_osd='yes'
+else
+ AC_MSG_RESULT([no])
fi
+AC_SUBST(DMU_SRC)
+AM_CONDITIONAL(DMU_OSD_ENABLED, test x$dmu_osd = xyes)
])
#
case $target_os in
linux*)
LB_PROG_LINUX
+ LIBCFS_PROG_LINUX
LN_PROG_LINUX
LC_PROG_LINUX
;;
darwin*)
LB_PROG_DARWIN
+ LIBCFS_PROG_DARWIN
;;
*)
# This is strange - Lustre supports a target we don't
docdir='${datadir}/doc/$(PACKAGE)'
AC_SUBST(docdir)
+LIBCFS_PATH_DEFAULTS
LN_PATH_DEFAULTS
LC_PATH_DEFAULTS
AC_MSG_ERROR([** we assume that sizeof(long long) == 8. Tell phil@clusterfs.com])
fi
-# FIXME
-AC_CHECK_DECL([__i386__], [], [
-
-if test x$enable_bgl != xyes; then
-AC_MSG_CHECKING([if $CC accepts -m64])
-CC_save="$CC"
-CC="$CC -m64"
-AC_TRY_COMPILE([],[],[
- AC_MSG_RESULT([yes])
-],[
- AC_MSG_RESULT([no])
- CC="$CC_save"
-])
+if test $target_cpu == "powerpc64"; then
+ AC_MSG_WARN([set compiler with -m64])
+ CFLAGS="$CFLAGS -m64"
+ CC="$CC -m64"
fi
-])
-
-CPPFLAGS="-I\$(top_builddir)/lnet/include -I\$(top_srcdir)/lnet/include -I\$(top_builddir)/lustre/include -I\$(top_srcdir)/lustre/include $CPPFLAGS"
+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/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)
])
LB_LINUX_CONDITIONALS
LB_DARWIN_CONDITIONALS
+LIBCFS_CONDITIONALS
LN_CONDITIONALS
LC_CONDITIONALS
])
AC_DEFUN([LB_CONFIGURE],
[LB_CANONICAL_SYSTEM
+LB_LIBCFS_DIR
+
LB_INCLUDE_RULES
LB_CONFIG_CRAY_XT3
LB_PROG_CC
-LB_PATH_DMU
+LB_UOSS
LB_POSIX_OSD
+LB_PATH_DMU
LB_CONFIG_DOCS
LB_CONFIG_UTILS
LB_PATH_LIBSYSIO
LB_PATH_SNMP
LB_PATH_LDISKFS
+LB_PATH_LUSTREIOKIT
LC_CONFIG_LIBLUSTRE
+LIBCFS_CONFIGURE
LN_CONFIGURE
LC_CONFIGURE
LS_CONFIGURE
fi
+
LB_CONDITIONALS
LB_CONFIG_HEADERS
+LIBCFS_CONFIG_FILES
LB_CONFIG_FILES
LN_CONFIG_FILES
LC_CONFIG_FILES
AC_SUBST(ac_configure_args)
-MOSTLYCLEANFILES='.*.cmd .*.flags *.o *.ko *.mod.c .depend .*.1.*'
+MOSTLYCLEANFILES='.*.cmd .*.flags *.o *.ko *.mod.c .depend .*.1.* Modules.symvers Module.symvers'
AC_SUBST(MOSTLYCLEANFILES)
AC_OUTPUT
git://git.whamcloud.com / fs / lustre-release.git / blobdiff