fix malloc detection (and double definition).

git-svn-id: file:///svn/unbound/trunk@2564 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/acx_nlnetlabs.m4 b/acx_nlnetlabs.m4
index 06f23810c9f94d534f03c7ce706630e308d28463..69f8c91f693613093ea18023384167a0631a209b 100644 (file)
--- a/acx_nlnetlabs.m4
+++ b/acx_nlnetlabs.m4
@@ -2,8 +2,9 @@
 # Copyright 2009, Wouter Wijngaards, NLnet Labs.   
 # BSD licensed.
 #
-# Version 17
+# Version 18
 # 2011-12-05 Fix getaddrinfowithincludes on windows with fedora16 mingw32-gcc.
+#           Fix ACX_MALLOC for redefined malloc error.
 # 2011-11-10 Fix FLTO test to not drop a.out in current directory.
 # 2011-11-01 Fix FLTO test for llvm on Lion.
 # 2011-08-01 Fix nonblock test (broken at v13).
@@ -1057,10 +1058,20 @@ dnl detect malloc and provide malloc compat prototype.
 dnl $1: unique name for compat code
 AC_DEFUN([ACX_FUNC_MALLOC],
 [
-       AC_FUNC_MALLOC
-       if test "$ac_cv_func_malloc_0_nonnull" = no; then
-               AC_DEFINE_UNQUOTED([malloc], [rpl_malloc_$1], [Define if  replacement function should be used.])
-       fi
+       AC_MSG_CHECKING([for GNU libc compatible malloc])
+       AC_RUN_IFELSE([AC_LANG_PROGRAM(
+[[#if defined STDC_HEADERS || defined HAVE_STDLIB_H
+#include <stdlib.h>
+#else
+char *malloc ();
+#endif
+]], [ if(malloc(0) != 0) return 1;])
+],
+       [AC_MSG_RESULT([no])
+       AC_DEFINE_UNQUOTED([malloc], [rpl_malloc_$1], [Define if  replacement function should be used.])] ,
+       [AC_MSG_RESULT([yes])],
+       [AC_MSG_RESULT([no (crosscompile)])
+       AC_DEFINE_UNQUOTED([malloc], [rpl_malloc_$1], [Define if  replacement function should be used.])] )
 ])
 
 dnl Define fallback for fseeko and ftello if needed.

diff --git a/config.h.in b/config.h.in
index fe1d970a9b6e65f6f9e005adfeb6bb64a559b637..ac721b1280b2798109a82828c5d4861e0f44030d 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -170,10 +170,6 @@
 /* Define to 1 if you have the <login_cap.h> header file. */
 #undef HAVE_LOGIN_CAP_H
 
-/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
-   to 0 otherwise. */
-#undef HAVE_MALLOC
-
 /* Define to 1 if you have the `memmove' function. */
 #undef HAVE_MEMMOVE
 

diff --git a/configure b/configure
index 1b47f73d3fe05118ed630777091280a2a1d03c37..fbaf791ba9e6182ef6bec62e76632620269cf285 100755 (executable)
--- a/configure
+++ b/configure
@@ -781,6 +781,9 @@ with_sysroot
 enable_libtool_lock
 enable_rpath
 enable_largefile
+enable_alloc_checks
+enable_alloc_lite
+enable_alloc_nonregional
 with_pthreads
 with_solaris_threads
 with_pyunbound
@@ -792,9 +795,6 @@ with_libevent
 with_libexpat
 enable_static_exe
 enable_lock_checks
-enable_alloc_checks
-enable_alloc_lite
-enable_alloc_nonregional
 enable_allsymbols
 with_ldns
 '
@@ -1435,12 +1435,6 @@ Optional Features:
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --disable-rpath         disable hardcoded rpath (default=enabled)
   --disable-largefile     omit support for large files
-  --disable-sha2          Disable SHA256 and SHA512 RRSIG support
-  --disable-gost          Disable GOST support
-  --enable-static-exe     enable to compile executables statically against
-                          event, ldns libs, for debug purposes
-  --enable-lock-checks    enable to check lock and unlock calls, for debug
-                          purposes
   --enable-alloc-checks   enable to memory allocation statistics, for debug
                           purposes
   --enable-alloc-lite     enable for lightweight alloc assertions, for debug
@@ -1449,6 +1443,12 @@ Optional Features:
                           enable nonregional allocs, slow but exposes regional
                           allocations to other memory purifiers, for debug
                           purposes
