X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=configure.in;h=888714e834bb2d554144b0669ca22cc809e328bb;hb=4e703c5261cd179ab675cdeaca4b0eda88db0977;hp=02253ff9f1a6ff3d702dcee67c01284683e78f0f;hpb=26d8290859c997fb624b9fbd23062bcedae2aedd;p=openldap

diff --git a/configure.in b/configure.in
index 02253ff9f1..888714e834 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl $OpenLDAP$
 dnl
-dnl Copyright 1998,1999 The OpenLDAP Foundation.  All Rights Reserved.
+dnl Copyright 1998-2000 The OpenLDAP Foundation.  All Rights Reserved.
 dnl 
 dnl Redistribution and use in source and binary forms are permitted only
 dnl as authorized by the OpenLDAP Public License.  A copy of this
@@ -15,14 +15,14 @@ define([AC_INIT_BINSH],
 # $]OpenLDAP[$
 # from] translit([$OpenLDAP$], $")] [
 
-# Copyright 1998,1999 The OpenLDAP Foundation.  All Rights Reserved.
+# Copyright 1998-2000 The OpenLDAP Foundation.  All Rights Reserved.
 # 
 # Redistribution and use in source and binary forms are permitted only
 # as authorized by the OpenLDAP Public License.  A copy of this
 # license is available at http://www.OpenLDAP.org/license.html or
 # in file LICENSE in the top-level directory of the distribution.
 
-echo "Copyright 1998-1999 The OpenLDAP Foundation,  All Rights Reserved."
+echo "Copyright 1998-2000 The OpenLDAP Foundation,  All Rights Reserved."
 echo "Copying restrictions apply, see COPYRIGHT file."
 ])dnl
 dnl ----------------------------------------------------------------
@@ -96,7 +96,9 @@ OL_ARG_ENABLE(proctitle,[  --enable-proctitle	enable proctitle support], yes)dnl
 OL_ARG_ENABLE(cache,[  --enable-cache	enable caching], yes)dnl
 OL_ARG_ENABLE(dns,[  --enable-dns		enable V2 DX Referrals extension], no)dnl
 OL_ARG_ENABLE(referrals,[  --enable-referrals	enable V2 Referrals extension], yes)dnl
+OL_ARG_ENABLE(kbind,[  --enable-kbind	enable V2 Kerberos IV bind], auto)dnl
 OL_ARG_ENABLE(cldap,[  --enable-cldap	enable connectionless ldap], no)dnl
+OL_ARG_ENABLE(ldapi,[  --enable-ldapi	enable domain socket (PF_LOCAL) ldap], no)dnl
 OL_ARG_ENABLE(x_compile,[  --enable-x-compile	enable cross compiling],
 	no, [yes no])dnl
 
@@ -108,8 +110,8 @@ OL_ARG_WITH(cyrus_sasl,[  --with-cyrus-sasl	with Cyrus SASL support],
 	auto, [auto yes no] )
 OL_ARG_WITH(fetch,[  --with-fetch		with fetch URL support],
 	auto, [auto yes no] )
