Import changes from CUPS 1.4svn-r8704.

[thirdparty/cups.git] / config-scripts / cups-compiler.m4

diff --git a/config-scripts/cups-compiler.m4 b/config-scripts/cups-compiler.m4
index b51d7cc5c267b70167e1e9887f48b9ca539e5ff0..f3aa1b2401fc2ee258eaf6f14c0487e1c3c7562a 100644 (file)
--- a/config-scripts/cups-compiler.m4
+++ b/config-scripts/cups-compiler.m4
@@ -36,12 +36,14 @@ fi
 dnl Debug printfs can slow things down, so provide a separate option for that
 if test x$enable_debug_printfs = xyes; then
        CFLAGS="$CFLAGS -DDEBUG"
+       CXXFLAGS="$CXXFLAGS -DDEBUG"
 fi
 
 dnl Debug guards use an extra 4 bytes for some structures like strings in the
 dnl string pool, so provide a separate option for that
 if test x$enable_debug_guards = xyes; then
        CFLAGS="$CFLAGS -DDEBUG_GUARDS"
+       CXXFLAGS="$CXXFLAGS -DDEBUG_GUARDS"
 fi
 
 dnl Unit tests take up time during a compile...
@@ -138,7 +140,7 @@ if test -n "$GCC"; then
        AC_MSG_CHECKING(if GCC supports -fstack-protector)
        OLDCFLAGS="$CFLAGS"
        CFLAGS="$CFLAGS -fstack-protector"
-       AC_TRY_COMPILE(,,
+       AC_TRY_LINK(,,
                OPTIM="$OPTIM -fstack-protector"
                AC_MSG_RESULT(yes),
                AC_MSG_RESULT(no))