X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=configure.in;h=deba2110d83821f91364b22c18210438b4240025;hb=82540c5cc1be5bf17b22f3a41d12d1bc56180654;hp=53b3ee60674066aa413c2f1d85bc298ce7ccdde9;hpb=41c5a36376a725edb9c2c35d5a23c31578268b34;p=openldap

diff --git a/configure.in b/configure.in
index 53b3ee6067..deba2110d8 100644
--- a/configure.in
+++ b/configure.in
@@ -83,6 +83,9 @@ AC_DEFINE_UNQUOTED(LDAP_VENDOR_VERSION_PATCH,$OL_PATCH,Patch)
 OPENLDAP_LIBVERSION=$OL_API_LIB
 AC_SUBST(OPENLDAP_LIBVERSION)dnl
 
+OPENLDAP_RELEASE_DATE="$OL_RELEASE_DATE"
+AC_SUBST(OPENLDAP_RELEASE_DATE)dnl
+
 dnl We use autoconf features new to 2.13.
 dnl aclocal.m4 should be built using aclocal from automake 1.4
 dnl libtool 1.4.2 should be installed.
@@ -127,7 +130,8 @@ OL_ARG_ENABLE(syslog,[  --enable-syslog	  enable syslog support], auto)dnl
 OL_ARG_ENABLE(proctitle,[  --enable-proctitle	  enable proctitle support], yes)dnl
 OL_ARG_ENABLE(cache,[  --enable-cache	  enable caching (experimental)], no)dnl
 OL_ARG_ENABLE(referrals,[  --enable-referrals	  enable LDAPv2+ Referrals (experimental)], no)dnl
