X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=ldiskfs%2Fconfigure.ac;h=010bf6fbae90ee02eb836cbdea563a9298dffa00;hb=1531cbeb412a8d9c35fc5c6a26d3736cf476e4b9;hp=7de84cfe427af7278e968a7b3990edaa3ca1d4de;hpb=ab942baeb94c32092d40bfe42b1c22a609f235fb;p=fs%2Flustre-release.git

diff --git a/ldiskfs/configure.ac b/ldiskfs/configure.ac
index 7de84cf..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.8, [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
@@ -33,13 +47,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,25 +97,23 @@ AM_CONDITIONAL(USE_QUILT, test x$QUILT != xno)
 
 LB_DEFINE_LDISKFS_OPTIONS
 
-AC_MSG_CHECKING([whether to build ldisk base on ext4])
-AC_ARG_ENABLE([ext4],
-	      AC_HELP_STRING([--disable-ext4],
-			     [disable building of ldiskfs base on ext4]),[],
-			     [LC_KERNEL_WITH_EXT4([enable_ext4='yes'],
-			     [enable_ext4='no'])])
-AC_MSG_RESULT([$enable_ext4])
+LB_HAVE_EXT4_ENABLED
 
 if test x$enable_ext4 = xyes ; then
-        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
 
 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" ;;
@@ -130,10 +135,11 @@ case $LINUXRELEASE in
 	fi
 	;;
 2.6.22*) LDISKFS_SERIES="2.6.22-vanilla.series";;
-2.6.27*) LDISKFS_SERIES="2.6.27-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)