X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=config%2Fzfs-build.m4;h=823f332664e4034589bcc69c52a9ea55871f1e5d;hb=613d88eda89945bb0011ddc05d3bd064bf1a8e1b;hp=59771313903755fc66cc93d4e87946152dc4ee28;hpb=6ba3b44614fa6482bd2d7363964b65f0289b0f4f;p=zfs.git

diff --git a/config/zfs-build.m4 b/config/zfs-build.m4
index 5977131..823f332 100644
--- a/config/zfs-build.m4
+++ b/config/zfs-build.m4
@@ -20,16 +20,20 @@ AC_DEFUN([ZFS_AC_DEBUG], [
 		HOSTCFLAGS="${HOSTCFLAGS} -DDEBUG -Werror"
 		DEBUG_CFLAGS="-DDEBUG -Werror"
 		DEBUG_STACKFLAGS="-fstack-check"
+		DEBUG_ZFS="_with_debug"
+		AC_DEFINE(ZFS_DEBUG, 1, [zfs debugging enabled])
 	],
 	[
 		KERNELCPPFLAGS="${KERNELCPPFLAGS} -DNDEBUG "
 		HOSTCFLAGS="${HOSTCFLAGS} -DNDEBUG "
 		DEBUG_CFLAGS="-DNDEBUG"
 		DEBUG_STACKFLAGS=""
+		DEBUG_ZFS="_without_debug"
 	])
 
 	AC_SUBST(DEBUG_CFLAGS)
 	AC_SUBST(DEBUG_STACKFLAGS)
+	AC_SUBST(DEBUG_ZFS)
 	AC_MSG_RESULT([$enable_debug])
 ])
 
@@ -234,12 +238,12 @@ AC_DEFUN([ZFS_AC_DEFAULT_PACKAGE], [
 		VENDOR=sles ;
 	elif test -f /etc/slackware-version ; then
 		VENDOR=slackware ;
+	elif test -f /etc/arch-release ; then
+		VENDOR=arch ;
 	elif test -f /etc/lsb-release ; then
 		VENDOR=ubuntu ;
 	elif test -f /etc/lunar.release ; then
 		VENDOR=lunar ;
-	elif test -f /etc/arch-release ; then
-		VENDOR=arch ;
 	else
 		VENDOR= ;
 	fi
@@ -294,9 +298,10 @@ dnl #
 dnl # Default ZFS package configuration
 dnl #
 AC_DEFUN([ZFS_AC_PACKAGE], [
+	ZFS_AC_DEFAULT_PACKAGE
 	ZFS_AC_RPM
 	ZFS_AC_DPKG
 	ZFS_AC_ALIEN
-	ZFS_AC_PACMAN
-	ZFS_AC_DEFAULT_PACKAGE
+
+	AS_IF([test "$VENDOR" = "arch"], [ZFS_AC_PACMAN])
 ])