Ported r137 from branches/v2_2_6_1 (test gcc options)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1086e16255b3544db059ef4e43a1bf874c45431f..f7d63200da8c2394791a8684732757dbdb3ed1d5 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ PROJECT(sarg C)
 SET(sarg_VERSION 2)
 SET(sarg_REVISION 2)
 SET(sarg_BUILD "7rc1")
-SET(sarg_BUILDDATE "Dec-08-2009")
+SET(sarg_BUILDDATE "Dec-09-2009")
 
 INCLUDE(AddFileDependencies)
 INCLUDE(CheckIncludeFile)

diff --git a/ChangeLog b/ChangeLog
index 0aa19bb548c1864ba212ea924de5463ab87fa622..6ed3df6ef0fa7df9ce4f0382e79fe1d2e3f87f25 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,9 +8,10 @@ Dec-03-2009 Version 2.2.7
                - Input log file type detection partly rewritten to clearly distinguish which type is processed where.
                - Read the input log file from standard input if log file name is -.
 
-Dec-08-2009 Version 2.2.6.1
+Dec-09-2009 Version 2.2.6.1
                - Remove unecessary dependency on off_t.
                - Configuration doesn't fail if rlim_t is not available.
+               - Test for the availability of -Werror=xxx flags in gcc.
 
 Oct-14-2009 Version 2.2.6
                - Protection against buffer overflows in getword and friends and report the origin of the error instead of always blaming access.log.

diff --git a/configure b/configure
index 7a61957c2da37f49e3cdafc2bc8e2af75fe26919..d6cc6f6e805873f0d083daca4c92326efba17eed 100755 (executable)
--- a/configure
+++ b/configure
@@ -2773,9 +2773,98 @@ esac
 if test "${CC}" = "cc" ; then
    CFLAGS="${CFLAGS} -g -O2 -Aa"
 fi
-CFLAGS="${CFLAGS} -Wall -Wextra -Werror=implicit-function-declaration -Werror=format -Wno-sign-compare -Wno-unused-parameter"
+CFLAGS="${CFLAGS} -Wall -Wextra -Wno-sign-compare -Wno-unused-parameter"
 
 
+{ echo "$as_me:$LINENO: checking for implicit-function-declaration error flag in gcc" >&5
+echo $ECHO_N "checking for implicit-function-declaration error flag in gcc... $ECHO_C" >&6; }
+saved_CFLAGS="${CFLAGS}"
+CFLAGS="${CFLAGS} -Werror=implicit-function-declaration"
+
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_c_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  have_implicit_function_declaration="yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       have_implicit_function_declaration="no"
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $have_implicit_function_declaration" >&5
+echo "${ECHO_T}$have_implicit_function_declaration" >&6; }
+if test "$have_implicit_function_declaration" == "no" ; then
+    CFLAGS="${saved_CFLAGS}"
+fi
+
+{ echo "$as_me:$LINENO: checking for format error flag in gcc" >&5
+echo $ECHO_N "checking for format error flag in gcc... $ECHO_C" >&6; }
+saved_CFLAGS="${CFLAGS}"
+CFLAGS="${CFLAGS} -Werror=format"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_c_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  have_error_format="yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       have_error_format="no"
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $have_error_format" >&5
+echo "${ECHO_T}$have_error_format" >&6; }
+if test "$have_implicit_function_declaration" == "no" ; then
+    CFLAGS="${saved_CFLAGS}"
+fi
+
 case "$host" in
    *-solaris*)
    LDFLAGS="${LDFLAGS} -lsocket -lnsl"
@@ -2791,7 +2880,6 @@ esac
 
 
 
-
 ac_header_dirent=no
 for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
   as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`

diff --git a/configure.in b/configure.in
index d9c72c554f9e79bc2d96a2c185f013be8baaeb51..5f452abf07e2b204667990fc3ef059ee3c42fa04 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -20,8 +20,27 @@ esac
 if test "${CC}" = "cc" ; then
    CFLAGS="${CFLAGS} -g -O2 -Aa"
 fi
-CFLAGS="${CFLAGS} -Wall -Wextra -Werror=implicit-function-declaration -Werror=format -Wno-sign-compare -Wno-unused-parameter"
+CFLAGS="${CFLAGS} -Wall -Wextra -Wno-sign-compare -Wno-unused-parameter"
 
+dnl Check for supported gcc options
+
+AC_MSG_CHECKING([for implicit-function-declaration error flag in gcc])
+saved_CFLAGS="${CFLAGS}"
+CFLAGS="${CFLAGS} -Werror=implicit-function-declaration"
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([])],[have_implicit_function_declaration="yes"],[have_implicit_function_declaration="no"])
+AC_MSG_RESULT($have_implicit_function_declaration)
+if test "$have_implicit_function_declaration" == "no" ; then
+    CFLAGS="${saved_CFLAGS}"
+fi
+
+AC_MSG_CHECKING([for format error flag in gcc])
+saved_CFLAGS="${CFLAGS}"
+CFLAGS="${CFLAGS} -Werror=format"
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([])],[have_error_format="yes"],[have_error_format="no"])
+AC_MSG_RESULT($have_error_format)
+if test "$have_implicit_function_declaration" == "no" ; then
+    CFLAGS="${saved_CFLAGS}"
+fi
 
 case "$host" in
    *-solaris*)

diff --git a/include/info.h b/include/info.h
index 45e7027c9b0f791ea8160ee2818484ae62643e88..fc91f62c56efba8c61a1ed4fb49ffc27b8328d7a 100755 (executable)
--- a/include/info.h
+++ b/include/info.h
@@ -1,3 +1,3 @@
-#define VERSION PACKAGE_VERSION" Dec-08-2009"
+#define VERSION PACKAGE_VERSION" Dec-09-2009"
 #define PGM PACKAGE_NAME
 #define URL "http://sarg.sourceforge.net"