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

diff --git a/CHANGES b/CHANGES
index 28086b5e5fe9a3792021fdca1f86908027817804..a710eb8e104ee7502cbfc9a8f01f93982e7edd85 100644 (file)
--- 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 d0f5ac315dd0eacefbd3cee7d79a6343623ef1cf..6eddfafbf0b979b23fab7b3600b93c7151967a5d 100644 (file)
--- a/build/version
+++ b/build/version
@@ -1 +1 @@
-2.0.8-Release
+2.0.9-Engineering

diff --git a/configure b/configure
index 6037bab146f63bfab1a933823107fcf6b7ed7538..bee787624dd43ec247d385770ed6bf2062201adb 100755 (executable)
--- 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 30a9157980bb4aa18fa7d60a4e5e5fb609049114..c15fb8b6fbe75ec3f611ef1f212bb1311a72ccb6 100644 (file)
--- 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