From 90e2510e2fa3c7bad44285aee71208dfc206849b Mon Sep 17 00:00:00 2001
From: Yang Tse <yangsita@gmail.com>
Date: Fri, 1 Aug 2008 02:48:00 +0000
Subject: [PATCH] Rename reentrant.m4 to avoid filename clash.

---
 ares/m4/{reentrant.m4 => cares-reentrant.m4} | 36 ++++++++++++++++++++++------
 m4/{reentrant.m4 => curl-reentrant.m4}       | 16 +++++++++----
 2 files changed, 40 insertions(+), 12 deletions(-)
 rename ares/m4/{reentrant.m4 => cares-reentrant.m4} (89%)
 rename m4/{reentrant.m4 => curl-reentrant.m4} (96%)

diff --git a/ares/m4/reentrant.m4 b/ares/m4/cares-reentrant.m4
similarity index 89%
rename from ares/m4/reentrant.m4
rename to ares/m4/cares-reentrant.m4
index 0348fda..7a65052 100644
--- a/ares/m4/reentrant.m4
+++ b/ares/m4/cares-reentrant.m4
@@ -1,6 +1,28 @@
-
-
-# serial 1.10
+#***************************************************************************
+# $Id$
+#
+# Copyright (C) 2008 by Daniel Stenberg et al
+#
+# Permission to use, copy, modify, and distribute this software and its
+# documentation for any purpose and without fee is hereby granted, provided
+# that the above copyright notice appear in all copies and that both that
+# copyright notice and this permission notice appear in supporting
+# documentation, and that the name of M.I.T. not be used in advertising or
+# publicity pertaining to distribution of the software without specific,
+# written prior permission.  M.I.T. makes no representations about the
+# suitability of this software for any purpose.  It is provided "as is"
+# without express or implied warranty.
+#
+#***************************************************************************
+
+# File version for 'aclocal' use.
+# serial 1.1
+
+dnl Note 1
+dnl ------
+dnl None of the CARES_CHECK_NEED_REENTRANT_* macros shall use HAVE_FOO_H to
+dnl conditionally include header files. These macros are used early in the
+dnl configure process much before header file availability is known.
 
 
 dnl CARES_CHECK_NEED_REENTRANT_GMTIME_R
@@ -354,13 +376,13 @@ dnl and that in turn setup.h will define _REENTRANT.
 dnl Internal macro for CARES_CONFIGURE_REENTRANT.
 
 AC_DEFUN([CARES_CONFIGURE_FROM_NOW_ON_WITH_REENTRANT], [
-AC_DEFINE([NEED_REENTRANT], [1],
+AC_DEFINE(NEED_REENTRANT, 1,
   [Define to 1 if _REENTRANT preprocessor symbol must be defined.])
-cat >>confdefs.h <<_ACEOF
+cat >>confdefs.h <<_EOF
 #ifndef _REENTRANT
-#define _REENTRANT
+#  define _REENTRANT
 #endif
-_ACEOF
+_EOF
 ])
 
 
diff --git a/m4/reentrant.m4 b/m4/curl-reentrant.m4
similarity index 96%
rename from m4/reentrant.m4
rename to m4/curl-reentrant.m4
index 5ec0de0..aa29943 100644
--- a/m4/reentrant.m4
+++ b/m4/curl-reentrant.m4
@@ -21,8 +21,14 @@
 # $Id$
 #***************************************************************************
 
+# File version for 'aclocal' use.
+# serial 1.1
 
-# serial 1.12
+dnl Note 1
+dnl ------
+dnl None of the CURL_CHECK_NEED_REENTRANT_* macros shall use HAVE_FOO_H to
+dnl conditionally include header files. These macros are used early in the
+dnl configure process much before header file availability is known.
 
 
 dnl CURL_CHECK_NEED_REENTRANT_GMTIME_R
@@ -376,13 +382,13 @@ dnl and that in turn setup.h will define _REENTRANT.
 dnl Internal macro for CURL_CONFIGURE_REENTRANT.
 
 AC_DEFUN([CURL_CONFIGURE_FROM_NOW_ON_WITH_REENTRANT], [
-AC_DEFINE([NEED_REENTRANT], [1],
+AC_DEFINE(NEED_REENTRANT, 1,
   [Define to 1 if _REENTRANT preprocessor symbol must be defined.])
-cat >>confdefs.h <<_ACEOF
+cat >>confdefs.h <<_EOF
 #ifndef _REENTRANT
-#define _REENTRANT
+#  define _REENTRANT
 #endif
-_ACEOF
+_EOF
 ])
 
 
-- 
2.7.4