X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=ldiskfs%2Fconfigure.ac;h=f92e0f0d4f64725dc569b6c17b611356df8e1f37;hb=622b1b48a1fa9dc8c6954fa7ca596358b05af888;hp=70a5d22af85d7c03b186d144d94c0de7f2adca96;hpb=c50c88e6ce0fe695e716fe7e4db30b62a959c5a1;p=fs%2Flustre-release.git

diff --git a/ldiskfs/configure.ac b/ldiskfs/configure.ac
index 70a5d22..f92e0f0 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.0.9, [https://bugzilla.lustre.org/])
+AC_INIT([Lustre ldiskfs], 3.3.0, [http://bugs.whamcloud.com/])
 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
@@ -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,21 +97,7 @@ AM_CONDITIONAL(USE_QUILT, test x$QUILT != xno)
 
 LB_DEFINE_LDISKFS_OPTIONS
 
-AC_MSG_CHECKING([whether to build ldiskfs based on ext4])
-if test x$RHEL_KERNEL = xyes; then
-	AC_ARG_ENABLE([ext4],
-		AC_HELP_STRING([--enable-ext4],
-			     [enable building of ldiskfs based on ext4]),
-			     [], [enable_ext4='no'])
-else
-	case $LINUXRELEASE in
-	# ext4 was in 2.6.22-2.6.26 but not stable enough to use
-	2.6.2[0-6]*) enable_ext4='no' ;;
-	*) LC_KERNEL_WITH_EXT4([enable_ext4='yes'],
-			       [enable_ext4='no']) ;;
-	esac
-fi
-AC_MSG_RESULT([$enable_ext4])
+LB_HAVE_EXT4_ENABLED
 
 if test x$enable_ext4 = xyes ; then
 	AC_DEFINE(HAVE_EXT4_LDISKFS, 1, [ldiskfs based on ext4])
@@ -119,58 +112,28 @@ 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" ;;
-2.6.9*) LDISKFS_SERIES="2.6-rhel4.series" ;;
-2.6.10-ac*) LDISKFS_SERIES="2.6-fc3.series" ;;
-2.6.10*) LDISKFS_SERIES="2.6-rhel4.series" ;;
-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*)
-	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"
+	if test x$RHEL_KERNEL = xyes; then
+		LDISKFS_SERIES="2.6-rhel5-ext4.series"
+	fi
+	;;
+2.6.32*)
+	if test x$RHEL_KERNEL = xyes; then
+		 LDISKFS_SERIES="2.6-rhel6.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)
 
-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])