X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=ldiskfs%2Fconfigure.ac;h=4dd5f6711976bd43311dd962bac96da57f16fe1c;hp=a57aa7530a3f05c3de7dd253050ef5352acdf6ba;hb=58444c4e9bc58e192f0bc0c163a5d51d42ba4255;hpb=73e6bf2e49d61b200f63526288fb4507c0736d7e diff --git a/ldiskfs/configure.ac b/ldiskfs/configure.ac index a57aa75..4dd5f67 100644 --- a/ldiskfs/configure.ac +++ b/ldiskfs/configure.ac @@ -1,170 +1,89 @@ # Process this file with autoconf to produce a configure script. -AC_INIT([Lustre ldiskfs], 3.0.9, [https://bugzilla.lustre.org/]) +AC_PREREQ([2.57]) +AC_INIT([Lustre ldiskfs], 4.1.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]) +AM_MAINTAINER_MODE([enable]) AC_PROG_CC -LB_CANONICAL_SYSTEM -LB_INCLUDE_RULES -LB_PROG_CC +LB_DOWNSTREAM_RELEASE +LB_BUILDID + +LB_PROG_CC -# -# LC_TARGET_SUPPORTED -# -# is the target os supported? -# -AC_DEFUN([LC_TARGET_SUPPORTED], -[case $target_os in - linux* | darwin*) -$1 - ;; - *) -$2 - ;; -esac -]) - -AC_DEFUN([LC_KERNEL_WITH_EXT4], -[if test -f $LINUX/fs/ext4/ext4.h ; then -$1 -else -$2 +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_MODPOST + 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],[],[ + AC_MSG_ERROR([ldiskfs requires that CONFIG_KALLSYMS is enabled in your kernel.]) + ]) fi -fi - -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) -AM_CONDITIONAL(LINUX25, true) +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]) 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]) +LDISKFS_AC_PATCH_PROGRAM -if test x$enable_quilt = xno ; then - QUILT="no" -else - AC_PATH_PROG(QUILT, quilt, [no]) +if test x$enable_server$enable_dist = xyesno ; then +LB_LDISKFS_EXT_DIR +LB_LDISKFS_EXT_SOURCE +LB_EXT_FREE_BLOCKS_WITH_BUFFER_HEAD +LB_EXT_PBLOCK fi -if test x$enable_ldiskfs$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) - -LB_DEFINE_LDISKFS_OPTIONS - -AC_MSG_CHECKING([whether to build ldisk based on ext4]) -AC_ARG_ENABLE([ext4], - AC_HELP_STRING([--enable-ext4], - [enable building of ldiskfs based on ext4]), - [LC_KERNEL_WITH_EXT4([enable_ext4='yes'], - [enable_ext4='no'])],[]) -AC_MSG_RESULT([$enable_ext4]) - -if test x$enable_ext4 = xyes ; then - AC_DEFINE(HAVE_EXT4_LDISKFS, 1, [ldiskfs based on ext4]) - BACKFS=ext4 -else - 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) - -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" - 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]) -AC_SUBST(LDISKFS_SERIES) +LB_CONFIG_HEADERS 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]) +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)