Drop -Wno-format-truncation since only newer versions of GCC support it and the confi...

diff --git a/config-scripts/cups-compiler.m4 b/config-scripts/cups-compiler.m4
index 50f910867fa6f439a3d37c55e53efbdb61c57b96..a6923750a04b5abab91a761cde82c16aa6ef3969 100644 (file)
--- a/config-scripts/cups-compiler.m4
+++ b/config-scripts/cups-compiler.m4
@@ -181,17 +181,8 @@ if test -n "$GCC"; then
                        AC_MSG_RESULT(no))
                CFLAGS="$OLDCFLAGS"
 
-               AC_MSG_CHECKING(whether compiler supports -Wno-format-truncation)
-               OLDCFLAGS="$CFLAGS"
-               CFLAGS="$CFLAGS -Werror -Wno-format-truncation"
-               AC_TRY_COMPILE(,,
-                       [OPTIM="$OPTIM -Wno-format-truncation"
-                       AC_MSG_RESULT(yes)],
-                       AC_MSG_RESULT(no))
-               CFLAGS="$OLDCFLAGS"
-
                # Additional warning options for development testing...
-               if test -d .svn; then
+               if test -d .git; then
                        OPTIM="-Werror $OPTIM"
                fi
        fi

diff --git a/configure b/configure
index eee441edf8a98a8fa6fdb05cb44e18b58a6bc21c..27389d33702bdea652dce94b3027673200fd7048 100755 (executable)
--- a/configure
+++ b/configure
@@ -7088,34 +7088,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
                CFLAGS="$OLDCFLAGS"
 
-               { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiler supports -Wno-format-truncation" >&5
-$as_echo_n "checking whether compiler supports -Wno-format-truncation... " >&6; }
-               OLDCFLAGS="$CFLAGS"
-               CFLAGS="$CFLAGS -Werror -Wno-format-truncation"
-               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  OPTIM="$OPTIM -Wno-format-truncation"
-                       { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-               CFLAGS="$OLDCFLAGS"
-
                # Additional warning options for development testing...
-               if test -d .svn; then
+               if test -d .git; then
                        OPTIM="-Werror $OPTIM"
                fi
        fi