From 5876381f862afd0781b65acdae8a3de8d2b23056 Mon Sep 17 00:00:00 2001
From: Yang Tse <yangsita@gmail.com>
Date: Sun, 27 Jul 2008 20:29:04 +0000
Subject: [PATCH] Require autoconf 2.57 or newer

---
 ares/m4/reentrant.m4 | 6 +-----
 m4/reentrant.m4      | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/ares/m4/reentrant.m4 b/ares/m4/reentrant.m4
index 544987e8e..62938d837 100644
--- a/ares/m4/reentrant.m4
+++ b/ares/m4/reentrant.m4
@@ -6,7 +6,6 @@ dnl Checks if the preprocessor _REENTRANT definition
 dnl makes function gmtime_r compiler visible.
 
 AC_DEFUN([CARES_CHECK_NEED_REENTRANT_GMTIME_R], [
-  #
   AC_LINK_IFELSE([
     AC_LANG_FUNC_LINK_TRY([gmtime_r])
   ],[
@@ -14,7 +13,6 @@ AC_DEFUN([CARES_CHECK_NEED_REENTRANT_GMTIME_R], [
   ],[
     tmp_gmtime_r="no"
   ])
-  #
   if test "$tmp_gmtime_r" = "yes"; then
     AC_EGREP_CPP([gmtime_r],[
 #include <sys/types.h>
@@ -140,7 +138,6 @@ dnl Checks if the preprocessor _REENTRANT definition
 dnl makes function inet_ntoa_r compiler visible.
 
 AC_DEFUN([CARES_CHECK_NEED_REENTRANT_INET_NTOA_R], [
-  #
   AC_LINK_IFELSE([
     AC_LANG_FUNC_LINK_TRY([inet_ntoa_r])
   ],[
@@ -178,7 +175,6 @@ dnl Checks if the preprocessor _REENTRANT definition
 dnl makes function gethostbyaddr_r compiler visible.
 
 AC_DEFUN([CARES_CHECK_NEED_REENTRANT_GETHOSTBYADDR_R], [
-  #
   AC_LINK_IFELSE([
     AC_LANG_FUNC_LINK_TRY([gethostbyaddr_r])
   ],[
@@ -285,7 +281,6 @@ AC_DEFUN([CARES_CHECK_NEED_REENTRANT_GETSERVBYPORT_R], [
   ],[
     tmp_getservbyport_r="no"
   ])
-  #
   if test "$tmp_getservbyport_r" = "yes"; then
     AC_EGREP_CPP([getservbyport_r],[
 #include <sys/types.h>
@@ -379,6 +374,7 @@ dnl that it is defined equally for further configure
 dnl tests and generated config file.
 
 AC_DEFUN([CARES_CONFIGURE_REENTRANT], [
+  AC_PREREQ([2.57])dnl
   #
   AC_MSG_CHECKING([if _REENTRANT is already defined])
   AC_COMPILE_IFELSE([
diff --git a/m4/reentrant.m4 b/m4/reentrant.m4
index 61267c411..8435e281e 100644
--- a/m4/reentrant.m4
+++ b/m4/reentrant.m4
@@ -28,7 +28,6 @@ dnl Checks if the preprocessor _REENTRANT definition
 dnl makes function gmtime_r compiler visible.
 
 AC_DEFUN([CURL_CHECK_NEED_REENTRANT_GMTIME_R], [
-  #
   AC_LINK_IFELSE([
     AC_LANG_FUNC_LINK_TRY([gmtime_r])
   ],[
@@ -36,7 +35,6 @@ AC_DEFUN([CURL_CHECK_NEED_REENTRANT_GMTIME_R], [
   ],[
     tmp_gmtime_r="no"
   ])
-  #
   if test "$tmp_gmtime_r" = "yes"; then
     AC_EGREP_CPP([gmtime_r],[
 #include <sys/types.h>
@@ -162,7 +160,6 @@ dnl Checks if the preprocessor _REENTRANT definition
 dnl makes function inet_ntoa_r compiler visible.
 
 AC_DEFUN([CURL_CHECK_NEED_REENTRANT_INET_NTOA_R], [
-  #
   AC_LINK_IFELSE([
     AC_LANG_FUNC_LINK_TRY([inet_ntoa_r])
   ],[
@@ -200,7 +197,6 @@ dnl Checks if the preprocessor _REENTRANT definition
 dnl makes function gethostbyaddr_r compiler visible.
 
 AC_DEFUN([CURL_CHECK_NEED_REENTRANT_GETHOSTBYADDR_R], [
-  #
   AC_LINK_IFELSE([
     AC_LANG_FUNC_LINK_TRY([gethostbyaddr_r])
   ],[
@@ -307,7 +303,6 @@ AC_DEFUN([CURL_CHECK_NEED_REENTRANT_GETSERVBYPORT_R], [
   ],[
     tmp_getservbyport_r="no"
   ])
-  #
   if test "$tmp_getservbyport_r" = "yes"; then
     AC_EGREP_CPP([getservbyport_r],[
 #include <sys/types.h>
@@ -401,6 +396,7 @@ dnl that it is defined equally for further configure
 dnl tests and generated config file.
 
 AC_DEFUN([CURL_CONFIGURE_REENTRANT], [
+  AC_PREREQ([2.57])dnl
   #
   AC_MSG_CHECKING([if _REENTRANT is already defined])
   AC_COMPILE_IFELSE([