From: Kurt Zeilenga <kurt@openldap.org>
Date: Mon, 25 Sep 2000 01:15:12 +0000 (+0000)
Subject: Another try at ipv6 detection
X-Git-Tag: LDBM_PRE_GIANT_RWLOCK~1906
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8e7f974e2c8f3502e242a7808cbb948bec221d57;p=openldap

Another try at ipv6 detection
---

diff --git a/configure b/configure
index d85b11427b..d320fa843d 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # $OpenLDAP$
-# from OpenLDAP: pkg/ldap/configure.in,v 1.334 2000/09/24 23:11:48 kurt Exp  
+# from OpenLDAP: pkg/ldap/configure.in,v 1.335 2000/09/24 23:13:28 kurt Exp  
 
 # Copyright 1998-2000 The OpenLDAP Foundation.  All Rights Reserved.
 # 
@@ -5788,7 +5788,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   ol_cv_inet6_addrslen=yes
 else
   rm -rf conftest*
-  ol_cv_inet6_addrslen
+  ol_cv_inet6_addrslen=no
 fi
 rm -f conftest*
 
@@ -5798,7 +5798,7 @@ echo "$ac_t""$ol_cv_inet6_addrslen" 1>&6
 
 	if test $ol_cv_inet6_addrslen = yes ; then
 		ol_link_ipv6=yes
-	elif $ol_enable_ipv6 = yes ; then
+	elif test $ol_enable_ipv6 = yes ; then
 		{ echo "configure: error: IPv6 support requires INET6_ADDRSTRLEN" 1>&2; exit 1; }
 	fi
 fi
diff --git a/configure.in b/configure.in
index 57fb2c47df..d2e182156d 100644
--- a/configure.in
+++ b/configure.in
@@ -825,11 +825,11 @@ else
 #			ifdef INET6_ADDRSLEN
 				__has_inet6_addrslen__;
 #			endif
-		], ol_cv_inet6_addrslen=yes, ol_cv_inet6_addrslen)])
+		], [ol_cv_inet6_addrslen=yes], [ol_cv_inet6_addrslen=no])])
 
 	if test $ol_cv_inet6_addrslen = yes ; then
 		ol_link_ipv6=yes
-	elif $ol_enable_ipv6 = yes ; then
+	elif test $ol_enable_ipv6 = yes ; then
 		AC_MSG_ERROR([IPv6 support requires INET6_ADDRSTRLEN])
 	fi
 fi