From: Frédéric Marchal <fmarchal@users.sourceforge.net>
Date: Thu, 10 Dec 2009 15:44:04 +0000 (+0000)
Subject: Ported r152 from branches/v2_2_6_1 (detect bzero with autoconf)
X-Git-Tag: v2_2_7~53
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=40d681bc1db2306599dfee431a4f71d3027259b9;p=thirdparty%2Fsarg.git

Ported r152 from branches/v2_2_6_1 (detect bzero with autoconf)
---

diff --git a/ChangeLog b/ChangeLog
index b3e02fa..2c0a13e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@ Dec-09-2009 Version 2.2.6.1
 		- Fix sort delimiter when reading useragent log (thanks to Maxim Britov).
 		- Fix user agent report font size and statistics on user agent.
 		- Test for the availability of -Werror=format-security in gcc (thanks to Maxim Britov).
+		- Test the existence of bzero with autoconf and don't redefine it (tkanks to Maxim Britov).
 
 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 8659a5d..9441291 100755
--- a/configure
+++ b/configure
@@ -5616,6 +5616,100 @@ _ACEOF
 fi
 
 
+for ac_func in bzero
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
+int
+main ()
+{
+return $ac_func ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+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_link") 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_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	eval "$as_ac_var=no"
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval echo '${'$as_ac_var'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
 { echo "$as_me:$LINENO: checking for rlim_t" >&5
 echo $ECHO_N "checking for rlim_t... $ECHO_C" >&6; }
 if test "${ac_cv_type_rlim_t+set}" = set; then
diff --git a/configure.in b/configure.in
index 06f2ac8..7176328 100644
--- a/configure.in
+++ b/configure.in
@@ -95,6 +95,8 @@ if test "$bu_cv_have_fopen64" != no; then
   fi
 fi
 
+dnl check for functions
+AC_CHECK_FUNCS(bzero)
 
 dnl check for the rlim_t size
 AC_CHECK_SIZEOF(rlim_t,1,[#if HAVE_SYS_RESOURCE_H