X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=ldiskfs%2Fconfigure.ac;h=1d838df58665984c0aeb465962d525d097444ad7;hp=322b6c4d635abc782d4f3e5af761d1935eac90ac;hb=c52d5f2913c33eb7efe0d8a9073c90091e169b8c;hpb=201678cc0c3b4893b780da575d138a9a85451978

diff --git a/ldiskfs/configure.ac b/ldiskfs/configure.ac
index 322b6c4..1d838df 100644
--- a/ldiskfs/configure.ac
+++ b/ldiskfs/configure.ac
@@ -1,136 +1,92 @@
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([Lustre ldiskfs], 3.0.4, [https://bugzilla.lustre.org/])
+AC_PREREQ([2.57])
+AC_INIT([Lustre ldiskfs], 3.3.0, [http://bugs.whamcloud.com/])
 AC_CONFIG_SRCDIR([lustre-ldiskfs.spec.in])
 
 # Don't look for install-sh, etc. in ..
-AC_CONFIG_AUX_DIR([.])
+AC_CONFIG_AUX_DIR([config])
+
+AC_CONFIG_MACRO_DIR([config])
 
 AC_CANONICAL_SYSTEM
 
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([1.10 tar-ustar -Wno-portability])
 
 AC_PROG_CC
 
-LB_CANONICAL_SYSTEM
-LB_INCLUDE_RULES
-LB_PROG_CC
+LB_DOWNSTREAM_RELEASE
 
+LB_BUILDID
 
-#
-# LC_TARGET_SUPPORTED
-#
-# is the target os supported?
-#
-AC_DEFUN([LC_TARGET_SUPPORTED],
-[case $target_os in
-	linux* | darwin*)
-$1
-		;;
-	*)
-$2
-		;;
-esac
-])
+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
 
 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'])])
+			     [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_PATH
+	LB_LINUX_SYMVERFILE
+	LB_LINUX_CONFIG([MODULES],[],[
+		AC_MSG_ERROR([module support is required to build ldiskfs kernel module.])
+	])
+	LB_LINUX_CONFIG([MODVERSIONS])
+	LB_LINUX_CONFIG([KALLSYMS],[],[
+		if test "x$ARCH_UM" = "x" ; then
+			AC_MSG_ERROR([ldiskfs requires that CONFIG_KALLSYMS is enabled in your kernel.])
+		fi
+	])
 	LB_LINUX_MODPOST
 fi
-fi
 
-LB_CONFIG_HEADERS
+LB_LDISKFS_SERIES([test x$enable_dist = xno])
+
+AC_MSG_CHECKING([whether to build Lustre server support])
+AC_ARG_ENABLE([server],
+	AC_HELP_STRING([--disable-server],
+	               [disable Lustre server support]),
+	[],[
+		if test -n "$LDISKFS_SERIES"; then
+			enable_server='yes'
+		else
+			enable_server='no'
+		fi
+	])
+AC_MSG_RESULT([$enable_server])
 
-# These allow Lustre Makefiles and autoMakefiles to be used unchanged.
-AM_CONDITIONAL(MODULES, true)
-AM_CONDITIONAL(LINUX, true)
-AM_CONDITIONAL(DARWIN, true)
-AM_CONDITIONAL(LINUX25, true)
+LB_CONFIG_HEADERS
 
 LDISKFSDIR="$PWD/ldiskfs"
 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_MSG_RESULT([$enable_quilt])
-
-AC_PATH_PROG(PATCH, patch, [no])
-
-if test x$enable_quilt = xno ; then
-    QUILT="no"
-else
-    AC_PATH_PROG(QUILT, quilt, [no])
-fi
+LDISKFS_AC_PATCH_PROGRAM
 
-if test x$enable_ldiskfs$PATCH$QUILT = xyesnono ; then
-	AC_MSG_ERROR([Quilt or patch are needed to build the ldiskfs module])
+if test x$enable_server$enable_dist = xyesno ; then
+LB_LDISKFS_EXT_DIR
+LB_LDISKFS_EXT_SOURCE
+LB_LDISKFS_DEFINE_OPTIONS
 fi
 
-AM_CONDITIONAL(USE_QUILT, test x$QUILT != xno)
-
-LB_DEFINE_LDISKFS_OPTIONS
-
-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-*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.22*) LDISKFS_SERIES="2.6.22-vanilla.series";;
-*) AC_MSG_WARN([Unknown kernel version $LINUXRELEASE, fix ldiskfs/configure.ac])
-esac
-AC_MSG_RESULT([$LDISKFS_SERIES])
-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.*'
+AC_CONFIG_FILES([Makefile ldiskfs/Makefile]
+		AC_PACKAGE_TARNAME[.spec])
+
+MOSTLYCLEANFILES='.*.cmd .*.flags *.o *.ko *.mod.c .depend .*.1.* Modules.symvers Module.symvers'
 AC_SUBST(MOSTLYCLEANFILES)
 
 AC_OUTPUT