darwin*)
lb_target_os="darwin"
;;
-esac
+ solaris2.11*)
+ lb_target_os="SunOS"
+ ;;esac
AC_SUBST(lb_target_os)
])
;;
esac
-# We have to configure even if we don't build here for make dist to
-# work
+# We have to configure even if we don't build here for make dist to work
AC_CONFIG_SUBDIRS(libsysio)
])
#
-# LB_PATH_CRAY_PORTALS
+# LB_PATH_LDISKFS
#
-# Support for external Cray portals
+# Handle internal/external ldiskfs
#
-AC_DEFUN([LB_PATH_CRAY_PORTALS],
-[LB_ARG_LIBS_INCLUDES([Cray Portals],[cray-portals])
+AC_DEFUN([LB_PATH_LDISKFS],
+[AC_ARG_WITH([ldiskfs],
+ AC_HELP_STRING([--with-ldiskfs=path],
+ [set path to ldiskfs source (default is included ldiskfs)]),
+ [],[
+ if test x$linux25$enable_server = xyesyes ; then
+ with_ldiskfs=yes
+ else
+ with_ldiskfs=no
+ fi
+ ])
+AC_MSG_CHECKING([location of ldiskfs])
+case x$with_ldiskfs in
+ xyes)
+ AC_MSG_RESULT([internal])
+ LB_CHECK_FILE([$srcdir/ldiskfs/lustre-ldiskfs.spec.in],[],[
+ AC_MSG_ERROR([A complete internal ldiskfs was not found.])
+ ])
+ LDISKFS_SUBDIR="ldiskfs"
+ LDISKFS_DIR="$PWD/ldiskfs"
+ ;;
+ xno)
+ AC_MSG_RESULT([disabled])
+ ;;
+ *)
+ AC_MSG_RESULT([$with_ldiskfs])
+ LB_CHECK_FILE([$with_ldiskfs/ldiskfs/linux/ldiskfs_fs.h],[],[
+ AC_MSG_ERROR([A complete (built) external ldiskfs was not found.])
+ ])
+ LDISKFS_DIR=$with_ldiskfs
+ ;;
+esac
+AC_SUBST(LDISKFS_DIR)
+AC_SUBST(LDISKFS_SUBDIR)
-if test x$cray_portals_includes != x ; then
- if test ! -r $cray_portals_includes/portals/api.h ; then
- AC_MSG_ERROR([Cray portals headers were not found in $cray_portals_includes. Please check the paths passed to --with-cray-portals or --with-cray-portals-includes.])
- fi
+# We have to configure even if we don't build here for make dist to work
+AC_CONFIG_SUBDIRS(ldiskfs)
+])
+
+#
+# LB_DEFINE_LDISKFS_OPTIONS
+#
+# Enable config options related to ldiskfs. These are used both by ldiskfs
+# and lvfs (which includes ldiskfs headers.)
+#
+AC_DEFUN([LB_DEFINE_LDISKFS_OPTIONS],
+[
+ AC_DEFINE(CONFIG_LDISKFS_FS_MODULE, 1, [build ldiskfs as a module])
+ AC_DEFINE(CONFIG_LDISKFS_FS_XATTR, 1, [enable extended attributes for ldiskfs])
+ AC_DEFINE(CONFIG_LDISKFS_FS_POSIX_ACL, 1, [enable posix acls for ldiskfs])
+ AC_DEFINE(CONFIG_LDISKFS_FS_SECURITY, 1, [enable fs security for ldiskfs])
+])
+
+#
+# LB_CONFIG_CRAY_XT3
+#
+# Enable Cray XT3 features
+#
+AC_DEFUN([LB_CONFIG_CRAY_XT3],
+[AC_MSG_CHECKING([whether to build Cray XT3 features])
+AC_ARG_ENABLE([cray_xt3],
+ AC_HELP_STRING([--enable-cray-xt3],
+ [enable building of Cray XT3 features]),
+ [enable_cray_xt3='yes'],[enable_cray_xt3='no'])
+AC_MSG_RESULT([$enable_cray_xt3])
+if test x$enable_cray_xt3 != xno; then
+ AC_DEFINE(CRAY_XT3, 1, Enable Cray XT3 Features)
fi
-if test x$cray_portals_libs != x ; then
- if test ! -r $cray_portals_libs/libportals.a ; then
- AC_MSG_ERROR([Cray portals libraries were not found in $cray_portals_libs. Please check the paths passed to --with-cray-portals or --with-cray-portals-libs.])
- fi
+])
+
+#
+# LB_CONFIG_BGL
+#
+# Enable BGL features
+#
+AC_DEFUN([LB_CONFIG_BGL],
+[AC_MSG_CHECKING([whether to build BGL features])
+AC_ARG_ENABLE([bgl],
+ AC_HELP_STRING([--enable-bgl],
+ [enable building of BGL features]),
+ [enable_bgl='yes'],[enable_bgl='no'])
+AC_MSG_RESULT([$enable_bgl])
+if test x$enable_bgl != xno; then
+ AC_DEFINE(BGL_SUPPORT, 1, Enable BGL Features)
+ enable_doc='no'
+ enable_tests='no'
+ enable_server='no'
+ enable_liblustre='no'
+ enable_libreadline='no'
fi
+])
-if test x$cray_portals_includes != x -a x$cray_portals_libs != x ; then
- cray_portals=yes
- AC_DEFINE(CRAY_PORTALS, 1, [Building with Cray Portals])
- CPPFLAGS="-I$cray_portals_includes $CPPFLAGS"
- EXTRA_KCFLAGS="-I$cray_portals_includes $EXTRA_KCFLAGS"
- # for liblustre + b_cray
- CRAY_PORTALS_LIBS="$cray_portals_libs"
- AC_SUBST(CRAY_PORTALS_LIBS)
-else
- cray_portals=no
+
+#
+# LB_PATH_DMU
+# Support for --with-dmu
+#
+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)
+ enable_uoss='yes'
+ enable_ulevel_mt='yes'
+ enable_modules='no'
+ enable_client='no'
+ enable_tests='no'
+ enable_liblustre='no'
+ with_ldiskfs=no
+fi
+AC_SUBST(DMU_SRC)
+])
+
+#
+# Support for --enable-posix-dmu
+#
+AC_DEFUN([LB_POSIX_OSD],
+[AC_MSG_CHECKING([whether to 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_uoss='yes'
+ enable_ulevel_mt='yes'
+ enable_modules='no'
+ enable_client='no'
+ enable_tests='no'
+ enable_liblustre='no'
+ with_ldiskfs=no
fi
])
#
+# LB_PATH_SNMP
+#
+# check for in-tree snmp support
+#
+AC_DEFUN([LB_PATH_SNMP],
+[LB_CHECK_FILE([$srcdir/snmp/lustre-snmp.c],[SNMP_DIST_SUBDIR="snmp"])
+AC_SUBST(SNMP_DIST_SUBDIR)
+AC_SUBST(SNMP_SUBDIR)
+])
+
+#
# LB_CONFIG_MODULES
#
# Build kernel modules?
case $target_os in
linux*)
LB_PROG_LINUX
+ LN_PROG_LINUX
+ LC_PROG_LINUX
;;
darwin*)
LB_PROG_DARWIN
AC_HELP_STRING([--disable-utils],
[disable building of Lustre utility programs]),
[],[enable_utils='yes'])
-if test x$cray_portals = xyes ; then
- enable_utils='no'
-fi
AC_MSG_RESULT([$enable_utils])
if test x$enable_utils = xyes ; then
LB_CONFIG_INIT_SCRIPTS
AC_ARG_ENABLE([tests],
AC_HELP_STRING([--disable-tests],
[disable building of Lustre tests]),
- [],[enable_tests='yes'])
-if test x$cray_portals = xyes ; then
- enable_tests='no'
-fi
+ [],
+ [
+ enable_tests='yes'
+ ])
AC_MSG_RESULT([$enable_tests])
])
# defines for including the toplevel Rules
#
AC_DEFUN([LB_INCLUDE_RULES],
-[INCLUDE_RULES="include $PWD/build/Rules"
+[INCLUDE_RULES="include $PWD/Rules"
AC_SUBST(INCLUDE_RULES)
])
docdir='${datadir}/doc/$(PACKAGE)'
AC_SUBST(docdir)
-LP_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_MSG_RESULT([no])
CC="$CC_save"
])
+fi
-CPPFLAGS="-I\$(top_builddir)/portals/include -I\$(top_srcdir)/portals/include -I\$(top_builddir)/lustre/include -I\$(top_srcdir)/lustre/include $CPPFLAGS"
+])
+
+CPPFLAGS="-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"
AC_SUBST(LLCFLAGS)
-# everyone builds against portals and lustre
-EXTRA_KCFLAGS="$EXTRA_KCFLAGS -g -I$PWD/portals/include -I$PWD/lustre/include"
+# everyone builds against lnet and lustre
+EXTRA_KCFLAGS="$EXTRA_KCFLAGS -g -I$PWD/lnet/include -I$PWD/lustre/include"
AC_SUBST(EXTRA_KCFLAGS)
])
AM_CONDITIONAL(UTILS, test x$enable_utils = xyes)
AM_CONDITIONAL(TESTS, test x$enable_tests = xyes)
AM_CONDITIONAL(DOC, test x$ENABLE_DOC = x1)
-AM_CONDITIONAL(CRAY_PORTALS, test x$cray_portals != xno)
AM_CONDITIONAL(INIT_SCRIPTS, test x$ENABLE_INIT_SCRIPTS = "x1")
AM_CONDITIONAL(LINUX, test x$lb_target_os = "xlinux")
AM_CONDITIONAL(DARWIN, test x$lb_target_os = "xdarwin")
+AM_CONDITIONAL(CRAY_XT3, test x$enable_cray_xt3 = "xyes")
+AM_CONDITIONAL(SUNOS, test x$lb_target_os = "xSunOS")
# this lets lustre cancel libsysio, per-branch or if liblustre is
# disabled
LB_LINUX_CONDITIONALS
LB_DARWIN_CONDITIONALS
-LP_CONDITIONALS
+LN_CONDITIONALS
LC_CONDITIONALS
])
#
+# LB_CONFIG_FILES
+#
+# build-specific config files
+#
+AC_DEFUN([LB_CONFIG_FILES],
+[
+AC_CONFIG_FILES(
+[Makefile
+autoMakefile
+]
+[Rules:build/Rules.in]
+AC_PACKAGE_TARNAME[.spec]
+)
+])
+
+#
# LB_CONFIGURE
#
# main configure steps
LB_INCLUDE_RULES
+LB_CONFIG_CRAY_XT3
+LB_CONFIG_BGL
LB_PATH_DEFAULTS
LB_PROG_CC
-LB_PATH_LIBSYSIO
-LB_PATH_CRAY_PORTALS
+LB_PATH_DMU
+LB_POSIX_OSD
LB_CONFIG_DOCS
LB_CONFIG_UTILS
LB_CONFIG_TESTS
+LC_CONFIG_CLIENT_SERVER
+
+# three macros for cmd3
+LC_CONFIG_SPLIT
+LC_CONFIG_LDISKFS
+LN_CONFIG_CDEBUG
LB_CONFIG_MODULES
+LB_PATH_LIBSYSIO
+LB_PATH_SNMP
+LB_PATH_LDISKFS
+
LC_CONFIG_LIBLUSTRE
+LN_CONFIGURE
-LP_CONFIGURE
LC_CONFIGURE
+if test "$SNMP_DIST_SUBDIR" ; then
+ LS_CONFIGURE
+fi
+
LB_CONDITIONALS
LB_CONFIG_HEADERS
-AC_CONFIG_FILES(
-[Makefile:build/Makefile.in.toplevel]
-[autoMakefile
-build/autoMakefile
-build/autoconf/Makefile
-build/Rules
-build/lustre.spec
-])
-
-LP_CONFIG_FILES
+LB_CONFIG_FILES
+LN_CONFIG_FILES
LC_CONFIG_FILES
+if test "$SNMP_DIST_SUBDIR" ; then
+ LS_CONFIG_FILES
+fi
+
+AC_SUBST(ac_configure_args)
+
+MOSTLYCLEANFILES='.*.cmd .*.flags *.o *.ko *.mod.c .depend .*.1.*'
+AC_SUBST(MOSTLYCLEANFILES)
AC_OUTPUT