jorton 2003/10/01 07:11:40
Modified: . configure.in
build apr_network.m4
Log:
* configure.in, build/apr_network.m4: Remove "RESOLV_RETRANSRETRY"
detection: the definition is not used inside APR nor exported outside
APR. The BIND resolver can be configured via the RES_OPTIONS
environment variable or resolv.conf anyway.
Revision Changes Path
1.540 +0 -1 apr/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apr/configure.in,v
retrieving revision 1.539
retrieving revision 1.540
diff -u -u -r1.539 -r1.540
--- configure.in 1 Oct 2003 13:19:42 -0000 1.539
+++ configure.in 1 Oct 2003 14:11:40 -0000 1.540
@@ -1774,7 +1774,6 @@
AC_SUBST(have_sctp)
AC_CHECK_FUNCS(set_h_errno)
-APR_CHECK_RESOLV_RETRANS
echo "${nl}Checking for IPv6 Networking support..."
dnl Start of checking for IPv6 support...
1.29 +0 -30 apr/build/apr_network.m4
Index: apr_network.m4
===================================================================
RCS file: /home/cvs/apr/build/apr_network.m4,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -u -r1.28 -r1.29
--- apr_network.m4 1 Oct 2003 13:19:42 -0000 1.28
+++ apr_network.m4 1 Oct 2003 14:11:40 -0000 1.29
@@ -242,36 +242,6 @@
])
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>
-#if defined(__sun__)
-#include <inet/ip.h>
-#endif
-#include <resolv.h>
-/* _res is a global defined in resolv.h */
-int main(void) {
- _res.retrans = 2;
- _res.retry = 1;
- exit(0);
- return 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 Checks the definition of gethostbyname_r and gethostbyaddr_r
dnl which are different for glibc, solaris and assorted other operating
dnl systems
