X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=configure.in;h=9853bc40393ad09ffe4b5f4d8293ae78c39cd742;hb=b8a60b33ee6d45ff51dfbac33e79bd92d6c61195;hp=8d30ab521d9e9eb5cd0186f8f91c0b9959a3f9be;hpb=5201427ee1711242fda159eed84b238a2d0b6385;p=openldap

diff --git a/configure.in b/configure.in
index 8d30ab521d..9853bc4039 100644
--- a/configure.in
+++ b/configure.in
@@ -33,14 +33,14 @@ dnl ================================================================
 dnl Configure.in for OpenLDAP
 AC_INIT(build/version)dnl
 
-# set unset (borrowed from autoconf 2.14a)
-if (unset FOO) >/dev/null 2>&1; then
+# set unset (borrowed from autoconf 2.49c)
+if (OL_FOO=OL_FOO; unset OL_FOO) >/dev/null 2>&1; then
   ol_unset=unset
 else
   ol_unset=false
 fi
 # unset CDPATH
-$ol_unset CDPATH || test "${CDPATH+set}" != set || CDPATH=: && export CDPATH
+$ol_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; }
 
 AC_CONFIG_AUX_DIR(build)dnl
 
@@ -56,8 +56,8 @@ dnl		we try not to use this for much
 AC_CANONICAL_SYSTEM
 
 AM_INIT_AUTOMAKE(OpenLDAP,[$OL_VERSION], [no defines])dnl
-AC_SUBST(PACKAGE)
-AC_SUBST(VERSION)
+AC_SUBST(PACKAGE)dnl
+AC_SUBST(VERSION)dnl
 AC_DEFINE_UNQUOTED(OPENLDAP_PACKAGE,"$PACKAGE",Package)
 AC_DEFINE_UNQUOTED(OPENLDAP_VERSION,"$VERSION",Version)
 
@@ -81,7 +81,7 @@ dnl --with-subdir
 ldap_subdir="/openldap"
 
 AC_ARG_WITH(subdir,
-[  --with-subdir=DIR change default subdirectory used for installs],
+[  --with-subdir=DIR	  change default subdirectory used for installs],
 [case "$withval" in
 	no) ldap_subdir=""
 		;;
@@ -143,9 +143,9 @@ OL_ARG_ENABLE(crypt,[    --enable-crypt	  enable crypt(3) passwords], auto)dnl
 OL_ARG_ENABLE(kpasswd,[    --enable-kpasswd	  enable kerberos password verification], no)dnl
 OL_ARG_ENABLE(spasswd,[    --enable-spasswd	  enable (Cyrus) SASL password verification], no)dnl
 OL_ARG_ENABLE(modules,[    --enable-modules	  enable dynamic module support], no)dnl
-OL_ARG_ENABLE(multimaster,[    --enable-multimaster  enable multimaster replication], no)dnl
+dnl OL_ARG_ENABLE(multimaster,[    --enable-multimaster  enable multimaster replication], no)dnl
 OL_ARG_ENABLE(phonetic,[    --enable-phonetic	  enable phonetic/soundex], no)dnl
-OL_ARG_ENABLE(rlookups,[    --enable-rlookups	  enable reverse lookups], auto)dnl
+OL_ARG_ENABLE(rlookups,[    --enable-rlookups	  enable reverse lookups], no)dnl
 OL_ARG_ENABLE(aci,[    --enable-aci	  enable per-object ACIs], no)dnl
 OL_ARG_ENABLE(wrappers,[    --enable-wrappers	  enable tcp wrapper support], no)dnl
 OL_ARG_ENABLE(dynamic,[    --enable-dynamic	  enable linking built binaries with dynamic libs], no)dnl
@@ -215,6 +215,9 @@ if test $ol_enable_slapd = no ; then
 	if test $ol_enable_multimaster = yes ; then
 		AC_MSG_WARN([slapd disabled, ignoring --enable-multimaster argument])
 	fi
+dnl	if test $ol_enable_multimaster = yes ; then
+dnl		AC_MSG_WARN([slapd disabled, ignoring --enable-multimaster argument])
+dnl	fi
 	if test $ol_enable_wrappers = yes ; then
 		AC_MSG_WARN([slapd disabled, ignoring --enable-wrappers argument])
 	fi
@@ -264,7 +267,7 @@ if test $ol_enable_slapd = no ; then
 	ol_enable_sql=no
 
 	ol_enable_modules=no
-	ol_enable_multimaster=no
+dnl	ol_enable_multimaster=no
 	ol_enable_phonetic=no
 	ol_enable_rlookups=no
 	ol_enable_aci=no
@@ -542,8 +545,6 @@ dnl ----------------------------------------------------------------
 dnl Check for module support
 ol_link_modules=no
 if test $ol_enable_modules != no ; then
-	AC_MSG_ERROR([modules not supported in this version of OpenLDAP])
-
 	AC_CHECK_HEADERS(ltdl.h)
 
 	if test $ac_cv_header_ltdl_h = no ; then
@@ -740,6 +741,8 @@ if test $ac_cv_func_getaddrinfo = no ; then
 		AC_MSG_ERROR([IPv6 support requires getaddrinfo()])
 	fi
 else
+	AC_CHECK_FUNCS( gai_strerror )
+
 	AC_CACHE_CHECK([INET6_ADDRSTRLEN],[ol_cv_inet6_addrstrlen],[
 		AC_EGREP_CPP(__has_inet6_addrstrlen__,[
 #			include <netinet/in.h>
@@ -2118,9 +2121,9 @@ fi
 if test "$ol_link_spasswd" != no ; then
 	AC_DEFINE(SLAPD_SPASSWD,1,[define to support SASL passwords])
 fi
-if test "$ol_enable_multimaster" != no ; then
-	AC_DEFINE(SLAPD_MULTIMASTER,1,[define to support multimaster replication])
-fi
+dnl if test "$ol_enable_multimaster" != no ; then
+dnl	AC_DEFINE(SLAPD_MULTIMASTER,1,[define to support multimaster replication])
+dnl fi
 if test "$ol_enable_phonetic" != no ; then
 	AC_DEFINE(SLAPD_PHONETIC,1,[define to support phonetic])
 fi