diff options
| author | Brian Behlendorf <[email protected]> | 2008-11-26 15:32:39 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2008-11-26 15:32:39 -0800 |
| commit | 62b749c8c846442f37f41c8ae5c612d75308c046 (patch) | |
| tree | 4ae157bd8dccf505bc8104b9c4dd84ee14fb661d /config/zfs-build.m4 | |
| parent | f0e648ca02f55bb2c4bc328656769a0c529f683a (diff) | |
Working version of M4 macro config
Diffstat (limited to 'config/zfs-build.m4')
| -rw-r--r-- | config/zfs-build.m4 | 77 |
1 files changed, 39 insertions, 38 deletions
diff --git a/config/zfs-build.m4 b/config/zfs-build.m4 index 61b0c2953..6df90696d 100644 --- a/config/zfs-build.m4 +++ b/config/zfs-build.m4 @@ -1,40 +1,3 @@ -AC_DEFUN([ZFS_AC_CONFIG], [ - - TOPDIR=`/bin/pwd` - BUILDDIR=$ZFS_META_NAME #+$zfsconfig - ZFSDIR=$TOPDIR/$BUILDDIR - LIBDIR=$ZFSDIR/lib - CMDDIR=$ZFSDIR/zcmd - UNAME=`uname -r | cut -d- -f1` - - AC_SUBST(UNAME) - AC_SUBST(TOPDIR) - AC_SUBST(BUILDDIR) - AC_SUBST(ZFSDIR) - AC_SUBST(LIBDIR) - AC_SUBST(CMDDIR) - AC_SUBST(UNAME) - - AC_ARG_WITH([zfs-config], - AS_HELP_STRING([--with-config=CONFIG], - [Config file 'kernel|user|lustre']), - [zfsconfig="$withval"]) - - AC_MSG_CHECKING([zfs config file]) - - [ case "$zfsconfig" in - kernel) ZFS_AC_KERNEL_CONFIG ;; - user) ZFS_AC_USER_CONFIG ;; - lustre) ZFS_AC_LUSTRE_CONFIG ;; - *) - AC_MSG_RESULT([Error!]) - AC_MSG_ERROR([Bad value "$zfsconfig" for --with-config, - user kernel|user|lustre]) ;; - esac ] - - AC_MSG_RESULT([$zfsconfig]); -]) - AC_DEFUN([ZFS_AC_KERNEL], [ ver=`uname -r` @@ -236,7 +199,7 @@ AC_DEFUN([ZFS_AC_DEBUG], [ fi ]) -AC_DEFUN([ZFS_AC_SCRIPT_CONFIG], [ +AC_DEFUN([ZFS_AC_CONFIG_SCRIPT], [ SCRIPT_CONFIG=.script-config rm -f ${SCRIPT_CONFIG} echo "KERNELSRC=${LINUX}" >>${SCRIPT_CONFIG} @@ -256,6 +219,44 @@ AC_DEFUN([ZFS_AC_SCRIPT_CONFIG], [ echo "CMDDIR=${CMDDIR}" >>${SCRIPT_CONFIG} ]) +AC_DEFUN([ZFS_AC_CONFIG], [ + + TOPDIR=`/bin/pwd` + BUILDDIR=$ZFS_META_NAME #+$zfsconfig + ZFSDIR=$TOPDIR/$BUILDDIR + LIBDIR=$ZFSDIR/lib + CMDDIR=$ZFSDIR/zcmd + UNAME=`uname -r | cut -d- -f1` + + AC_SUBST(UNAME) + AC_SUBST(TOPDIR) + AC_SUBST(BUILDDIR) + AC_SUBST(ZFSDIR) + AC_SUBST(LIBDIR) + AC_SUBST(CMDDIR) + AC_SUBST(UNAME) + + AC_ARG_WITH([zfs-config], + AS_HELP_STRING([--with-config=CONFIG], + [Config file 'kernel|user|lustre']), + [zfsconfig="$withval"]) + + AC_MSG_CHECKING([zfs config]) + AC_MSG_RESULT([$zfsconfig]); + + case "$zfsconfig" in + kernel) ZFS_AC_CONFIG_KERNEL ;; + user) ZFS_AC_CONFIG_USER ;; + lustre) ZFS_AC_CONFIG_LUSTRE ;; + *) + AC_MSG_RESULT([Error!]) + AC_MSG_ERROR([Bad value "$zfsconfig" for --with-config, + user kernel|user|lustre]) ;; + esac + + ZFS_AC_CONFIG_SCRIPT +]) + dnl # dnl # ZFS_LINUX_CONFTEST dnl # |