b=23244 unhash the new added export when such obd device is stopping

[fs/lustre-release.git] / ldiskfs / configure.ac

diff --git a/ldiskfs/configure.ac b/ldiskfs/configure.ac
index e7b19c1..1f38551 100644 (file)
--- a/ldiskfs/configure.ac
+++ b/ldiskfs/configure.ac
@@ -1,6 +1,6 @@
 # Process this file with autoconf to produce a configure script.
 
 # Process this file with autoconf to produce a configure script.
 

-AC_INIT([Lustre ldiskfs], 3.0.8, [https://bugzilla.lustre.org/])
+AC_INIT([Lustre ldiskfs], 3.2.0, [https://bugzilla.lustre.org/])

 AC_CONFIG_SRCDIR([lustre-ldiskfs.spec.in])
 
 # Don't look for install-sh, etc. in ..
 AC_CONFIG_SRCDIR([lustre-ldiskfs.spec.in])
 
 # Don't look for install-sh, etc. in ..


@@ -83,6 +83,21 @@ AM_CONDITIONAL(USE_QUILT, test x$QUILT != xno)
 
 LB_DEFINE_LDISKFS_OPTIONS
 
 
 LB_DEFINE_LDISKFS_OPTIONS
 

+LB_HAVE_EXT4_ENABLED
+
+if test x$enable_ext4 = xyes ; then
+       AC_DEFINE(HAVE_EXT4_LDISKFS, 1, [ldiskfs based on ext4])
+       BACKFS=ext4
+else
+       BACKFS=ext3
+fi
+
+AC_SUBST(BACKFS)
+BACKFSU=${BACKFS/ext/EXT}
+AC_SUBST(BACKFSU) # We need a Upper string
+
+AM_CONDITIONAL(USE_EXT4, test x$enable_ext4 = xyes)
+

 AC_MSG_CHECKING([which ldiskfs series to use])
 case $LINUXRELEASE in
 2.6.5*) LDISKFS_SERIES="2.6-suse.series" ;;
 AC_MSG_CHECKING([which ldiskfs series to use])
 case $LINUXRELEASE in
 2.6.5*) LDISKFS_SERIES="2.6-suse.series" ;;


@@ -94,12 +109,17 @@ case $LINUXRELEASE in
 2.6.16*) LDISKFS_SERIES="2.6-sles10.series";;
 2.6.18*)
        if test x$RHEL_KENEL = xyes; then
 2.6.16*) LDISKFS_SERIES="2.6-sles10.series";;
 2.6.18*)
        if test x$RHEL_KENEL = xyes; then

-               LDISKFS_SERIES="2.6-rhel5.series"
+                if test x$enable_ext4 = xyes; then
+                       LDISKFS_SERIES="2.6-rhel5-ext4.series"
+                else
+                       LDISKFS_SERIES="2.6-rhel5.series"
+                fi

        else
                LDISKFS_SERIES="2.6.18-vanilla.series"
        fi
        ;;
 2.6.22*) LDISKFS_SERIES="2.6.22-vanilla.series";;
        else
                LDISKFS_SERIES="2.6.18-vanilla.series"
        fi
        ;;
 2.6.22*) LDISKFS_SERIES="2.6.22-vanilla.series";;

+2.6.27*) LDISKFS_SERIES="2.6-sles11.series";;

 *) AC_MSG_WARN([Unknown kernel version $LINUXRELEASE, fix ldiskfs/configure.ac])
 esac
 AC_MSG_RESULT([$LDISKFS_SERIES])
 *) AC_MSG_WARN([Unknown kernel version $LINUXRELEASE, fix ldiskfs/configure.ac])
 esac
 AC_MSG_RESULT([$LDISKFS_SERIES])