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

Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device

This commit is contained in:
Brian Behlendorf 2010-05-18 15:13:22 -07:00
parent ddc8a9111f 4e7fd8ff9d
commit 08ca15504a
2 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
config/zfs-build.m4
View File

@ -7,28 +7,34 @@ AC_DEFUN([ZFS_AC_LICENSE], [
]) ])
AC_DEFUN([ZFS_AC_DEBUG], [ AC_DEFUN([ZFS_AC_DEBUG], [
AC_MSG_CHECKING([whether debugging is enabled]) AC_MSG_CHECKING([whether debugging is enabled])
AC_ARG_ENABLE( [debug], AC_ARG_ENABLE( [debug],
AS_HELP_STRING([--enable-debug], AS_HELP_STRING([--enable-debug],
[Enable generic debug support (default off)]), [Enable generic debug support (default off)]),
[ case "$enableval" in [ case "$enableval" in
yes) zfs_ac_debug=yes ;; yes) zfs_ac_debug=yes ;;
no) zfs_ac_debug=no ;; no) zfs_ac_debug=no ;;
*) AC_MSG_RESULT([Error!]) *) AC_MSG_RESULT([Error!])
AC_MSG_ERROR([Bad value "$enableval" for --enable-debug]) ;; AC_MSG_ERROR([Bad value "$enableval" for --enable-debug]) ;;
esac ] esac ]
) )
if test "$zfs_ac_debug" = yes; then if test "$zfs_ac_debug" = yes; then
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
KERNELCPPFLAGS="${KERNELCPPFLAGS} -DDEBUG " AC_DEFINE([DEBUG], [1],
[Define to 1 to enable debug tracing])
KERNELCPPFLAGS="${KERNELCPPFLAGS} -DDEBUG "
HOSTCFLAGS="${HOSTCFLAGS} -DDEBUG " HOSTCFLAGS="${HOSTCFLAGS} -DDEBUG "
else USERDEBUG="-DDEBUG"
AC_MSG_RESULT([no]) else
AC_DEFINE([NDEBUG], [1], AC_MSG_RESULT([no])
[Define to 1 to disable debug tracing]) AC_DEFINE([NDEBUG], [1],
KERNELCPPFLAGS="${KERNELCPPFLAGS} -DNDEBUG " [Define to 1 to disable debug tracing])
KERNELCPPFLAGS="${KERNELCPPFLAGS} -DNDEBUG "
HOSTCFLAGS="${HOSTCFLAGS} -DNDEBUG " HOSTCFLAGS="${HOSTCFLAGS} -DNDEBUG "
fi USERDEBUG="-DNDEBUG"
fi
AC_SUBST(USERDEBUG)
]) ])
AC_DEFUN([ZFS_AC_CONFIG_SCRIPT], [ AC_DEFUN([ZFS_AC_CONFIG_SCRIPT], [

2
scripts/zpool-create.sh
View File

@ -24,10 +24,10 @@ DESCRIPTION:
OPTIONS: OPTIONS:
-h Show this message -h Show this message
-v Verbose -v Verbose
-f Force everything
-c Configuration for zpool -c Configuration for zpool
-p Name for zpool -p Name for zpool
-d Destroy zpool (default create) -d Destroy zpool (default create)
-f Force everything
-l Additional zpool options -l Additional zpool options
-s Additional zfs options -s Additional zfs options