-OL_ARG_ENABLE(kbind,[  --enable-kbind	  enable LDAPv2+ Kerberos IV bind (deprecated)], no)dnl
+dnl OL_ARG_ENABLE(kbind,[  --enable-kbind	  enable LDAPv2+ Kerberos IV bind (deprecated)], no)dnl
+ol_enable_kbind=${ol_enable_kbind-no}
 OL_ARG_ENABLE(ipv6,[  --enable-ipv6 	  enable IPv6 support], auto)dnl
 OL_ARG_ENABLE(local,[  --enable-local	  enable AF_LOCAL (AF_UNIX) socket support], auto)dnl
 OL_ARG_ENABLE(x_compile,[  --enable-x-compile	  enable cross compiling],
@@ -170,6 +174,7 @@ OL_ARG_ENABLE(lmpasswd,[    --enable-lmpasswd	  enable LAN Manager passwords], n
 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
 dnl OL_ARG_ENABLE(multimaster,[    --enable-multimaster  enable multimaster replication], no)dnl
+ol_enable_multimaster=${ol_enable_multimaster-no}
 OL_ARG_ENABLE(phonetic,[    --enable-phonetic	  enable phonetic/soundex], no)dnl
 OL_ARG_ENABLE(rewrite,[    --enable-rewrite	  enable DN rewriting in back-ldap and back-meta], no)dnl
 OL_ARG_ENABLE(rlookups,[    --enable-rlookups	  enable reverse lookups of client hostnames], no)dnl
@@ -276,9 +281,9 @@ if test $ol_enable_slapd = no ; then
 	if test $ol_enable_modules = yes ; then
 		AC_MSG_WARN([slapd disabled, ignoring --enable-modules 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_multimaster = yes ; then
+		AC_MSG_WARN([slapd disabled, ignoring --enable-multimaster argument])
+	fi
 	if test $ol_enable_wrappers = yes ; then
 		AC_MSG_WARN([slapd disabled, ignoring --enable-wrappers argument])
 	fi
@@ -355,7 +360,7 @@ dnl	fi
 	ol_enable_sql=no
 
 	ol_enable_modules=no
-dnl	ol_enable_multimaster=no
+	ol_enable_multimaster=no
 	ol_enable_phonetic=no
 	ol_enable_rlookups=no
 	ol_enable_aci=no
@@ -540,7 +545,6 @@ BUILD_SQL_DYNAMIC=static
 
 SLAPD_MODULES_LDFLAGS=
 SLAPD_MODULES_CPPFLAGS=
-SLAPD_MODULES_LIST=
 
 SLAPD_STATIC_BACKENDS=
 SLAPD_DYNAMIC_BACKENDS=
@@ -619,18 +623,18 @@ if test $ol_aix_threads = yes ; then
 fi
 
 if test -z "${CC}"; then
-	AC_CHECK_PROGS(CC,cc)
-fi
+	AC_CHECK_PROGS(CC,cc gcc,missing)
 
-dnl The default CFLAGS is empty NOT whatever AC_PROG_CC sets.
-dnl (for now, let autoconf sort this out)
-dnl CFLAGS=${CFLAGS-""}
+	if test "${CC}" = "missing" ; then
+		AC_MSG_ERROR([Unable to locate cc(1) or suitable replacement.  Check PATH or set CC.])
+	fi
+fi
 
 if test -z "${AR}"; then
 	AC_CHECK_PROGS(AR,ar gar,missing)
 
 	if test "${AR}" = "missing" ; then
-		AC_MSG_ERROR([Unable to locate ar(1).  Check PATH or set AR.])
+		AC_MSG_ERROR([Unable to locate ar(1) or suitable replacement.  Check PATH or set AR.])
 	fi
 fi
 
@@ -2169,14 +2173,6 @@ if test $ol_with_cyrus_sasl != no ; then
 				[ol_link_sasl="-lsasl"])])
 	fi
 
-	if test $ol_link_sasl = "-lsasl2"; then
-		OL_SASL2_COMPAT
-
-		if test $ol_cv_sasl2_compat = no ; then
-			ol_link_sasl=no
-			AC_MSG_ERROR(SASL: Cyrus SASL2 version obsolete)
-		fi
-	fi
 	if test $ol_link_sasl = no ; then
 		if test $ol_with_cyrus_sasl != auto ; then
 			AC_MSG_ERROR([Could not locate Cyrus SASL])
@@ -2188,6 +2184,12 @@ if test $ol_with_cyrus_sasl != no ; then
 			fi
 		fi
 	else
+		OL_SASL_COMPAT
+		if test $ol_cv_sasl_compat = no ; then
+			ol_link_sasl=no
+			AC_MSG_ERROR([Cyrus SASL library located but incompatible])
+		fi
+
 		AC_DEFINE(HAVE_CYRUS_SASL,1,[define if you have Cyrus SASL])
 		SASL_LIBS="$ol_link_sasl"
 		if test $ol_enable_spasswd != no ; then
@@ -2428,6 +2430,7 @@ AC_CHECK_FUNCS(		\
 	read			\
 	recv			\
 	recvfrom		\
+	recvmsg			\
 	setpwfile		\
 	setgid			\
 	setegid			\
@@ -2509,9 +2512,9 @@ fi
 if test "$ol_link_spasswd" != no ; then
 	AC_DEFINE(SLAPD_SPASSWD,1,[define to support SASL passwords])
 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_multimaster" != no ; then
+	AC_DEFINE(SLAPD_MULTIMASTER,1,[define to support multimaster replication])
+fi
 if test "$ol_enable_phonetic" != no ; then
 	AC_DEFINE(SLAPD_PHONETIC,1,[define to support phonetic])
 fi
@@ -2537,7 +2540,6 @@ if test "$ol_enable_bdb" != no ; then
 			[define to support dynamic BDB backend])
 		BUILD_BDB=mod
 		BUILD_BDB_DYNAMIC=shared
-		SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-bdb/back_bdb.la"
 		SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-bdb"
 	else
 		SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-bdb"
@@ -2553,7 +2555,6 @@ if test "$ol_link_dnssrv" != no ; then
 			[define to support dynamic DNS SRV backend])
 		BUILD_DNSSRV=mod
 		BUILD_DNSSRV_DYNAMIC=shared
-		SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-dnssrv/back_dnssrv.la"
 		SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-dnssrv"
 	else
 		SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-dnssrv"
