From 21ee1c2d0166de54443c26e26cdf7fc3617296c0 Mon Sep 17 00:00:00 2001
From: Yang Tse <yangsita@gmail.com>
Date: Tue, 15 Jul 2008 16:43:39 +0000
Subject: [PATCH] Allow --enable-largefile and --disable-largefile
 configurations. Configure process no longer needs nor checks size of
 curl_off_t. Library will now be built with _REENTRANT symbol defined.

---
 ares/CHANGES       |  8 ++++++++
 ares/RELEASE-NOTES |  3 +++
 ares/configure.ac  | 12 +++---------
 ares/setup.h       | 10 ++++++++++
 4 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/ares/CHANGES b/ares/CHANGES
index deed11db3..a937853b6 100644
--- a/ares/CHANGES
+++ b/ares/CHANGES
@@ -1,5 +1,13 @@
   Changelog for the c-ares project
 
+* Jul 15 2008 (Yang Tse)
+- Introduce definition of _REENTRANT symbol in setup.h to improve library
+  usability.  Previously the configure process only used the AC_SYS_LARGEFILE
+  macro for debug builds, now it is also used for non-debug ones enabling the
+  use of configure options --enable-largefile and --disable-largefile which
+  might be needed for library compatibility.  Remove checking the size of
+  curl_off_t, it is no longer needed.
+
 * Jul 3 2008 (Daniel Stenberg)
 - Phil Blundell: If you ask ares_gethostbyname() to do an AF_INET6 lookup and
   the target host has only A records, it automatically falls back to an
diff --git a/ares/RELEASE-NOTES b/ares/RELEASE-NOTES
index 3efb308ee..16f73204a 100644
--- a/ares/RELEASE-NOTES
+++ b/ares/RELEASE-NOTES
@@ -4,6 +4,9 @@ This is what's new and changed in the c-ares 1.5.3 release:
  o fix pkg-config reporting of private libraries needed for static linking
  o fallback to gettimeofday when monotonic clock is unavailable at run-time
  o ares_gethostbyname() fallback from AAA to A records with CNAME present
+ o allow --enable-largefile and --disable-largefile configurations
+ o configure process no longer needs nor checks size of curl_off_t
+ o library will now be built with _REENTRANT symbol defined
 
 Thanks go to these friendly people for their efforts and contributions:
 
diff --git a/ares/configure.ac b/ares/configure.ac
index 5b069cf67..80eecda20 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 check for how to do large files
+AC_SYS_LARGEFILE
+
 case $host_os in
   solaris*)
     AC_DEFINE(ETC_INET, 1, [if a /etc/inet dir is being used])
@@ -111,15 +114,6 @@ AC_HELP_STRING([--disable-debug],[Disable debug options]),
     CPPFLAGS="$CPPFLAGS -DCURLDEBUG -I$srcdir/../include"
     CFLAGS="$CFLAGS -g" 
 
-    dnl check for how to do large files, needed to get the curl_off_t check
-    dnl done right
-    AC_SYS_LARGEFILE
-
-    AC_CHECK_SIZEOF(curl_off_t, ,[
-#include <stdio.h>
-#include "$srcdir/../include/curl/curl.h"
-    ])
-
     dnl set compiler "debug" options to become more picky, and remove
     dnl optimize options from CFLAGS
     CURL_CC_DEBUG_OPTS
diff --git a/ares/setup.h b/ares/setup.h
index 70b8ecb0a..594042836 100644
--- a/ares/setup.h
+++ b/ares/setup.h
@@ -39,6 +39,16 @@
 
 #endif /* HAVE_CONFIG_H */
 
+/*
+ * Solaris needs _REENTRANT set for a few function prototypes and
+ * things to appear in the system header files. Unixware needs it
+ * to build proper reentrant code. Others may also need it.
+ */
+
+#ifndef _REENTRANT
+#  define _REENTRANT
+#endif
+
 /*
  * Include header files for windows builds before redefining anything.
  * Use this preproessor block only to include or exclude windows.h,