X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=ldiskfs%2Fconfigure.ac;h=010bf6fbae90ee02eb836cbdea563a9298dffa00;hp=eba5b2662a1a9e7dd1728a0ce32cf1b746936c84;hb=b8e3234d406923a43bdc51e70b0a72c80b0987d3;hpb=55b2eb7f1e07bc2a6483dddec2a75a32a4facb23

diff --git a/ldiskfs/configure.ac b/ldiskfs/configure.ac
index eba5b26..010bf6fb 100644
--- a/ldiskfs/configure.ac
+++ b/ldiskfs/configure.ac
@@ -1,7 +1,8 @@
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([Lustre ldiskfs], 3.0.5, [https://bugzilla.lustre.org/])
+AC_INIT([Lustre ldiskfs], 3.3.0, [https://bugzilla.lustre.org/])
 AC_CONFIG_SRCDIR([lustre-ldiskfs.spec.in])
+ldiskfs_is_ext4=yes
 
 # Don't look for install-sh, etc. in ..
 AC_CONFIG_AUX_DIR([.])
@@ -13,9 +14,22 @@ AM_INIT_AUTOMAKE
 AC_PROG_CC
 
 LB_CANONICAL_SYSTEM
+
+LB_DOWNSTREAM_RELEASE
+
+LB_BUILDID
+
 LB_INCLUDE_RULES
 LB_PROG_CC
 
+AC_ARG_ENABLE([dist],
+	AC_HELP_STRING([--enable-dist],
+			[only configure enough for make dist]),
+	[enable_dist='yes'],[enable_dist='no'])
+AC_MSG_RESULT([$enable_dist])
+if test x$enable_dist != xno; then
+	enable_modules='no'
+fi
 
 #
 # LC_TARGET_SUPPORTED
@@ -83,6 +97,23 @@ 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)
+
+if test x$enable_dist != xyes; then
+	# don't need to do this if only configuring for make dist
 AC_MSG_CHECKING([which ldiskfs series to use])
 case $LINUXRELEASE in
 2.6.5*) LDISKFS_SERIES="2.6-suse.series" ;;
@@ -94,15 +125,21 @@ case $LINUXRELEASE in
 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";;
+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])
+fi
 AC_SUBST(LDISKFS_SERIES)
 
 AC_SUBST(ac_configure_args)
@@ -134,7 +171,7 @@ LB_CHECK_SYMBOL_EXPORT([__d_move],
 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