-OL_ARG_WITH(kerberos,[  --with-kerberos	with Kerberos support],
-	auto, [auto k5 kth k4 afs yes no])
+OL_ARG_WITH(kerberos,[  --with-kerberos	with support],
+	auto, [auto k5 k5only k425 kth k4 afs yes no])
 OL_ARG_WITH(readline,[  --with-readline	with readline support],
 	auto, [auto yes no] )
 OL_ARG_WITH(threads,[  --with-threads	use threads],
@@ -132,13 +134,13 @@ AC_ARG_WITH(xxslapdoptions,[SLAPD (Standalone LDAP Daemon) Options:])
 OL_ARG_ENABLE(slapd,[  --enable-slapd	enable building slapd], yes)dnl
 OL_ARG_ENABLE(cleartext,[    --enable-cleartext	enable cleartext passwords], yes)dnl
 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(modules,[    --enable-modules	enable dynamic module support], no)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(quipu,[    --enable-quipu	build quipu migration tools], no)dnl
 OL_ARG_ENABLE(rlookups,[    --enable-rlookups	enable reverse lookups], auto)dnl
 OL_ARG_ENABLE(aci,[    --enable-aci	enable per-object ACIs], no)dnl
-OL_ARG_ENABLE(discreteaci,[    --enable-discreteaci	enable discrete rights in 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
 
@@ -151,7 +153,7 @@ OL_ARG_WITH(ldap_module,[      --with-ldap-module	module type], static,
 	[static dynamic])
 OL_ARG_ENABLE(ldbm,[    --enable-ldbm	enable ldbm backend], yes)dnl
 OL_ARG_WITH(ldbm_api,[      --with-ldbm-api	use LDBM API], auto,
-	[auto db2 db mdbm gdbm ndbm manual])
+	[auto db2 db mdbm gdbm manual])
 OL_ARG_WITH(ldbm_module,[      --with-ldbm-module	module type], static,
 	[static dynamic])
 OL_ARG_WITH(ldbm_type,[      --with-ldbm-type	use LDBM type], auto,
@@ -169,6 +171,9 @@ OL_ARG_WITH(shell_module,[      --with-shell-module	module type], static,
 OL_ARG_ENABLE(tcl,[    --enable-tcl	enable tcl backend], no)dnl
 OL_ARG_WITH(tcl_module,[      --with-tcl-module	module type], static,
 	[static dynamic])
+OL_ARG_ENABLE(sql,[    --enable-sql	enable sql backend], no)dnl
+OL_ARG_WITH(sql_module,[      --with-sql-module	module type], static,
+	[static dynamic])
 
 dnl ----------------------------------------------------------------
 dnl SLURPD OPTIONS
@@ -218,6 +223,9 @@ if test $ol_enable_slapd = no ; then
 	if test $ol_enable_tcl = yes ; then
 		AC_MSG_WARN([slapd disabled, ignoring --enable-tcl argument])
 	fi
+	if test $ol_enable_sql = yes ; then
+		AC_MSG_WARN([slapd disabled, ignoring --enable-sql argument])
+	fi
 	if test $ol_enable_modules = yes ; then
 		AC_MSG_WARN([slapd disabled, ignoring --enable-modules argument])
 	fi
@@ -239,9 +247,6 @@ if test $ol_enable_slapd = no ; then
 	if test $ol_enable_aci = yes ; then
 		AC_MSG_WARN([slapd disabled, ignoring --enable-aci argument])
 	fi
-	if test $ol_enable_discreteaci = yes ; then
-		AC_MSG_WARN([slapd disabled, ignoring --enable-discreteaci argument])
-	fi
 	if test $ol_with_ldbm_api != auto ; then
 		AC_MSG_WARN([slapd disabled, ignoring --with-ldbm-api argument])
 	fi
@@ -269,6 +274,9 @@ if test $ol_enable_slapd = no ; then
 	if test $ol_with_tcl_module != static ; then
 		AC_MSG_WARN([slapd disabled, ignoring --with-tcl-module argument])
 	fi
+	if test $ol_with_sql_module != static ; then
+		AC_MSG_WARN([slapd disabled, ignoring --with-sql-module argument])
+	fi
 	if test $ol_enable_slurpd = yes ; then
 		AC_MSG_ERROR([slurpd requires slapd])
 	fi
@@ -281,6 +289,7 @@ if test $ol_enable_slapd = no ; then
 	ol_enable_perl=no
 	ol_enable_shell=no
 	ol_enable_tcl=no
+	ol_enable_sql=no
 
 	ol_enable_modules=no
 	ol_enable_multimaster=no
@@ -288,7 +297,6 @@ if test $ol_enable_slapd = no ; then
 	ol_enable_quipu=no
 	ol_enable_rlookups=no
 	ol_enable_aci=no
-	ol_enable_discreteaci=no
 	ol_enable_wrappers=no
 	ol_enable_dynamic=no
 
@@ -302,6 +310,7 @@ if test $ol_enable_slapd = no ; then
 	ol_with_perl_module=static
 	ol_with_shell_module=static
 	ol_with_tcl_module=static
+	ol_with_sql_module=static
 
 	ol_enable_slurpd=no
 
@@ -329,7 +338,8 @@ elif test $ol_enable_ldbm = no ; then
 		$ol_enable_passwd = no -a \
 		$ol_enable_perl = no -a \
 		$ol_enable_shell = no -a \
-		$ol_enable_tcl = no ; then
+		$ol_enable_tcl = no -a \
+		$ol_enable_sql = no ; then
 		AC_MSG_ERROR([slapd requires a backend])
 	fi
 
@@ -379,6 +389,18 @@ if test $ol_enable_slurpd = yes ; then
 	fi
 fi
 
+if test $ol_enable_kbind = yes -o $ol_enable_kpasswd = yes ; then
+	if test $ol_with_kerberos = no ; then
+		AC_MSG_ERROR([options require --with-kerberos])
+	fi
+elif test $ol_enable_kbind = no -o $ol_enable_kpasswd = no ; then
+	if test $ol_with_kerberos != auto ; then
+		AC_MSG_WARN([Kerberos detection enabled unnecessarily]);
+	else
+		ol_with_kerberos=no
+	fi
+fi
+
 AC_MSG_RESULT(done)
 
 dnl ----------------------------------------------------------------
@@ -405,6 +427,7 @@ BUILD_PERL=no
 BUILD_QUIPU=no
 BUILD_SHELL=no
 BUILD_TCL=no
+BUILD_SQL=no
 BUILD_THREAD=no
 
 BUILD_BDB2_DYNAMIC=static
@@ -414,6 +437,7 @@ BUILD_PASSWD_DYNAMIC=static
 BUILD_PERL_DYNAMIC=static
 BUILD_SHELL_DYNAMIC=static
 BUILD_TCL_DYNAMIC=static
+BUILD_SQL_DYNAMIC=static
 
 SLAPD_MODULES_LDFLAGS=
 SLAPD_MODULES_CPPFLAGS=
@@ -423,8 +447,13 @@ SLAPD_PERL_LDFLAGS=
 MOD_PERL_LDFLAGS=
 PERL_CPPFLAGS=
 
+SLAPD_SQL_LDFLAGS=
+SLAPD_SQL_LIBS=
+SLAPD_SQL_INCLUDES=
+
 MOD_TCL_LIB=
-KRB_LIBS=
+KRB4_LIBS=
+KRB5_LIBS=
 READLINE_LIBS=
 SASL_LIBS=
 TERMCAP_LIBS=
@@ -522,7 +551,7 @@ if test $ol_enable_perl != no ; then
 
 	else
 		PERL_CPPFLAGS="`$PERLBIN -MExtUtils::Embed -e ccopts`"
-		if test x"$ol_with_perl_module" == "xstatic" ; then
+		if test x"$ol_with_perl_module" = "xstatic" ; then
 			SLAPD_PERL_LDFLAGS="`$PERLBIN -MExtUtils::Embed -e ldopts|sed -e s/-lc//`"
 		else
 			MOD_PERL_LDFLAGS="`$PERLBIN -MExtUtils::Embed -e ldopts|sed -e s/-lc//`"
@@ -609,6 +638,7 @@ else
 	ol_with_perl_module=static
 	ol_with_shell_module=static
 	ol_with_tcl_module=static
+	ol_with_sql_module=static
 fi
 
 dnl ----------------------------------------------------------------
@@ -681,25 +711,22 @@ dnl HP-UX requires -lV3
 AC_CHECK_LIB(V3, sigset)
 
 dnl Gotta check for winsock manually
-if test "${ac_cv_header_winsock_h}" = yes; then
-    AC_MSG_CHECKING(for winsock support)
-    AC_TRY_LINK([
-#include <winsock.h>
-    ],[
-socket(0,0,0);
-select(0,NULL,NULL,NULL,NULL);
-closesocket(0);
-gethostname(NULL,0);
-    ],[
-	AC_MSG_RESULT(yes)
-	AC_DEFINE(HAVE_WINSOCK,1,[define if you have winsock])
-	ac_cv_func_socket=yes
-	ac_cv_func_select=yes
-	ac_cv_func_closesocket=yes
-	ac_cv_func_gethostname=yes
-    ],[
-	AC_MSG_RESULT(no)
-    ])
+if test $ac_cv_header_winsock_h = yes; then
+	AC_CACHE_CHECK([for winsock], [ol_cv_winsock], 
+    	AC_TRY_LINK([#include <winsock.h>],[
+			socket(0,0,0);
+			select(0,NULL,NULL,NULL,NULL);
+			closesocket(0);
+			gethostname(NULL,0);
+    	],[ol_cv_winsock=yes],[ol_cv_winsock=no])])
+
+	if test $ol_cv_winsock = yes ; then
+		AC_DEFINE(HAVE_WINSOCK,1,[define if you have winsock])
+		ac_cv_func_socket=yes
+		ac_cv_func_select=yes
+		ac_cv_func_closesocket=yes
+		ac_cv_func_gethostname=yes
+	fi
 fi
 
 dnl Find socket()
@@ -711,7 +738,6 @@ AC_CHECK_FUNC(socket, :, [
 dnl hopefully we won't include too many libraries
 	AC_CHECK_LIB(socket, main)
 	AC_CHECK_LIB(net, main)
-	AC_CHECK_LIB(net, socket)
 	AC_CHECK_LIB(nsl_s, main)
 	AC_CHECK_LIB(nsl, main)
 	AC_CHECK_LIB(inet, socket)
@@ -720,7 +746,6 @@ dnl hopefully we won't include too many libraries
 
 dnl require select
 AC_CHECK_FUNC(select, :, AC_MSG_ERROR([select() required.]))
-dnl AC_CHECK_FUNCS(socketpair)
 
 if test "${ac_cv_header_winsock_h}" != yes; then
     dnl Select arg types
@@ -822,28 +847,102 @@ fi
 
 dnl ----------------------------------------------------------------
 dnl Kerberos
-ol_link_kerberos=no
+ol_link_kbind=no
+ol_link_kpasswd=no
+ol_link_krb5=no
+ol_link_krb4=no
+
+if test $ol_with_kerberos = auto -o $ol_with_kerberos = k5 \
+	-o $ol_with_kerberos = k5only -o $ol_with_kerberos = k425 ; then
+
+	AC_CHECK_HEADERS(krb5.h)
+
+	if test $ac_cv_header_krb5_h = yes ; then
+		dnl lazy check for Heimdal Kerberos
+		AC_CHECK_HEADERS(heim_err.h)
+		if test $ac_cv_header_heim_err_h = yes ; then
+			krb5_impl=heimdal
+		else
+			krb5_impl=mit
+		fi
+
+		if test $krb5_impl = mit; then
+			AC_CHECK_LIB(krb5, main,
+				[have_krb5=yes
+				KRB5_LIBS="-lkrb5 -lcrypto -lcom_err"],
+				[have_krb5=no],
+				[-lcrypto -lcom_err])
+
+		elif test $krb5_impl = heimdal; then
+			AC_CHECK_LIB(krb5, main,
+				[have_krb5=yes
+				KRB5_LIBS="-lkrb5 -ldes -lasn1 -lroken -lcom_err"],
+				[have_krb5=no],
+				[-ldes -lasn1 -lroken -lcom_err])
+
+			AC_DEFINE(HAVE_HEIMDAL_KERBEROS, 1,
+				[define if you have HEIMDAL Kerberos])
+		else
+			have_krb5=no
+			AC_MSG_WARN([Unrecongized Kerberos5 Implementation])
+		fi
+
+		if test $have_krb5 = yes ; then
+			ol_link_krb5=yes
+
+			AC_DEFINE(HAVE_KRB5, 1,
+				[define if you have Kerberos V])
+
+			if test $ol_enable_kpasswd != no ; then
+				ol_link_kpasswd=yes;
+			fi
+
+			if test $ol_with_kerberos = k5only ; then
+				ol_with_kerberos=found
+			fi
+
+		elif test $ol_with_kerberos != auto ; then
+			AC_MSG_ERROR([Required Kerberos 5 support not available])
+		fi
+
+	fi
+fi
+
+if test $ol_link_krb5 = yes -a \
+	\( $ol_with_kerberos = auto -o $ol_with_kerberos = k425 \) ; then
 
-if test $ol_with_kerberos = auto -o $ol_with_kerberos = k5 ; then
 	AC_CHECK_HEADERS(kerberosIV/krb.h kerberosIV/des.h)
 
 	if test $ac_cv_header_kerberosIV_krb_h = yes ; then
-		AC_CHECK_LIB(krb4, main, [have_k5=yes], [have_k5=no],
-			[-lkrb5 -ldes425])
+		if test $krb5_impl = mit; then
+			AC_CHECK_LIB(krb4, main, [have_k425=yes
+				KRB4_LIBS="-lkrb4 -ldes425"], [have_k425=no],
+				[-ldes425 -lkrb5 -lcrypto -lcom_err])
 
-		if test $have_k5 = yes ; then
-			ol_with_kerberos=found
-			ol_link_kerberos=yes
+		elif test $krb5_impl = heimdal; then
+			AC_CHECK_LIB(krb4, main, [have_k425=yes
+				KRB4_LIBS="-lkrb4"], [have_k425=no],
+				[-lkrb5 -ldes -lasn1 -lroken -lcom_err])
+
+		else
+			have_425=no
+			AC_MSG_WARN([Unrecongized Kerberos5 Implementation])
+		fi
 
-			KRB_LIBS="-lkrb4 -lkrb5 -ldes425"
+		if test $have_k425 = yes ; then
+			ol_with_kerberos=found
+			ol_link_krb4=yes
 
-			LIBS="$KRB_LIBS $LIBS"
+			AC_DEFINE(HAVE_KRB425, 1,
+				[define if you have Kerberos V with IV support])
+			AC_DEFINE(HAVE_KRB4, 1,
+				[define if you have Kerberos IV])
 
 			AC_CACHE_CHECK([for des_debug in Kerberos libraries],
 				[ol_cv_var_des_debug], [
 				dnl save the flags
 				save_LIBS="$LIBS"
-				LIBS="$KRB_LIBS $LIBS"
+				LIBS="$KRB4_LIBS $KRB5_LIBS $LIBS"
 				AC_TRY_LINK([
 #include <kerberosIV/krb.h>
 #include <kerberosIV/des.h>
@@ -865,6 +964,10 @@ des_debug = 1;
 	fi
 fi
 
+if test $ol_link_krb5 = yes ; then
+	ol_with_kerberos=found
+fi
+
 if test $ol_with_kerberos = auto -o $ol_with_kerberos = k4 \
 	-o $ol_with_kerberos = kth ; then
 
@@ -875,9 +978,12 @@ if test $ol_with_kerberos = auto -o $ol_with_kerberos = k4 \
 
 		if test $have_k4 = yes ; then
 			ol_with_kerberos=found
-			ol_link_kerberos=yes
+			ol_link_krb4=yes
 
-			KRB_LIBS="-lkrb -ldes"
+			AC_DEFINE(HAVE_KRB4, 1,
+				[define if you have Kerberos IV])
+
+			KRB4_LIBS="-lkrb -ldes"
 
 			if test $ac_cv_header_krb_archaeology_h = yes ; then
 				AC_DEFINE(HAVE_KTH_KERBEROS, 1,
@@ -887,11 +993,15 @@ if test $ol_with_kerberos = auto -o $ol_with_kerberos = k4 \
 	fi
 fi
 
-if test $ol_link_kerberos = yes ; then
+if test $ol_link_krb4 = yes -a $ol_enable_kpasswd != no ; then
+	ol_link_kpasswd=yes;
+fi
+
+if test $ol_link_krb4 = yes -o $ol_link_krb5 = yes ; then
 	AC_DEFINE(HAVE_KERBEROS, 1, [define if you have Kerberos])
 
 elif test $ol_with_kerberos != auto -a $ol_with_kerberos != no ; then
-	AC_ERROR([Kerberos detection failed.])
+	AC_MSG_ERROR([Kerberos detection failed.])
 fi
 
 dnl ----------------------------------------------------------------
@@ -993,14 +1103,19 @@ ol_link_threads=no
 if test $ol_with_threads = auto -o $ol_with_threads = yes \
 	-o $ol_with_threads = nt ; then
 
-	dnl Not much to check. If we're in mingw32, we assume win32 threads.
-	if test "$ac_cv_mingw32" = yes ; then
+	OL_NT_THREADS
+
+	if test "$ol_cv_nt_threads" = yes ; then
     	ol_link_threads=nt
     	ol_with_threads=found
     	ol_with_yielding_select=yes
-    	AC_MSG_CHECKING(for NT threads)
-    	AC_MSG_RESULT(yes)
-    	AC_DEFINE(HAVE_NT_THREADS,1,[if you have NT threads])
+
+		AC_DEFINE(HAVE_NT_SERVICE_MANAGER,1,[if you have NT Service Manager])
+		AC_DEFINE(HAVE_NT_EVENT_LOG,1,[if you have NT Event Log])
+	fi
+
+	if test $ol_with_threads = nt ; then
+		AC_MSG_ERROR([could not locate NT Threads])
 	fi
 fi
 
@@ -1640,9 +1755,7 @@ if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = gdbm ; then
 	fi
 fi
 
-if test $ol_with_ldbm_api = auto ; then
-	AC_MSG_WARN([skipping automatic checking for NDBM, must be manually enabled.])
-elif test $ol_with_ldbm_api = ndbm ; then
+if test $ol_with_ldbm_api = ndbm ; then
 	OL_NDBM
 
 	if test $ol_cv_ndbm = yes ; then
@@ -1730,7 +1843,7 @@ if test $ol_enable_tcl != no ; then
 		for lib in tcl tcl7.6 tcl8.0 tcl8.2 ; do
 			AC_CHECK_LIB($lib,main,
 			  [have_tcl=yes
-			   if test x"$ol_with_tcl_module" == "xstatic" ; then
+			   if test x"$ol_with_tcl_module" = "xstatic" ; then
 			       SLAPD_LIBS="$SLAPD_LIBS -l${lib}"
 			   else
 			       MOD_TCL_LIB="-l${lib}"
@@ -1913,6 +2026,10 @@ AC_TYPE_PID_T
 AM_TYPE_PTRDIFF_T
 AC_TYPE_SIGNAL
 AC_TYPE_SIZE_T
+
+AC_CHECK_TYPE(ssize_t, [signed int])
+AC_CHECK_TYPE(caddr_t,	[char *])
+
 OL_TYPE_SOCKLEN_T
 AC_STRUCT_ST_BLKSIZE
 AC_HEADER_TIME
@@ -1920,12 +2037,10 @@ AC_STRUCT_TM
 AC_TYPE_UID_T
 OL_TYPE_SIG_ATOMIC_T
 
-dnl only check these if we're not Mingw32
-if test "$ac_cv_mingw32" != yes ; then
-    AC_TYPE_GETGROUPS
-    OL_STRUCT_PASSWD_PW_GECOS
-    OL_STRUCT_PASSWD_PW_PASSWD
-fi
+dnl AC_TYPE_GETGROUPS
+
+OL_STRUCT_PASSWD_PW_GECOS
+OL_STRUCT_PASSWD_PW_PASSWD
 
 OL_C_UPPER_LOWER
 AC_C_CONST
@@ -1933,31 +2048,25 @@ OL_C_VOLATILE
 
 if test $cross_compiling = yes ; then
 	AC_DEFINE(CROSS_COMPILING, 1, [define if cross compiling])
-
-	AC_DEFINE(LBER_INT_T,long)
-	AC_DEFINE(LBER_TAG_T,long)
-	AC_DEFINE(LBER_SOCKET_T,int)
-
 else
 	AC_C_BIGENDIAN
-	AC_CHECK_SIZEOF(short) 
-	AC_CHECK_SIZEOF(int) 
-	AC_CHECK_SIZEOF(long)
+fi
 
-	if test "$ac_cv_sizeof_int" -lt 4 ; then
-		AC_MSG_WARN([OpenLDAP requires 'int' to be 32 bits or greater.])
+AC_COMPILE_CHECK_SIZEOF(short) 
+AC_COMPILE_CHECK_SIZEOF(int) 
+AC_COMPILE_CHECK_SIZEOF(long)
 
-		AC_DEFINE(LBER_INT_T,long)
-		AC_DEFINE(LBER_TAG_T,long)
-		AC_DEFINE(LBER_SOCKET_T,int)
-	else
-		AC_DEFINE(LBER_INT_T,int)
-		AC_DEFINE(LBER_TAG_T,long)
-		AC_DEFINE(LBER_SOCKET_T,int)
-	fi
+if test "$ac_cv_sizeof_int" -lt 4 ; then
+	AC_MSG_WARN([OpenLDAP requires 'int' to be 32 bits or greater.])
+
+	AC_DEFINE(LBER_INT_T,long)
+else
+	AC_DEFINE(LBER_INT_T,int)
 fi
 
 AC_DEFINE(LBER_LEN_T,long)
+AC_DEFINE(LBER_SOCKET_T,int)
+AC_DEFINE(LBER_TAG_T,long)
 
 dnl ----------------------------------------------------------------
 dnl Checks for library functions.
@@ -2070,6 +2179,9 @@ if test "$ol_enable_cache" = no ; then
 	AC_DEFINE(LDAP_NOCACHE,1,
 		[define this to remove -lldap cache support])
 fi
+if test "$ol_link_kbind" != no ; then
+	AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND,LDAP_VENDOR_VERSION)
+fi
 if test "$ol_enable_dns" != no ; then
 	AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_V2_DNS,LDAP_VENDOR_VERSION)
 fi
@@ -2083,12 +2195,18 @@ fi
 if test "$ol_enable_cldap" != no ; then
 	AC_DEFINE(LDAP_CONNECTIONLESS,1,[define to support CLDAP])
 fi
+if test "$ol_enable_ldapi" != no; then
+	AC_DEFINE(USE_PF_LOCAL,1,[define to support PF_LOCAL transport])
+fi
 
+if test "$ol_enable_cleartext" != no ; then
+	AC_DEFINE(SLAPD_CLEARTEXT,1,[define to support cleartext passwords])
+fi
 if test "$ol_enable_crypt" != no ; then
 	AC_DEFINE(SLAPD_CRYPT,1,[define to support crypt(3) passwords])
 fi
-if test "$ol_enable_cleartext" != no ; then
-	AC_DEFINE(SLAPD_CLEARTEXT,1,[define to support cleartext passwords])
+if test "$ol_link_kpasswd" != no ; then
+	AC_DEFINE(SLAPD_KPASSWD,1,[define to support Kerberos passwords])
 fi
 if test "$ol_enable_multimaster" != no ; then
 	AC_DEFINE(SLAPD_MULTIMASTER,1,[define to support multimaster replication])
@@ -2102,9 +2220,6 @@ fi
 if test "$ol_enable_aci" != no ; then
 	AC_DEFINE(SLAPD_ACI_ENABLED,1,[define to support per-object ACIs])
 fi
-if test "$ol_enable_discreteaci" != no ; then
-	AC_DEFINE(SLAPD_ACI_DISCRETE_RIGHTS,1,[define to support discrete rights in ACIs])
-fi
 
 if test "$ol_link_modules" != no ; then
 	AC_DEFINE(SLAPD_MODULES,1,[define to support modules])
@@ -2203,6 +2318,20 @@ if test "$ol_enable_tcl" != no ; then
 	fi
 fi
 
+if test "$ol_enable_sql" != no ; then
+	AC_DEFINE(SLAPD_SQL,1,[define to support SQL backend])
+	BUILD_SLAPD=yes
+	BUILD_SQL=yes
+	SLAPD_SQL_LIBS=-liodbc
+	if test "$ol_with_sql_module" != static; then
+		AC_DEFINE(SLAPD_SQL_DYNAMIC,1,
+			[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"
+	fi
+fi
+
 if test "$ol_enable_slurpd" != no -a "$ol_link_threads" != no -a \
 	$BUILD_SLAPD = yes ; then
 	BUILD_SLURPD=yes
@@ -2247,6 +2376,7 @@ AC_SUBST(BUILD_SLAPD)
   AC_SUBST(BUILD_QUIPU)
   AC_SUBST(BUILD_SHELL)
   AC_SUBST(BUILD_TCL)
+  AC_SUBST(BUILD_SQL)
   AC_SUBST(BUILD_BDB2_DYNAMIC)
   AC_SUBST(BUILD_LDAP_DYNAMIC)
   AC_SUBST(BUILD_LDBM_DYNAMIC)
@@ -2254,6 +2384,7 @@ AC_SUBST(BUILD_SLAPD)
   AC_SUBST(BUILD_PERL_DYNAMIC)
   AC_SUBST(BUILD_SHELL_DYNAMIC)
   AC_SUBST(BUILD_TCL_DYNAMIC)
+  AC_SUBST(BUILD_SQL_DYNAMIC)
 AC_SUBST(BUILD_SLURPD)
 
 AC_SUBST(LDAP_LIBS)
@@ -2276,13 +2407,18 @@ AC_SUBST(PERL_CPPFLAGS)
 AC_SUBST(SLAPD_PERL_LDFLAGS)
 AC_SUBST(MOD_PERL_LDFLAGS)
 
-AC_SUBST(KRB_LIBS)
+AC_SUBST(KRB4_LIBS)
+AC_SUBST(KRB5_LIBS)
 AC_SUBST(READLINE_LIBS)
 AC_SUBST(SASL_LIBS)
 AC_SUBST(TERMCAP_LIBS)
 AC_SUBST(TLS_LIBS)
 AC_SUBST(MODULES_LIBS)
 
+AC_SUBST(SLAPD_SQL_LDFLAGS)
+AC_SUBST(SLAPD_SQL_LIBS)
+AC_SUBST(SLAPD_SQL_INCLUDES)
+
 dnl ----------------------------------------------------------------
 dnl final output
 dnl
@@ -2311,6 +2447,7 @@ libraries/libldap/Makefile:build/top.mk:libraries/libldap/Makefile.in:build/lib.
 libraries/libldap_r/Makefile:build/top.mk:libraries/libldap_r/Makefile.in:build/lib.mk:build/lib-shared.mk	\
 libraries/libldbm/Makefile:build/top.mk:libraries/libldbm/Makefile.in:build/lib.mk:build/lib-static.mk	\
 libraries/libldif/Makefile:build/top.mk:libraries/libldif/Makefile.in:build/lib.mk:build/lib-static.mk	\
+libraries/liblunicode/Makefile:build/top.mk:libraries/liblunicode/Makefile.in:build/lib.mk:build/lib-static.mk	\
 libraries/liblutil/Makefile:build/top.mk:libraries/liblutil/Makefile.in:build/lib.mk:build/lib-static.mk	\
 servers/Makefile:build/top.mk:servers/Makefile.in:build/dir.mk \
 servers/ldapd/Makefile:build/top.mk:servers/ldapd/Makefile.in:build/srv.mk \
@@ -2322,6 +2459,7 @@ servers/slapd/back-passwd/Makefile:build/top.mk:servers/slapd/back-passwd/Makefi
 servers/slapd/back-perl/Makefile:build/top.mk:servers/slapd/back-perl/Makefile.in:build/mod.mk \
 servers/slapd/back-shell/Makefile:build/top.mk:servers/slapd/back-shell/Makefile.in:build/mod.mk \
 servers/slapd/back-tcl/Makefile:build/top.mk:servers/slapd/back-tcl/Makefile.in:build/mod.mk \
+servers/slapd/back-sql/Makefile:build/top.mk:servers/slapd/back-sql/Makefile.in:build/mod.mk \
 servers/slapd/shell-backends/Makefile:build/top.mk:servers/slapd/shell-backends/Makefile.in:build/srv.mk \
 servers/slapd/tools/Makefile:build/top.mk:servers/slapd/tools/Makefile.in \
 servers/slurpd/Makefile:build/top.mk:servers/slurpd/Makefile.in:build/srv.mk \