Move build system and core script changes to correct zfs-branch.

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

diff --git a/scripts/zpool-create.sh b/scripts/zpool-create.sh
index ac7ab9ad9aa125073b7de1a61733c6cb91d7b237..8e44f81c660b358f1a8ff1225004061a49d22c4d 100755 (executable)
--- a/scripts/zpool-create.sh
+++ b/scripts/zpool-create.sh
@@ -24,10 +24,10 @@ DESCRIPTION:
 OPTIONS:
         -h      Show this message
         -v      Verbose
+        -f      Force everything
         -c      Configuration for zpool
         -p      Name for zpool
         -d      Destroy zpool (default create)
-        -f      Force everything
         -l      Additional zpool options
         -s      Additional zfs options