X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=ldiskfs%2Fconfigure.ac;h=e20d087bc997c6bb3129eb74d44ea0e40b950336;hp=808ca1c1dde247a3a90ca5fc5cbe56665f252784;hb=3dabe77a496d1c9b375264da220a90683b219daa;hpb=ddd1a1520ff1f391dac8a206e3bd5bd813c94b17

diff --git a/ldiskfs/configure.ac b/ldiskfs/configure.ac
index 808ca1c..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.0, [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 ..
@@ -36,21 +36,18 @@ esac
 
 AC_MSG_CHECKING([whether to build kernel modules])
 AC_ARG_ENABLE([modules],
-	AC_HELP_STRING([--disable-modules],
-			[disable building of Lustre kernel modules]),
-	[],[
-		LC_TARGET_SUPPORTED([
-			enable_modules='yes'
-		],[
-			enable_modules='no'
-		])
-	])
+	      AC_HELP_STRING([--disable-modules],
+			     [disable building of Lustre kernel modules]),[],
+			     [LC_TARGET_SUPPORTED([enable_modules='yes'],
+			     [enable_modules='no'])])
 AC_MSG_RESULT([$enable_modules])
 
 if test x$enable_modules = xyes ; then
 	LB_PROG_LINUX
+if test x$linux25 = xyes ; then
 	LB_LINUX_MODPOST
 fi
+fi
 
 LB_CONFIG_HEADERS
 
@@ -65,8 +62,9 @@ AC_SUBST(LDISKFSDIR)
 
 AC_MSG_CHECKING([whether to enable quilt for making ldiskfs])
 AC_ARG_ENABLE([quilt],
-		AC_HELP_STRING([--disable-quilt],[disable use of quilt for ldiskfs]),
-		[],[enable_quilt='yes'])
+	      AC_HELP_STRING([--disable-quilt],
+			     [disable use of quilt for ldiskfs]),[],
+			     [enable_quilt='yes'])
 AC_MSG_RESULT([$enable_quilt])
 
 AC_PATH_PROG(PATCH, patch, [no])
@@ -85,6 +83,21 @@ AM_CONDITIONAL(USE_QUILT, test x$QUILT != xno)
 
 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" ;;
@@ -94,9 +107,19 @@ case $LINUXRELEASE in
 2.6.12*) LDISKFS_SERIES="2.6.12-vanilla.series" ;;
 2.6.15*) LDISKFS_SERIES="2.6-fc5.series";;
 2.6.16*) LDISKFS_SERIES="2.6-sles10.series";;
-2.6.18-*el5*) LDISKFS_SERIES="2.6-rhel5.series";;
-2.6.18-*prep*) LDISKFS_SERIES="2.6-rhel5.series";;
-2.6.18*) LDISKFS_SERIES="2.6.18-vanilla.series";;
+2.6.18*)
+	if test x$RHEL_KENEL = xyes; then
+                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";;
+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])
@@ -104,10 +127,34 @@ AC_SUBST(LDISKFS_SERIES)
 
 AC_SUBST(ac_configure_args)
 
+LB_CHECK_SYMBOL_EXPORT([d_rehash_cond],
+		       [fs/dcache.c],
+		       [AC_DEFINE(HAVE_D_REHASH_COND, 1,
+				  [d_rehash_cond is exported by the kernel])],
+				  [])
+
+LB_CHECK_SYMBOL_EXPORT([__d_rehash],
+		       [fs/dcache.c],
+		       [AC_DEFINE(HAVE___D_REHASH, 1,
+				  [__d_rehash is exported by the kernel])],
+				  [])
+
+LB_CHECK_SYMBOL_EXPORT([d_move_locked],
+		       [fs/dcache.c],
+		       [AC_DEFINE(HAVE_D_MOVE_LOCKED, 1,
+				  [d_move_locked is exported by the kernel])],
+				  [])
+
+LB_CHECK_SYMBOL_EXPORT([__d_move],
+		       [fs/dcache.c],
+		       [AC_DEFINE(HAVE___D_MOVE, 1,
+				  [__d_move exported by the kernel])],
+				  [])
+
 LB_CONFIG_FILES
 AC_CONFIG_FILES([ldiskfs/autoMakefile ldiskfs/Makefile])
 
-MOSTLYCLEANFILES='.*.cmd .*.flags *.o *.ko *.mod.c .depend .*.1.*'
+MOSTLYCLEANFILES='.*.cmd .*.flags *.o *.ko *.mod.c .depend .*.1.* Modules.symvers Module.symvers'
 AC_SUBST(MOSTLYCLEANFILES)
 
 AC_OUTPUT