Merge changes from CUPS 1.6svn-r9968.

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

diff --git a/config-scripts/cups-compiler.m4 b/config-scripts/cups-compiler.m4
index 8699f6e55dc77923f395e51211cded7fa9f162a2..b00b055718aef267e25372f56aea9597d6d83acd 100644 (file)
--- a/config-scripts/cups-compiler.m4
+++ b/config-scripts/cups-compiler.m4
@@ -100,9 +100,6 @@ AC_SUBST(PIEFLAGS)
 RELROFLAGS=""
 AC_SUBST(RELROFLAGS)
 
-PHPOPTIONS=""
-AC_SUBST(PHPOPTIONS)
-
 if test -n "$GCC"; then
        # Add GCC-specific compiler options...
        if test -z "$OPTIM"; then
@@ -156,9 +153,7 @@ if test -n "$GCC"; then
 
                # Additional warning options for development testing...
                if test -d .svn; then
-                       OPTIM="-Wshadow $OPTIM"
-                       CFLAGS="-Werror-implicit-function-declaration $CFLAGS"
-                       PHPOPTIONS="-Wno-shadow"
+                       OPTIM="-Wshadow -Werror $OPTIM"
                else
                        AC_MSG_CHECKING(if GCC supports -Wno-tautological-compare)
                        OLDCFLAGS="$CFLAGS"