From: Kurt Zeilenga <kurt@openldap.org>
Date: Sat, 12 May 2001 17:10:14 +0000 (+0000)
Subject: Fix bad merge of inet_ntop changes (which broke IPv6 detection)
X-Git-Tag: OPENLDAP_REL_ENG_2_0_9~13
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=56db33fb06ca57579a42cbb34580bf34989dc49d;p=openldap

Fix bad merge of inet_ntop changes (which broke IPv6 detection)
---

diff --git a/CHANGES b/CHANGES
index 28086b5e5f..a710eb8e10 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
 OpenLDAP 2.0 Change Log
 
+OpenLDAP 2.0.9 Engineering
+	Build Environment
+		Fix inet_ntop configure test
+
 OpenLDAP 2.0.8 Release
 	Fixed slapd empty OID value bug (ITS#882)
 	Fixed slapd waitpid() bug (ITS#900)
diff --git a/build/version b/build/version
index d0f5ac315d..6eddfafbf0 100644
--- a/build/version
+++ b/build/version
@@ -1 +1 @@
-2.0.8-Release
+2.0.9-Engineering
diff --git a/configure b/configure
index 6037bab146..bee787624d 100755
--- a/configure
+++ b/configure
@@ -5582,7 +5582,7 @@ done
 
 
 ol_link_ipv6=no
-if test $ac_cv_func_getaddrinfo = no -o $ac_cv_func_inet_ntop ; then
+if test $ac_cv_func_getaddrinfo = no -o $ac_cv_func_inet_ntop = no ; then
 	if test $ol_enable_ipv6 = yes ; then
 		{ echo "configure: error: IPv6 support requires getaddrinfo() and inet_ntop()" 1>&2; exit 1; }
 	fi
diff --git a/configure.in b/configure.in
index 30a9157980..c15fb8b6fb 100644
--- a/configure.in
+++ b/configure.in
@@ -739,7 +739,7 @@ dnl PF_LOCAL may use getaddrinfo in available
 AC_CHECK_FUNCS( getaddrinfo inet_ntop )
 
 ol_link_ipv6=no
-if test $ac_cv_func_getaddrinfo = no -o $ac_cv_func_inet_ntop ; then
+if test $ac_cv_func_getaddrinfo = no -o $ac_cv_func_inet_ntop = no ; then
 	if test $ol_enable_ipv6 = yes ; then
 		AC_MSG_ERROR([IPv6 support requires getaddrinfo() and inet_ntop()])
 	fi