Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk

This commit is contained in:
Brian Behlendorf 2009-11-24 14:18:47 -08:00
parent e9884bad93 c8bd25ac98
commit 95f7d768e0
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
config/zfs-build.m4
View File

@ -98,6 +98,7 @@ AC_DEFUN([ZFS_AC_CONFIG], [
CMDDIR=$TOPDIR/cmd CMDDIR=$TOPDIR/cmd
MODDIR=$TOPDIR/module MODDIR=$TOPDIR/module
SCRIPTDIR=$TOPDIR/scripts SCRIPTDIR=$TOPDIR/scripts
TARGET_ASM_DIR=asm-generic
AC_SUBST(TOPDIR) AC_SUBST(TOPDIR)
AC_SUBST(BUILDDIR) AC_SUBST(BUILDDIR)
@ -105,11 +106,12 @@ AC_DEFUN([ZFS_AC_CONFIG], [
AC_SUBST(CMDDIR) AC_SUBST(CMDDIR)
AC_SUBST(MODDIR) AC_SUBST(MODDIR)
AC_SUBST(SCRIPTDIR) AC_SUBST(SCRIPTDIR)
AC_SUBST(TARGET_ASM_DIR)
ZFS_CONFIG=all ZFS_CONFIG=all
AC_ARG_WITH([config], AC_ARG_WITH([config],
AS_HELP_STRING([--with-config=CONFIG], AS_HELP_STRING([--with-config=CONFIG],
[Config file 'kernel|user|all']), [Config file 'kernel|user|all|srpm']),
[ZFS_CONFIG="$withval"]) [ZFS_CONFIG="$withval"])
AC_MSG_CHECKING([zfs config]) AC_MSG_CHECKING([zfs config])
@ -121,10 +123,11 @@ AC_DEFUN([ZFS_AC_CONFIG], [
user) ZFS_AC_CONFIG_USER ;; user) ZFS_AC_CONFIG_USER ;;
all) ZFS_AC_CONFIG_KERNEL all) ZFS_AC_CONFIG_KERNEL
ZFS_AC_CONFIG_USER ;; ZFS_AC_CONFIG_USER ;;
srpm) ;;
*) *)
AC_MSG_RESULT([Error!]) AC_MSG_RESULT([Error!])
AC_MSG_ERROR([Bad value "$ZFS_CONFIG" for --with-config, AC_MSG_ERROR([Bad value "$ZFS_CONFIG" for --with-config,
user kernel|user|all]) ;; user kernel|user|all|srpm]) ;;
esac esac
AM_CONDITIONAL([CONFIG_USER], AM_CONDITIONAL([CONFIG_USER],