From: Yang Tse <yangsita@gmail.com>
Date: Tue, 22 Jul 2008 19:04:16 +0000 (+0000)
Subject: Make sure that configure process tests are done with the same _REENTRANT
X-Git-Tag: curl-7_19_0~338
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1bc490077a804d6ebccbf0276e20a2e14323c69f;p=thirdparty%2Fcurl.git

Make sure that configure process tests are done with the same _REENTRANT
setting as the one actually used when finally building the library.
---

diff --git a/acinclude.m4 b/acinclude.m4
index e42de229d6..30b22b2565 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -110,6 +110,31 @@ CURL_DEF_TOKEN $1
 ])
 
 
+dnl CONFIGURE_WITH_REENTRANT
+dnl -------------------------------------------------
+dnl This macro ensures that configuration tests done
+dnl after this will execute with preprocessor symbol
+dnl _REENTRANT defined. This macro also ensures that
+dnl the generated config file will equally define it.
+
+AC_DEFUN([CONFIGURE_WITH_REENTRANT], [
+AC_BEFORE([$0], [AC_PREPROC_IFELSE])dnl
+AC_BEFORE([$0], [AC_COMPILE_IFELSE])dnl
+AC_BEFORE([$0], [AC_LINK_IFELSE])dnl
+AC_BEFORE([$0], [AC_RUN_IFELSE])dnl
+AH_VERBATIM([_REENTRANT],
+[/* Define _REENTRANT if not already defined */
+@%:@ifndef _REENTRANT
+@%:@ define _REENTRANT
+@%:@endif])
+cat >>confdefs.h <<_ACEOF
+[@%:@ifndef _REENTRANT
+@%:@ define _REENTRANT
+@%:@endif]
+_ACEOF
+])
+
+
 dnl CURL_CHECK_HEADER_WINDOWS
 dnl -------------------------------------------------
 dnl Check for compilable and valid windows.h header 
diff --git a/ares/acinclude.m4 b/ares/acinclude.m4
index 9eb8d0c074..10de927177 100644
--- a/ares/acinclude.m4
+++ b/ares/acinclude.m4
@@ -88,6 +88,31 @@ CURL_DEF_TOKEN $1
 ])
 
 
+dnl CONFIGURE_WITH_REENTRANT
+dnl -------------------------------------------------
+dnl This macro ensures that configuration tests done
+dnl after this will execute with preprocessor symbol
+dnl _REENTRANT defined. This macro also ensures that
+dnl the generated config file will equally define it.
+
+AC_DEFUN([CONFIGURE_WITH_REENTRANT], [
+AC_BEFORE([$0], [AC_PREPROC_IFELSE])dnl
+AC_BEFORE([$0], [AC_COMPILE_IFELSE])dnl
+AC_BEFORE([$0], [AC_LINK_IFELSE])dnl
+AC_BEFORE([$0], [AC_RUN_IFELSE])dnl
+AH_VERBATIM([_REENTRANT],
+[/* Define _REENTRANT if not already defined */
+@%:@ifndef _REENTRANT
+@%:@ define _REENTRANT
+@%:@endif])
+cat >>confdefs.h <<_ACEOF
+[@%:@ifndef _REENTRANT
+@%:@ define _REENTRANT
+@%:@endif]
+_ACEOF
+])
+
+
 dnl CURL_CHECK_HEADER_WINDOWS
 dnl -------------------------------------------------
 dnl Check for compilable and valid windows.h header 
diff --git a/ares/configure.ac b/ares/configure.ac
index 66f44f45a7..2266b14807 100644
--- a/ares/configure.ac
+++ b/ares/configure.ac
@@ -75,6 +75,9 @@ AC_PROG_CC
 AM_PROG_CC_C_O
 AC_PROG_INSTALL
 
+dnl Our configure and build reentrant settings
+CONFIGURE_WITH_REENTRANT
+
 dnl check for how to do large files
 AC_SYS_LARGEFILE
 
diff --git a/configure.ac b/configure.ac
index 25e747d953..a2a1fe290e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -141,6 +141,9 @@ AC_AIX
 dnl Checks for programs.
 AC_PROG_CC
 
+dnl Our configure and build reentrant settings
+CONFIGURE_WITH_REENTRANT
+
 dnl check for how to do large files
 AC_SYS_LARGEFILE