Fix undefined RPM macros

Always invoke the SPL_AC_DEBUG* macro's when running configure
so RPM_DEFINE_COMMON is correctly expanded.  A similar change
was already applied to ZFS.

Reviewed-by: George Melikov <mail@gmelikov.ru>
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #703

diff --git a/config/spl-build.m4 b/config/spl-build.m4
index 9c97e64f910b56a0f1cee472f0c99ee934defbd9..5c6c02af2ad8e065d71e06bb6620d69462e2f676 100644 (file)
--- a/config/spl-build.m4
+++ b/config/spl-build.m4
@@ -17,9 +17,6 @@ AC_DEFUN([SPL_AC_CONFIG_KERNEL], [
        KERNELCPPFLAGS="$KERNELCPPFLAGS -Wstrict-prototypes"
        AC_SUBST(KERNELCPPFLAGS)
 
-       SPL_AC_DEBUG
-       SPL_AC_DEBUG_KMEM
-       SPL_AC_DEBUG_KMEM_TRACKING
        SPL_AC_TEST_MODULE
        SPL_AC_ATOMIC_SPINLOCK
        SPL_AC_SHRINKER_CALLBACK
@@ -228,7 +225,9 @@ AC_DEFUN([SPL_AC_RPM], [
                AC_MSG_RESULT([$HAVE_RPMBUILD])
        ])
 
-       RPM_DEFINE_COMMON='--define "$(DEBUG_SPL) 1" --define "$(DEBUG_KMEM) 1" --define "$(DEBUG_KMEM_TRACKING) 1"'
+       RPM_DEFINE_COMMON='--define "$(DEBUG_SPL) 1"'
+       RPM_DEFINE_COMMON+=' --define "$(DEBUG_KMEM) 1"'
+       RPM_DEFINE_COMMON+=' --define "$(DEBUG_KMEM_TRACKING) 1"'
        RPM_DEFINE_UTIL=
        RPM_DEFINE_KMOD='--define "kernels $(LINUX_VERSION)"'
        RPM_DEFINE_KMOD+=' --define "_wrong_version_format_terminate_build 0"'

diff --git a/configure.ac b/configure.ac
index 59ee3ca0badbbf4c8f678c5281775d3aa3181cc4..ab53879e7566b4f92d2674bb2beb3b97d1aaac96 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -46,6 +46,9 @@ AC_PROG_LIBTOOL
 SPL_AC_LICENSE
 SPL_AC_PACKAGE
 SPL_AC_CONFIG
+SPL_AC_DEBUG
+SPL_AC_DEBUG_KMEM
+SPL_AC_DEBUG_KMEM_TRACKING
 
 AC_CONFIG_FILES([
        Makefile