From 5219ee25a248fe26055e54215c5027cbf8483439 Mon Sep 17 00:00:00 2001
From: Guus Sliepen <guus@tinc-vpn.org>
Date: Sat, 16 Dec 2006 16:26:57 +0000
Subject: [PATCH] Use standard autoconf macros instead of our own.

---
 configure.in  | 12 +++++-------
 m4/malloc.m4  | 42 ------------------------------------------
 m4/realloc.m4 | 42 ------------------------------------------
 3 files changed, 5 insertions(+), 91 deletions(-)
 delete mode 100644 m4/malloc.m4
 delete mode 100644 m4/realloc.m4

diff --git a/configure.in b/configure.in
index c951637..1ce3fb0 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
 
 dnl $Id$
 
-AC_PREREQ(2.59)
+AC_PREREQ(2.61)
 AC_INIT
 AC_CONFIG_SRCDIR([src/tincd.c])
 AM_INIT_AUTOMAKE(tinc, 1.0-cvs)
@@ -10,12 +10,12 @@ AC_CONFIG_HEADERS([config.h])
 AM_MAINTAINER_MODE
 
 AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION(0.12.1)
+AM_GNU_GETTEXT_VERSION(0.14.1)
 
 # Enable GNU extensions.
 # Define this here, not in acconfig's @TOP@ section, since definitions
 # in the latter don't make it into the configure-time tests.
-AC_DEFINE([_GNU_SOURCE], 1, [Enable GNU extenstions])
+AC_GNU_SOURCE
 AC_DEFINE([__USE_BSD], 1, [Enable BSD extensions])
 
 ALL_LINGUAS="nl"
@@ -27,8 +27,6 @@ AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_RANLIB
 
-AC_ISC_POSIX
-
 dnl Check and set OS
 
 #AC_CANONICAL_HOST
@@ -124,8 +122,8 @@ AC_TYPE_SIGNAL
 AC_CHECK_FUNCS([asprintf daemon fchmod flock ftime fork get_current_dir_name gettimeofday mlockall putenv random select strdup strerror strsignal strtol system unsetenv vsyslog writev],
   [], [], [#include "have.h"]
 )
-jm_FUNC_MALLOC
-jm_FUNC_REALLOC
+AC_FUNC_MALLOC
+AC_FUNC_REALLOC
 
 dnl Support for SunOS
 
diff --git a/m4/malloc.m4 b/m4/malloc.m4
deleted file mode 100644
index f8ed112..0000000
--- a/m4/malloc.m4
+++ /dev/null
@@ -1,42 +0,0 @@
-#serial 1
-
-dnl From Jim Meyering.
-dnl Determine whether malloc accepts 0 as its argument.
-dnl If it doesn't, arrange to use the replacement function.
-dnl
-dnl If you use this macro in a package, you should
-dnl add the following two lines to acconfig.h:
-dnl  /* Define to rpl_malloc if the replacement function should be used.  */
-dnl  #undef malloc
-dnl
-
-AC_DEFUN([jm_FUNC_MALLOC],
-[
- if test x = y; then
-   dnl This code is deliberately never run via ./configure.
-   dnl FIXME: this is a gross hack to make autoheader put an entry
-   dnl for this symbol in config.h.in.
-   AC_CHECK_FUNCS(DONE_WORKING_MALLOC_CHECK)
- 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_DEFINE(HAVE_DONE_WORKING_MALLOC_CHECK, 1, [Needed for xmalloc.c])
-
- AC_CACHE_CHECK([for working malloc], jm_cv_func_working_malloc,
-  [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],
-   [When crosscompiling])
-  ])
-  if test $jm_cv_func_working_malloc = no; then
-    AC_LIBOBJ([malloc])
-    AC_DEFINE(malloc, rpl_malloc, [Replacement malloc()])
-  fi
-])
diff --git a/m4/realloc.m4 b/m4/realloc.m4
deleted file mode 100644
index 4ff1d26..0000000
--- a/m4/realloc.m4
+++ /dev/null
@@ -1,42 +0,0 @@
-#serial 1
-
-dnl From Jim Meyering.
-dnl Determine whether realloc works when both arguments are 0.
-dnl If it doesn't, arrange to use the replacement function.
-dnl
-dnl If you use this macro in a package, you should
-dnl add the following two lines to acconfig.h:
-dnl  /* Define to rpl_realloc if the replacement function should be used.  */
-dnl  #undef realloc
-dnl
-
-AC_DEFUN([jm_FUNC_REALLOC],
-[
- if test x = y; then
-   dnl This code is deliberately never run via ./configure.
-   dnl FIXME: this is a gross hack to make autoheader put an entry
-   dnl for this symbol in config.h.in.
-   AC_CHECK_FUNCS(DONE_WORKING_REALLOC_CHECK)
- fi
- dnl xmalloc.c requires that this symbol be defined so it doesn't
- dnl mistakenly use a broken realloc -- as it might if this test were omitted.
- AC_DEFINE(HAVE_DONE_WORKING_REALLOC_CHECK, 1, [Needed for xmalloc.c])
-
- AC_CACHE_CHECK([for working realloc], jm_cv_func_working_realloc,
-  [AC_RUN_IFELSE([AC_LANG_SOURCE([
-    char *realloc ();
-    int
-    main ()
-    {
-      exit (realloc (0, 0) ? 0 : 1);
-    }
-   ])],
-   [jm_cv_func_working_realloc=yes],
-   [jm_cv_func_working_realloc=no],
-   [When crosscompiling])
-  ])
-  if test $jm_cv_func_working_realloc = no; then
-    AC_LIBOBJ([realloc])
-    AC_DEFINE(realloc, rpl_realloc, [Replacement realloc()])
-  fi
-])
-- 
2.25.1