branch: b_new_cmd (lustre), HEAD (build)

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

diff --git a/build/autoconf/lustre-build.m4 b/build/autoconf/lustre-build.m4
index 75ddcad..dcdddca 100644 (file)
--- a/build/autoconf/lustre-build.m4
+++ b/build/autoconf/lustre-build.m4
@@ -159,34 +159,41 @@ AC_CONFIG_SUBDIRS(libsysio)
 ])
 
 #
-# LB_PATH_CRAY_PORTALS
-#
-# Support for external Cray portals
-#
-AC_DEFUN([LB_PATH_CRAY_PORTALS],
-[LB_ARG_LIBS_INCLUDES([Cray Portals],[cray-portals])
-
-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
-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_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_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_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
 ])
 
@@ -265,11 +272,7 @@ AC_ARG_ENABLE([tests],
                        [disable building of Lustre tests]),
        [],
        [
-               if test x$cray_portals = xyes ; then
-                       enable_tests='no'
-               else
-                       enable_tests='yes'
-               fi
+               enable_tests='yes'
        ])
 AC_MSG_RESULT([$enable_tests])
 ])
@@ -356,8 +359,9 @@ AC_SUBST(sysconfdir)
 docdir='${datadir}/doc/$(PACKAGE)'
 AC_SUBST(docdir)
 
-LP_PATH_DEFAULTS
+LN_PATH_DEFAULTS
 LC_PATH_DEFAULTS
+
 ])
 
 #
@@ -405,6 +409,10 @@ 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
 
+# 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"
@@ -414,8 +422,11 @@ AC_TRY_COMPILE([],[],[
        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)
@@ -423,8 +434,8 @@ 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)
 ])
 
@@ -438,7 +449,6 @@ AC_DEFUN([LB_CONDITIONALS],
 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")
@@ -457,7 +467,7 @@ AC_SUBST(SYSIO)
 LB_LINUX_CONDITIONALS
 LB_DARWIN_CONDITIONALS
 
-LP_CONDITIONALS
+LN_CONDITIONALS
 LC_CONDITIONALS
 ])
 
@@ -471,27 +481,29 @@ AC_DEFUN([LB_CONFIGURE],
 
 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_SNMP
 
 LB_CONFIG_DOCS
 LB_CONFIG_UTILS
 LB_CONFIG_TESTS
 LC_CONFIG_CLIENT_SERVER
+LC_CONFIG_SPLIT
 
 LB_CONFIG_MODULES
+LC_CONFIG_GSS
 
 LC_CONFIG_LIBLUSTRE
+LN_CONFIGURE
 
-LC_CONFIG_QUOTA
-
-LP_CONFIGURE
 LC_CONFIGURE
+
 if test "$SNMP_DIST_SUBDIR" ; then
        LS_CONFIGURE
 fi
@@ -508,7 +520,7 @@ build/Rules
 build/lustre.spec
 ])
 
-LP_CONFIG_FILES
+LN_CONFIG_FILES
 LC_CONFIG_FILES
 if test "$SNMP_DIST_SUBDIR" ; then
        LS_CONFIG_FILES