trawick 00/12/12 04:30:28
Modified: . CHANGES configure.in
include apr.h.in
Log:
Only support IPv6 if getaddrinfo() exists, because that is the
only IPv6-capable resolver function we support.
Revision Changes Path
1.19 +3 -0 apr/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apr/CHANGES,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- CHANGES 2000/12/07 18:10:24 1.18
+++ CHANGES 2000/12/12 12:30:17 1.19
@@ -1,4 +1,7 @@
Changes with APR a9
+ *) Only support IPv6 if we have sockaddr_in and a working
+ getaddrinfo(). [Jeff Trawick]
+
*) Add apr_parse_addr_port() for parsing the hostname:port portion
of URLs and similar strings. [Jeff Trawick]
1.186 +13 -1 apr/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apr/configure.in,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- configure.in 2000/12/08 04:28:51 1.185
+++ configure.in 2000/12/12 12:30:18 1.186
@@ -762,7 +762,19 @@
AC_CHECK_FUNCS(getipnodebyname)
AC_CHECK_FUNCS(getipnodebyaddr)
APR_CHECK_SOCKADDR_IN6
-AC_SUBST(have_sockaddr_in6)
+AC_MSG_CHECKING(if APR supports IPv6)
+have_ipv6="0"
+if test "x$have_sockaddr_in6" = "x1"; then
+ if test "x$ac_cv_working_getaddrinfo" = "xyes"; then
+ have_ipv6="1"
+ AC_MSG_RESULT("yes")
+ else
+ AC_MSG_RESULT("no -- no working getaddrinfo")
+ fi
+else
+ AC_MSG_RESULT("no -- no sockaddr_in6");
+fi
+AC_SUBST(have_ipv6)
dnl #----------------------------- Construct the files
1.56 +1 -1 apr/include/apr.h.in
Index: apr.h.in
===================================================================
RCS file: /home/cvs/apr/include/apr.h.in,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- apr.h.in 2000/12/04 23:50:40 1.55
+++ apr.h.in 2000/12/12 12:30:26 1.56
@@ -77,7 +77,7 @@
#define APR_HAVE_STRSTR @have_strstr@
#define APR_HAVE_MEMMOVE @have_memmove@
#define APR_HAVE_BZERO @have_bzero@
-#define APR_HAVE_IPV6 @have_sockaddr_in6@
+#define APR_HAVE_IPV6 @have_ipv6@
#if APR_HAVE_SYS_TYPES_H
