X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=ldiskfs%2Fconfigure.ac;h=e20d087bc997c6bb3129eb74d44ea0e40b950336;hb=b8c0f5dfaf4024a9785530ca3a6967470c5f02de;hp=b1b3424aacf3af39148f9418430fee531008cd0c;hpb=0cff91effaeb5cc952acb9b286a230fcda240562;p=fs%2Flustre-release.git

diff --git a/ldiskfs/configure.ac b/ldiskfs/configure.ac
index b1b3424..e20d087 100644
--- a/ldiskfs/configure.ac
+++ b/ldiskfs/configure.ac
@@ -1,6 +1,6 @@
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([Lustre ldiskfs], 3.0.9, [https://bugzilla.lustre.org/])
+AC_INIT([Lustre ldiskfs], 3.3.0, [https://bugzilla.lustre.org/])
 AC_CONFIG_SRCDIR([lustre-ldiskfs.spec.in])
 
 # Don't look for install-sh, etc. in ..
@@ -33,13 +33,6 @@ $2
 esac
 ])
 
-AC_DEFUN([LC_KERNEL_WITH_EXT4],
-[if test -f $LINUX/fs/ext4/ext4.h ; then
-$1
-else
-$2
-fi
-])
 
 AC_MSG_CHECKING([whether to build kernel modules])
 AC_ARG_ENABLE([modules],
@@ -90,28 +83,15 @@ AM_CONDITIONAL(USE_QUILT, test x$QUILT != xno)
 
 LB_DEFINE_LDISKFS_OPTIONS
 
-AC_MSG_CHECKING([whether to build ldisk based on ext4])
-AC_ARG_ENABLE([ext4],
-	      AC_HELP_STRING([--disable-ext4],
-			     [enable building of ldiskfs based on ext4]),[],
-			     [LC_KERNEL_WITH_EXT4([enable_ext4='yes'],
-			     [enable_ext4='no'])])
-AC_MSG_RESULT([$enable_ext4])
-
-# Remove this part when RHEL5 ext4 patches landed.
-case $LINUXRELEASE in
-2.6.18*) if test x$RHEL_KENEL = xyes; then
-	enable_ext4=no
-	fi
-;;
-esac
+LB_HAVE_EXT4_ENABLED
 
 if test x$enable_ext4 = xyes ; then
-        AC_DEFINE(HAVE_EXT4_LDISKFS, 1, [ldiskfs based on ext4])
-        BACKFS=ext4
+	AC_DEFINE(HAVE_EXT4_LDISKFS, 1, [ldiskfs based on ext4])
+	BACKFS=ext4
 else
-        BACKFS=ext3
+	BACKFS=ext3
 fi
+
 AC_SUBST(BACKFS)
 BACKFSU=${BACKFS/ext/EXT}
 AC_SUBST(BACKFSU) # We need a Upper string