Branch: HEAD

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

diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4
index 0389f3d..28a2b2d 100644 (file)
--- a/lustre/autoconf/lustre-core.m4
+++ b/lustre/autoconf/lustre-core.m4
@@ -59,6 +59,7 @@ AC_DEFUN([LC_CONFIG_EXT3],
 LB_LINUX_CONFIG([EXT3_FS_XATTR],[$1],[$3])
 ])
 
+
 #
 # LC_FSHOOKS
 #
@@ -79,7 +80,17 @@ AC_DEFUN([LC_FSHOOKS],
        ])
 $1
 ],[
+LB_LINUX_TRY_COMPILE([
+        #include <linux/version.h>
+],[
+       #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10))
+       #error "linux version < 2.6.10, only support 2.6.7"
+       #endif
+],[
 $2
+],[
+$3 
+])
 ])
 ])
 
@@ -266,16 +277,18 @@ case $BACKINGFS in
                LC_CONFIG_EXT3([],[
                        AC_MSG_ERROR([Lustre requires that ext3 is enabled in the kernel])
                ],[
-                       AC_MSG_WARN([Lustre requires that extended attributes for ext3 are enabled in the kernel])
-                       AC_MSG_WARN([This build may fail.])
+                        AC_MSG_ERROR([Lustre requires that extended attributes for ext3 are enabled in the kernel])
                ])
                ;;
        ldiskfs)
                LC_FSHOOKS([
                        LDISKFS_SERIES="2.6-suse.series"
                ],[
-                       LDISKFS_SERIES="2.6-vanilla.series"
-               ])
+                       LDISKFS_SERIES="2.6-fc3.series"
+               ],[
+                       LDISKFS_SERIES="2.6-vanilla.series"             
+               ]
+               )
                AC_SUBST(LDISKFS_SERIES)
                ;;
 esac # $BACKINGFS
@@ -318,6 +331,23 @@ AC_DEFINE_UNQUOTED(OBD_MAX_IOCTL_BUFFER, $OBD_BUFFER_SIZE, [IOCTL Buffer Size])
 ])
 
 #
+# LC_CONFIG_GSS
+#
+# whether build-in gss/krb5 capability
+#
+AC_DEFUN([LC_CONFIG_GSS],
+[AC_MSG_CHECKING([whether to enable gss/krb5 support])
+AC_ARG_ENABLE([gss],
+       AC_HELP_STRING([--enable-gss],
+                       [enable gss/krb5 support]),
+       [],[enable_gss='yes'])
+AC_MSG_RESULT([$enable_gss])
+if test x$enable_gss != xno ; then
+  AC_DEFINE(ENABLE_GSS, 1, Support GSS/krb5)
+fi
+])
+
+#
 # LC_CONFIG_SNAPFS
 #
 # Whether snapfs is desired
@@ -354,6 +384,7 @@ AC_MSG_RESULT([$enable_smfs])
 AC_DEFUN([LC_PROG_LINUX],
 [LC_CONFIG_BACKINGFS
 LC_CONFIG_PINGER
+LC_CONFIG_GSS
 LC_CONFIG_SNAPFS
 LC_CONFIG_SMFS
 
@@ -424,7 +455,9 @@ AM_CONDITIONAL(USE_QUILT, test x$QUILT != xno)
 AM_CONDITIONAL(MPITESTS, test x$enable_mpitests = xyes, Build MPI Tests)
 AM_CONDITIONAL(SNAPFS, test x$enable_snapfs = xyes)
 AM_CONDITIONAL(SMFS, test x$enable_smfs = xyes)
+AM_CONDITIONAL(GSS, test x$enable_gss = xyes)
 AM_CONDITIONAL(LIBLUSTRE, test x$enable_liblustre = xyes)
+AM_CONDITIONAL(LIBLUSTRE_TESTS, test x$enable_liblustre_tests = xyes)
 AM_CONDITIONAL(MPITESTS, test x$enable_mpitests = xyes, Build MPI Tests)
 ])
 
@@ -451,7 +484,6 @@ lustre/ldiskfs/Makefile
 lustre/ldiskfs/autoMakefile
 lustre/ldlm/Makefile
 lustre/liblustre/Makefile
-lustre/liblustre/tests/Makefile
 lustre/llite/Makefile
 lustre/llite/autoMakefile
 lustre/lmv/Makefile
@@ -480,6 +512,10 @@ lustre/ptlrpc/Makefile
 lustre/ptlrpc/autoMakefile
 lustre/scripts/Makefile
 lustre/scripts/version_tag.pl
+lustre/sec/Makefile
+lustre/sec/autoMakefile
+lustre/sec/gss/Makefile
+lustre/sec/gss/autoMakefile
 lustre/smfs/Makefile
 lustre/smfs/autoMakefile
 lustre/snapfs/Makefile