X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=ldiskfs%2Fconfigure.ac;h=d7e422b995468ca6ddf736c460b22980d958a76f;hb=f5ecf580adc319fd9abe41bd79389b50015d5c13;hp=5f3a1ecd53946652509ef0bfa431dd46c116ee72;hpb=bd301e8c9f322ae22070cc76bce96266168407ad;p=fs%2Flustre-release.git

diff --git a/ldiskfs/configure.ac b/ldiskfs/configure.ac
index 5f3a1ec..d7e422b 100644
--- a/ldiskfs/configure.ac
+++ b/ldiskfs/configure.ac
@@ -1,24 +1,24 @@
 # Process this file with autoconf to produce a configure script.
 
+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([1.9 tar-ustar])
+AM_INIT_AUTOMAKE([1.10 tar-ustar])
 
 AC_PROG_CC
 
-LB_CANONICAL_SYSTEM
-
 LB_DOWNSTREAM_RELEASE
 
 LB_BUILDID
 
-LB_INCLUDE_RULES
 LB_PROG_CC
 
 AC_ARG_ENABLE([dist],
@@ -30,32 +30,26 @@ if test x$enable_dist != xno; then
 	enable_modules='no'
 fi
 
-#
-# LC_TARGET_SUPPORTED
-#
-# is the target os supported?
-#
-AC_DEFUN([LC_TARGET_SUPPORTED],
-[case $target_os in
-	linux* | darwin*)
-$1
-		;;
-	*)
-$2
-		;;
-esac
-])
-
 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
+	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
 
@@ -76,34 +70,10 @@ AC_MSG_RESULT([$enable_server])
 
 LB_CONFIG_HEADERS
 
-# These allow Lustre Makefiles and autoMakefiles to be used unchanged.
-AM_CONDITIONAL(MODULES, true)
-AM_CONDITIONAL(LINUX, true)
-AM_CONDITIONAL(DARWIN, true)
-
 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
-
-if test x$enable_server$PATCH$QUILT = xyesnono ; then
-	AC_MSG_ERROR([Quilt or patch are needed to build the ldiskfs module])
-fi
-
-AM_CONDITIONAL(USE_QUILT, test x$QUILT != xno)
+LDISKFS_AC_PATCH_PROGRAM
 
 if test x$enable_server$enable_dist = xyesno ; then
 LB_LDISKFS_EXT_DIR
@@ -115,8 +85,8 @@ AM_CONDITIONAL(LDISKFS_PDO, test x$with_ldiskfs_pdo = xyes)
 
 AC_SUBST(ac_configure_args)
 
-LB_CONFIG_FILES
-AC_CONFIG_FILES([ldiskfs/autoMakefile ldiskfs/Makefile])
+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)