ianh 02/03/11 09:22:32
Modified: . CHANGES configure.in
build apr_network.m4
Log:
configure now sets APR_RESOLV_RETRANSRETRY is the dns's timeout/retry
settings can be changed
Revision Changes Path
1.236 +3 -0 apr/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apr/CHANGES,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -r1.235 -r1.236
--- CHANGES 10 Mar 2002 17:20:26 -0000 1.235
+++ CHANGES 11 Mar 2002 17:22:32 -0000 1.236
@@ -1,4 +1,7 @@
Changes with APR b1
+
+ *) configure now checks to see if we can change timeout values
+ [Ian Holsman]
*) Small table performance optimization: eliminate the
zero-fill of newly allocated elements when expanding
1.417 +3 -0 apr/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apr/configure.in,v
retrieving revision 1.416
retrieving revision 1.417
diff -u -r1.416 -r1.417
--- configure.in 9 Mar 2002 19:26:13 -0000 1.416
+++ configure.in 11 Mar 2002 17:22:32 -0000 1.417
@@ -412,6 +412,7 @@
dnl It should check for LIBS being empty and set LIBS equal to the new value
dnl without the extra " " in that case, but they didn't do that. So, we
dnl end up LIBS="-lm -lcrypt -lnsl -ldl" which is an annoyance.
+AC_CHECK_LIB(resolv, res_init)
AC_CHECK_LIB(nsl, gethostbyname)
AC_SEARCH_LIBS(gethostname, nsl)
AC_CHECK_LIB(socket, socket)
@@ -1491,6 +1492,7 @@
AC_SUBST(acceptfilter)
AC_CHECK_FUNCS(set_h_errno)
+APR_CHECK_RESOLV_RETRANS
echo $ac_n "${nl}Checking for IPv6 Networking support...${nl}"
dnl # Start of checking for IPv6 support...
@@ -1510,6 +1512,7 @@
APR_CHECK_NEGATIVE_EAI
APR_CHECK_WORKING_GETNAMEINFO
APR_CHECK_SOCKADDR_IN6
+
AC_MSG_CHECKING(if APR supports IPv6)
have_ipv6="0"
if test "$user_disabled_ipv6" = 1; then
1.12 +28 -0 apr/build/apr_network.m4
Index: apr_network.m4
===================================================================
RCS file: /home/cvs/apr/build/apr_network.m4,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- apr_network.m4 7 Dec 2001 15:48:05 -0000 1.11
+++ apr_network.m4 11 Mar 2002 17:22:32 -0000 1.12
@@ -140,6 +140,34 @@
])
dnl
+dnl check for presence of retrans/retry variables in the res_state structure
+dnl
+AC_DEFUN(APR_CHECK_RESOLV_RETRANS,[
+ AC_CACHE_CHECK(for presence of retrans/retry fields in res_state/resolv.h
, ac_cv_retransretry,[
+ AC_TRY_RUN( [
+#include <sys/types.h>
+#include <inet/ip.h>
+#include <resolv.h>
+/* _res is a global defined in resolv.h */
+void main(void) {
+ _res.retrans = 2;
+ _res.retry = 1;
+ exit(0);
+}
+],[
+ ac_cv_retransretry="yes"
+],[
+ ac_cv_retransretry="no"
+],[
+ ac_cv_retransretry="no"
+])])
+if test "$ac_cv_retransretry" = "yes"; then
+ AC_DEFINE(RESOLV_RETRANSRETRY, 1, [Define if resolv.h's res_state has the
fields retrans/rety])
+fi
+])
+
+
+dnl
dnl check for gethostbyname() which handles numeric address strings
dnl
AC_DEFUN(APR_CHECK_GETHOSTBYNAME_NAS,[
