X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=ldiskfs%2Fconfigure.ac;h=7757d01798385087e69b50f354bde3f6e9d32f93;hp=1f38551295af9e64110700b79f5364a052487483;hb=1cc5fa26070fc9afef954b1b627001a981f7dc34;hpb=4ce25c906d0d9afe8ff6bdce54e48facedeb6c05;ds=sidebyside

diff --git a/ldiskfs/configure.ac b/ldiskfs/configure.ac
index 1f38551..7757d01 100644
--- a/ldiskfs/configure.ac
+++ b/ldiskfs/configure.ac
@@ -1,21 +1,35 @@
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([Lustre ldiskfs], 3.2.0, [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([.])
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([1.9 tar-ustar])
 
 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
@@ -98,6 +112,8 @@ 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" ;;
@@ -120,9 +136,11 @@ case $LINUXRELEASE in
 	;;
 2.6.22*) LDISKFS_SERIES="2.6.22-vanilla.series";;
 2.6.27*) LDISKFS_SERIES="2.6-sles11.series";;
+2.6.32*) LDISKFS_SERIES="2.6-rhel6.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)
@@ -139,18 +157,6 @@ LB_CHECK_SYMBOL_EXPORT([__d_rehash],
 				  [__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])