X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=m4%2Fmalloc.m4;h=f8ed1128b122cce332506403f0bdb8d1bca89407;hp=bd3cad46660bb1262e15114e86112ffb4377f495;hb=2369b0ab09a008c519cd4307b634fd294c66014e;hpb=1243156a5e03a666b36bc4400f1402243a85c9a7

diff --git a/m4/malloc.m4 b/m4/malloc.m4
index bd3cad46..f8ed1128 100644
--- a/m4/malloc.m4
+++ b/m4/malloc.m4
@@ -10,7 +10,7 @@ dnl  /* Define to rpl_malloc if the replacement function should be used.  */
 dnl  #undef malloc
 dnl
 
-AC_DEFUN(jm_FUNC_MALLOC,
+AC_DEFUN([jm_FUNC_MALLOC],
 [
  if test x = y; then
    dnl This code is deliberately never run via ./configure.
@@ -20,25 +20,23 @@ AC_DEFUN(jm_FUNC_MALLOC,
  fi
  dnl xmalloc.c requires that this symbol be defined so it doesn't
  dnl mistakenly use a broken malloc -- as it might if this test were omitted.
- ac_kludge=HAVE_DONE_WORKING_MALLOC_CHECK
- AC_DEFINE_UNQUOTED($ac_kludge)
+ AC_DEFINE(HAVE_DONE_WORKING_MALLOC_CHECK, 1, [Needed for xmalloc.c])
 
  AC_CACHE_CHECK([for working malloc], jm_cv_func_working_malloc,
-  [AC_TRY_RUN([
+  [AC_RUN_IFELSE([AC_LANG_SOURCE([
     char *malloc ();
     int
     main ()
     {
       exit (malloc (0) ? 0 : 1);
     }
-	  ],
-	 jm_cv_func_working_malloc=yes,
-	 jm_cv_func_working_malloc=no,
-	 dnl When crosscompiling, assume malloc is broken.
-	 jm_cv_func_working_malloc=no)
+   ])],
+   [jm_cv_func_working_malloc=yes],
+   [jm_cv_func_working_malloc=no],
+   [When crosscompiling])
   ])
   if test $jm_cv_func_working_malloc = no; then
-    LIBOBJS="$LIBOBJS malloc.o"
-    AC_DEFINE_UNQUOTED(malloc, rpl_malloc)
+    AC_LIBOBJ([malloc])
+    AC_DEFINE(malloc, rpl_malloc, [Replacement malloc()])
   fi
 ])