- landing of b_hd_cleanup_merge to HEAD.

[fs/lustre-release.git] / lustre / configure.in

diff --git a/lustre/configure.in b/lustre/configure.in
index 762e489..e2fca96 100644 (file)
--- a/lustre/configure.in
+++ b/lustre/configure.in
@@ -5,7 +5,7 @@
 
 AC_INIT
 AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(lustre, b1_4)
+AM_INIT_AUTOMAKE(lustre, 1.3.9.1)
 # AM_MAINTAINER_MODE
 
 # Four main targets: lustre kernel modules, utilities, tests, and liblustre
@@ -61,15 +61,6 @@ AC_SUBST(ENABLE_DOC)
 # default backing fs is ext3
 BACKINGFS='ext3'
 
-# LLNL patches their ext3 and calls it extN
-AC_MSG_CHECKING([whether to use extN])
-AC_ARG_ENABLE([extN],
-       AC_HELP_STRING([--enable-extN],
-                       [use extN instead of ext3 for lustre backend]),
-       [BACKINGFS='extN'],[enable_extN='no'])
-AC_MSG_RESULT([$enable_extN])
-AM_CONDITIONAL(EXTN, test x$enable_extN = xyes)
-
 # SuSE gets ldiskfs
 AC_MSG_CHECKING([whether to enable ldiskfs])
 AC_ARG_ENABLE([ldiskfs],
@@ -77,7 +68,6 @@ AC_ARG_ENABLE([ldiskfs],
                        [use ldiskfs for the Lustre backing FS]),
        [BACKINGFS='ldiskfs'],[enable_ldiskfs='no'])
 AC_MSG_RESULT([$enable_ldiskfs])
-AM_CONDITIONAL(LDISKFS, test x$enable_ldiskfs = xyes)
 
 AC_MSG_CHECKING([which backing filesystem to use])
 AC_MSG_RESULT([$BACKINGFS])
@@ -120,7 +110,7 @@ AC_ARG_WITH([sysio],
        ])
 AC_MSG_RESULT([$SYSIO_PATH])
 
-AC_CHECK_FILE([$SYSIO_PATH/src/libsysio.a],[],
+AC_CHECK_FILE([$SYSIO_PATH/lib/libsysio.a],[],
        [
                if test x$enable_liblustre = xyes ; then
                   AC_MSG_ERROR([A built libsysio tree is required for building liblustre.])
@@ -143,16 +133,23 @@ AC_ARG_ENABLE([snapfs],
        AC_HELP_STRING([--enable-snapfs],
                        [build snapfs]),
        [],[enable_snapfs='no'])
-
 AC_MSG_RESULT([$enable_snapfs])
 AM_CONDITIONAL(SNAPFS, test x$enable_snapfs = xyes)
-if test x$enable_snapfs = xyes ; then
-       AC_DEFINE(CONFIG_SNAPFS, 1, [enable snap support])
-fi
+
+# smfs compilation
+AC_MSG_CHECKING([whether to enable smfs support])
+AC_ARG_ENABLE([smfs],
+       AC_HELP_STRING([--enable-smfs],
+                       [build smfs]),
+       [],[enable_smfs='no'])
+AC_MSG_RESULT([$enable_smfs])
+AM_CONDITIONAL(SMFS, test x$enable_smfs = xyes)
 
 sinclude(portals/build.m4)
 sinclude(portals/archdep.m4)
 
+AM_CONDITIONAL(LDISKFS, test x$enable_ldiskfs = xyes)
+
 if test x$enable_inkernel = xyes ; then
        find . -name Makefile.mk | sed 's/.mk$//' | xargs -n 1 \
                sh -e -x -c '(cp -f $0.mk $0.in)'
@@ -214,12 +211,15 @@ portals/Kernelenv
 portals/Makefile
 portals/autoMakefile
 portals/doc/Makefile
+portals/include/Makefile
+portals/include/linux/Makefile
+portals/include/portals/Makefile
 portals/knals/Makefile
 portals/knals/autoMakefile
 portals/knals/gmnal/Makefile
 portals/knals/gmnal/autoMakefile
-portals/knals/ibnal/Makefile
-portals/knals/ibnal/autoMakefile
+portals/knals/openibnal/Makefile
+portals/knals/openibnal/autoMakefile
 portals/knals/qswnal/Makefile
 portals/knals/qswnal/autoMakefile
 portals/knals/socknal/Makefile
@@ -245,6 +245,9 @@ smfs/Makefile
 smfs/autoMakefile
 cmobd/Makefile
 cmobd/autoMakefile
+snapfs/Makefile
+snapfs/autoMakefile
+snapfs/utils/Makefile
 tests/Makefile
 utils/Lustre/Makefile
 utils/Makefile