+  --disable-sha2          Disable SHA256 and SHA512 RRSIG support
+  --disable-gost          Disable GOST support
+  --enable-static-exe     enable to compile executables statically against
+                          event, ldns libs, for debug purposes
+  --enable-lock-checks    enable to check lock and unlock calls, for debug
+                          purposes
   --enable-allsymbols     export all symbols from libunbound and link binaries
                           to it, smaller install size but libunbound export
                           table is polluted by internal symbols
@@ -14750,6 +14750,86 @@ fi
 done
 
 
+# set memory allocation checking if requested
+# Check whether --enable-alloc-checks was given.
+if test "${enable_alloc_checks+set}" = set; then :
+  enableval=$enable_alloc_checks;
+fi
+
+# Check whether --enable-alloc-lite was given.
+if test "${enable_alloc_lite+set}" = set; then :
+  enableval=$enable_alloc_lite;
+fi
+
+# Check whether --enable-alloc-nonregional was given.
+if test "${enable_alloc_nonregional+set}" = set; then :
+  enableval=$enable_alloc_nonregional;
+fi
+
+if test x_$enable_alloc_nonregional = x_yes; then
+
+$as_echo "#define UNBOUND_ALLOC_NONREGIONAL 1" >>confdefs.h
+
+fi
+if test x_$enable_alloc_checks = x_yes; then
+
+$as_echo "#define UNBOUND_ALLOC_STATS 1" >>confdefs.h
+
+else
+       if test x_$enable_alloc_lite = x_yes; then
+
+$as_echo "#define UNBOUND_ALLOC_LITE 1" >>confdefs.h
+
+       else
+
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5
+$as_echo_n "checking for GNU libc compatible malloc... " >&6; }
+       if test "$cross_compiling" = yes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (crosscompile)" >&5
+$as_echo "no (crosscompile)" >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define malloc rpl_malloc_unbound
+_ACEOF
+
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#if defined STDC_HEADERS || defined HAVE_STDLIB_H
+#include <stdlib.h>
+#else
+char *malloc ();
+#endif
+
+int
+main ()
+{
+ if(malloc(0) != 0) return 1;
+  ;
+  return 0;
+}
+
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+cat >>confdefs.h <<_ACEOF
+#define malloc rpl_malloc_unbound
+_ACEOF
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+
+       fi
+fi
+
 # check windows threads (we use them, not pthreads, on windows).
 if test "$on_mingw" = "yes"; then
 # check windows threads
@@ -16856,116 +16936,6 @@ $as_echo "#define ENABLE_LOCK_CHECKS 1" >>confdefs.h
 
 fi
 
-# set memory allocation checking if requested
-# Check whether --enable-alloc-checks was given.
-if test "${enable_alloc_checks+set}" = set; then :
-  enableval=$enable_alloc_checks;
-fi
-
-# Check whether --enable-alloc-lite was given.
-if test "${enable_alloc_lite+set}" = set; then :
-  enableval=$enable_alloc_lite;
-fi
-
-# Check whether --enable-alloc-nonregional was given.
-if test "${enable_alloc_nonregional+set}" = set; then :
-  enableval=$enable_alloc_nonregional;
-fi
-
-if test x_$enable_alloc_nonregional = x_yes; then
-
-$as_echo "#define UNBOUND_ALLOC_NONREGIONAL 1" >>confdefs.h
-
-fi
-if test x_$enable_alloc_checks = x_yes; then
-
-$as_echo "#define UNBOUND_ALLOC_STATS 1" >>confdefs.h
-
-else
-       if test x_$enable_alloc_lite = x_yes; then
-
-$as_echo "#define UNBOUND_ALLOC_LITE 1" >>confdefs.h
-
-       else
-
-       for ac_header in stdlib.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_stdlib_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_STDLIB_H 1
-_ACEOF
-
-fi
-
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5
-$as_echo_n "checking for GNU libc compatible malloc... " >&6; }
-if ${ac_cv_func_malloc_0_nonnull+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  ac_cv_func_malloc_0_nonnull=no
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#if defined STDC_HEADERS || defined HAVE_STDLIB_H
-# include <stdlib.h>
-#else
-char *malloc ();
-#endif
-
-int
-main ()
-{
-return ! malloc (0);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  ac_cv_func_malloc_0_nonnull=yes
-else
-  ac_cv_func_malloc_0_nonnull=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5
-$as_echo "$ac_cv_func_malloc_0_nonnull" >&6; }
-if test $ac_cv_func_malloc_0_nonnull = yes; then :
-
-$as_echo "#define HAVE_MALLOC 1" >>confdefs.h
-
-else
-  $as_echo "#define HAVE_MALLOC 0" >>confdefs.h
-
-   case " $LIBOBJS " in
-  *" malloc.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS malloc.$ac_objext"
- ;;
-esac
-
-
-$as_echo "#define malloc rpl_malloc" >>confdefs.h
-
-fi
-
-
-       if test "$ac_cv_func_malloc_0_nonnull" = no; then
-
-cat >>confdefs.h <<_ACEOF
-#define malloc rpl_malloc_unbound
-_ACEOF
-
-       fi
-
-       fi
-fi
-
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getaddrinfo" >&5
 $as_echo_n "checking for getaddrinfo... " >&6; }

