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 221fa51..dcdddca 100644 (file)
--- a/build/autoconf/lustre-build.m4
+++ b/build/autoconf/lustre-build.m4
@@ -159,92 +159,6 @@ AC_CONFIG_SUBDIRS(libsysio)
 ])
 
 #
-# LB_CONFIG_PORTALS
-#
-# configure support for Cray Portals
-#
-AC_DEFUN([LB_CONFIG_PORTALS],
-[AC_MSG_CHECKING([for external Portals])
-AC_ARG_WITH([portals],
-       AC_HELP_STRING([--with-portals=path],
-                       [set path to portals]),
-        [
-               case $with_portals in
-                       no)     PORTALS=""
-                               enable_portals=no
-                               ;;
-                       *)      if test x$with_portals != x ; then
-                                       PORTALS="$with_portals"
-                                       enable_portals=yes
-                               else
-                                       AC_MSG_ERROR([Path to portals must be specified])
-                                       enable_portals=no
-                               fi
-                               ;;
-               esac
-               
-       ], [enable_portals=no])
-AC_MSG_CHECKING([location of portals])
-case x$enable_portals in
-       xyes)
-               AC_MSG_RESULT([$PORTALS])
-               LB_CHECK_FILE([$PORTALS/include/portals/api.h],[],
-                             AC_MSG_ERROR([Cannot find portals headers]))
-               ;;
-       *)
-               AC_MSG_RESULT([no external portals])
-               ;;
-esac
-
-AC_SUBST(PORTALS)
-])
-
-#
-# LB_CONFIG_LUSTRE_PORTALS
-#
-# configure support for Lustre Portals
-#
-AC_DEFUN([LB_CONFIG_LUSTRE_PORTALS],
-[AC_MSG_CHECKING([for Lustre Portals])
-AC_ARG_WITH([lustre-portals],
-       AC_HELP_STRING([--with-lustre-portals=path],
-                       [set path to Lustre portals]),
-        [
-               case $with_lustre_portals in
-                       yes)    LUSTRE_PORTALS="$PWD/portals"
-                               enable_lustre_portals=yes
-                               ;;
-                       no)     LUSTRE_PORTALS=""
-                               enable_lustre_portals=no
-                               ;;
-                       *)      if test x$with_lustre_portals != x ; then
-                                       LUSTRE_PORTALS="$with_lustre_portals"
-                               else
-                                       LUSTRE_PORTALS="$PWD/portals"
-                               fi
-                               enable_lustre_portals=yes
-                               ;;
-               esac
-               
-       ], [enable_lustre_portals=no])
-
-AC_MSG_CHECKING([location of Lustre portals])
-case x$enable_lustre_portals in
-       xyes)
-               AC_MSG_RESULT([$LUSTRE_PORTALS])
-               LB_CHECK_FILE([$LUSTRE_PORTALS/include/portals/api.h],[LUSTRE_PORTALS_SUBDIR="portals"],
-                             AC_MSG_ERROR([Cannot find Lustre portals headers]))
-               ;;
-       *)
-               AC_MSG_RESULT([disable Lustre portals])
-               ;;
-esac
-
-AC_SUBST(LUSTRE_PORTALS_SUBDIR)
-AC_SUBST(LUSTRE_PORTALS)
-])
-
-#
 # LB_CONFIG_CRAY_XT3
 #
 # Enable Cray XT3 features
@@ -261,6 +175,27 @@ if test x$enable_cray_xt3 != xno; then
 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
+])
 
 #
 # LB_PATH_SNMP
@@ -474,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"
@@ -483,6 +422,9 @@ AC_TRY_COMPILE([],[],[
        AC_MSG_RESULT([no])
        CC="$CC_save"
 ])
+fi
+
+])
 
 CPPFLAGS="-I\$(top_builddir)/lnet/include -I\$(top_srcdir)/lnet/include -I\$(top_builddir)/lustre/include -I\$(top_srcdir)/lustre/include $CPPFLAGS"
 
@@ -508,7 +450,6 @@ 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(INIT_SCRIPTS, test x$ENABLE_INIT_SCRIPTS = "x1")
-AM_CONDITIONAL(BUILD_PORTALS, test x$LUSTRE_PORTALS_SUBDIR = "xportals")
 AM_CONDITIONAL(LINUX, test x$lb_target_os = "xlinux")
 AM_CONDITIONAL(DARWIN, test x$lb_target_os = "xdarwin")
 
@@ -528,9 +469,6 @@ LB_DARWIN_CONDITIONALS
 
 LN_CONDITIONALS
 LC_CONDITIONALS
-#if test "$LUSTRE_PORTALS" ; then
-       LP_CONDITIONALS
-#fi
 ])
 
 #
@@ -543,12 +481,8 @@ AC_DEFUN([LB_CONFIGURE],
 
 LB_INCLUDE_RULES
 
-LB_CONFIG_PORTALS
-if ! test "$PORTALS" ; then
-# if portals is configured, Lustre portals will be ignored
-       LB_CONFIG_LUSTRE_PORTALS
-fi
 LB_CONFIG_CRAY_XT3
+LB_CONFIG_BGL
 LB_PATH_DEFAULTS
 
 LB_PROG_CC
@@ -556,25 +490,20 @@ LB_PROG_CC
 LB_PATH_LIBSYSIO
 LB_PATH_SNMP
 
-if test "$LUSTRE_PORTALS" ; then
-       LP_PROG_CC
-fi
-
 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_CONFIGURE
-if test "$LUSTRE_PORTALS" ; then
-       LP_CONFIGURE
-fi
+
 if test "$SNMP_DIST_SUBDIR" ; then
        LS_CONFIGURE
 fi
@@ -593,9 +522,6 @@ build/lustre.spec
 
 LN_CONFIG_FILES
 LC_CONFIG_FILES
-if test "$LUSTRE_PORTALS" ; then
-       LP_CONFIG_FILES
-fi
 if test "$SNMP_DIST_SUBDIR" ; then
        LS_CONFIG_FILES
 fi