@@ -2569,7 +2570,6 @@ if test "$ol_enable_ldap" != no ; then
 			[define to support dynamic LDAP backend])
 		BUILD_LDAP=mod
 		BUILD_LDAP_DYNAMIC=shared
-		SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-ldap/back_ldap.la"
 		SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-ldap"
 	else
 		SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-ldap"
@@ -2586,7 +2586,6 @@ if test "$ol_link_ldbm" != no -a $ol_enable_ldbm != no; then
 			[define to support dynamic LDBM backend])
 		BUILD_LDBM=mod
 		BUILD_LDBM_DYNAMIC=shared
-		SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-ldbm/back_ldbm.la"
 		SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-ldbm"
 	else
 		SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-ldbm"
@@ -2610,7 +2609,6 @@ if test "$ol_enable_meta" != no ; then
 			[define to support dynamic LDAP Metadirectory backend])
 		BUILD_META=mod
 		BUILD_META_DYNAMIC=shared
-		SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-meta/back_meta.la"
 		SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-meta"
 	else
 		SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-meta"
@@ -2626,7 +2624,6 @@ if test "$ol_enable_monitor" != no ; then
 			[define to support dynamic cn=Monitor backend])
 		BUILD_MONITOR=mod
 		BUILD_MONITOR_DYNAMIC=shared
-		SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-monitor/back_monitor.la"
 		SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-monitor"
 	else
 		SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-monitor"
@@ -2642,7 +2639,6 @@ if test "$ol_enable_null" != no ; then
 			[define to support dynamic NULL backend])
 		BUILD_NULL=mod
 		BUILD_NULL_DYNAMIC=shared
-		SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-null/back_null.la"
 		SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-null"
 	else
 		SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-null"
@@ -2658,7 +2654,6 @@ if test "$ol_enable_passwd" != no ; then
 			[define to support dynamic PASSWD backend])
 		BUILD_PASSWD=mod
 		BUILD_PASSWD_DYNAMIC=shared
-		SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-passwd/back_passwd.la"
 		SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-passwd"
 	else
 		SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-passwd"
@@ -2674,7 +2669,6 @@ if test "$ol_link_perl" != no ; then
 			[define to support dynamic PERL backend])
 		BUILD_PERL=mod
 		BUILD_PERL_DYNAMIC=shared
-		SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-perl/back_perl.la"
 		SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-perl"
 	else
 		SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-perl"
@@ -2690,7 +2684,6 @@ if test "$ol_enable_shell" != no ; then
 			[define to support dynamic SHELL backend])
 		BUILD_SHELL=mod
 		BUILD_SHELL_DYNAMIC=shared
-		SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-shell/back_shell.la"
 		SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-shell"
 	else
 		SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-shell"
@@ -2706,7 +2699,6 @@ if test "$ol_enable_tcl" != no ; then
 			[define to support dynamic TCL backend])
 		BUILD_TCL=mod
 		BUILD_TCL_DYNAMIC=shared
-		SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-tcl/back_tcl.la"
 		SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-tcl"
 	else
 		SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-tcl"
@@ -2722,7 +2714,6 @@ if test "$ol_link_sql" != no ; then
 			[define to support dynamic SQL backend])
 		BUILD_SQL=mod
 		BUILD_SQL_DYNAMIC=shared
-		SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-sql/back_sql.la"
 		SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-sql"
 	else
 		SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-sql"
@@ -2749,7 +2740,6 @@ dnl
 if test "$ac_cv_mingw32" = yes ; then
 	PLAT=NT
 	SLAPD_MODULES_LDFLAGS=
-	SLAPD_MODULES_LIST=
 else
 	PLAT=UNIX
 fi
@@ -2799,7 +2789,6 @@ AC_SUBST(MOD_TCL_LIB)
 
 AC_SUBST(SLAPD_MODULES_CPPFLAGS)
 AC_SUBST(SLAPD_MODULES_LDFLAGS)
-AC_SUBST(SLAPD_MODULES_LIST)
 
 AC_SUBST(SLAPD_STATIC_BACKENDS)
 AC_SUBST(SLAPD_DYNAMIC_BACKENDS)