diff --git a/configure.ac b/configure.ac
index 81e0977cbf6e522ba52b657825be7425b26f8d44..3e44320fba6b1afe381314a75666dd67337b61c0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -321,6 +321,29 @@ ACX_CHECK_NONBLOCKING_BROKEN
 ACX_MKDIR_ONE_ARG
 AC_CHECK_FUNCS([strptime],[AC_CHECK_STRPTIME_WORKS],[AC_LIBOBJ([strptime])])
 
+# set memory allocation checking if requested
+AC_ARG_ENABLE(alloc-checks, AC_HELP_STRING([--enable-alloc-checks],
+       [ enable to memory allocation statistics, for debug purposes ]), 
+       , )
+AC_ARG_ENABLE(alloc-lite, AC_HELP_STRING([--enable-alloc-lite],
+       [ enable for lightweight alloc assertions, for debug purposes ]), 
+       , )
+AC_ARG_ENABLE(alloc-nonregional, AC_HELP_STRING([--enable-alloc-nonregional],
+       [ enable nonregional allocs, slow but exposes regional allocations to other memory purifiers, for debug purposes ]), 
+       , )
+if test x_$enable_alloc_nonregional = x_yes; then
+       AC_DEFINE(UNBOUND_ALLOC_NONREGIONAL, 1, [use malloc not regions, for debug use])
+fi
+if test x_$enable_alloc_checks = x_yes; then
+       AC_DEFINE(UNBOUND_ALLOC_STATS, 1, [use statistics for allocs and frees, for debug use])
+else
+       if test x_$enable_alloc_lite = x_yes; then
+               AC_DEFINE(UNBOUND_ALLOC_LITE, 1, [use to enable lightweight alloc assertions, for debug use])
+       else
+               ACX_FUNC_MALLOC([unbound])
+       fi
+fi
+
 # check windows threads (we use them, not pthreads, on windows).
 if test "$on_mingw" = "yes"; then
 # check windows threads
@@ -759,29 +782,6 @@ if test x_$enable_lock_checks = x_yes; then
        AC_SUBST(CHECKLOCK_OBJ)
 fi
 
-# set memory allocation checking if requested
-AC_ARG_ENABLE(alloc-checks, AC_HELP_STRING([--enable-alloc-checks],
-       [ enable to memory allocation statistics, for debug purposes ]), 
-       , )
-AC_ARG_ENABLE(alloc-lite, AC_HELP_STRING([--enable-alloc-lite],
-       [ enable for lightweight alloc assertions, for debug purposes ]), 
-       , )
-AC_ARG_ENABLE(alloc-nonregional, AC_HELP_STRING([--enable-alloc-nonregional],
-       [ enable nonregional allocs, slow but exposes regional allocations to other memory purifiers, for debug purposes ]), 
-       , )
-if test x_$enable_alloc_nonregional = x_yes; then
-       AC_DEFINE(UNBOUND_ALLOC_NONREGIONAL, 1, [use malloc not regions, for debug use])
-fi
-if test x_$enable_alloc_checks = x_yes; then
-       AC_DEFINE(UNBOUND_ALLOC_STATS, 1, [use statistics for allocs and frees, for debug use])
-else
-       if test x_$enable_alloc_lite = x_yes; then
-               AC_DEFINE(UNBOUND_ALLOC_LITE, 1, [use to enable lightweight alloc assertions, for debug use])
-       else
-               ACX_FUNC_MALLOC([unbound])
-       fi
-fi
-
 ACX_CHECK_GETADDRINFO_WITH_INCLUDES
 if test "$USE_WINSOCK" = 1; then
        AC_DEFINE(UB_ON_WINDOWS, 1, [Use win32 resources and API])