]> git.sur5r.net Git - openldap/blobdiff - configure.in
Update COPYRIGHT notices
[openldap] / configure.in
index 429b38bde325870df71f0c2913d8bb9cca6e69c1..ee84f5febb8e29ad3acf36937d67f74ec5317142 100644 (file)
@@ -20,6 +20,11 @@ if test -z "$OL_VERSION"; then
        AC_MSG_ERROR([could not determine version])
 fi
 
+dnl ----------------------------------------------------------------
+dnl Determine host platform
+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)
@@ -27,12 +32,13 @@ AC_DEFINE_UNQUOTED(OPENLDAP_PACKAGE,"$PACKAGE",Package)
 AC_DEFINE_UNQUOTED(OPENLDAP_VERSION,"$VERSION",Version)
 
 dnl We use autoconf features new to 2.13.
-dnl    aclocal.m4 should be built using aclocal from automake 1.4
+dnl aclocal.m4 should be built using aclocal from automake 1.4
+dnl libtool 1.3.3 should be installed.
 AC_PREREQ(2.13)dnl Required Autoconf version
 
-AC_CONFIG_HEADER(include/portable.h include/ldap_features.h)dnl
+AC_CONFIG_HEADER(include/portable.h include/ldap_features.h include/lber_types.h)dnl
 
-dnl
+dnl ----------------------------------------------------------------
 dnl Start Args
 AC_MSG_CHECKING(configure arguments)
 AC_PREFIX_DEFAULT(/usr/local)
@@ -40,8 +46,6 @@ AC_PREFIX_DEFAULT(/usr/local)
 top_builddir=`pwd`
 AC_SUBST(top_builddir)dnl
 
-AC_DEFINE(HAVE_MKVERSION, 1, [define this if you have mkversion])
-
 ldap_subdir="openldap"
 
 AC_ARG_WITH(subdir, [  --with-subdir=DIR change default subdirectory used for installs], [
@@ -88,7 +92,6 @@ OL_ARG_ENABLE(ldapd,[  --enable-ldapd enable building ldapd], no)dnl
 dnl SLAPD OPTIONS
 AC_ARG_WITH(xxslapdoptions,[SLAPD Options:])
 OL_ARG_ENABLE(slapd,[  --enable-slapd  enable building slapd], yes)dnl
-OL_ARG_ENABLE(aclgroups,[    --enable-aclgroups        enable ACL group support], auto)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(modules,[    --enable-modules    enable dynamic module support], no)dnl
@@ -98,26 +101,40 @@ OL_ARG_ENABLE(wrappers,[    --enable-wrappers      enable tcp wrapper support], no)dn
 
 dnl SLAPD Backend options
 OL_ARG_ENABLE(bdb2,[    --enable-bdb2  enable bdb2 backend], no)dnl
+OL_ARG_WITH(bdb2_module,[      --with-bdb2-module      module type], static,
+       [static dynamic])
 OL_ARG_ENABLE(ldap,[    --enable-ldap  enable ldap backend], no)dnl
+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_module,[      --with-ldbm-module      module type], static,
+       [static dynamic])
 OL_ARG_WITH(ldbm_api,[      --with-ldbm-api    use LDBM API], auto,
        [auto db2 db mdbm gdbm ndbm manual])
 OL_ARG_WITH(ldbm_type,[      --with-ldbm-type  use LDBM type], auto,
        [auto btree hash])
 
 OL_ARG_ENABLE(passwd,[    --enable-passwd      enable passwd backend], no)dnl
+OL_ARG_WITH(passwd_module,[      --with-passwd-module  module type], static,
+       [static dynamic])
 OL_ARG_ENABLE(perl,[    --enable-perl  enable perl backend], no)dnl
+OL_ARG_WITH(perl_module,[      --with-perl-module      module type], static,
+       [static dynamic])
 OL_ARG_ENABLE(shell,[    --enable-shell        enable shell backend], no)dnl
+OL_ARG_WITH(shell_module,[      --with-shell-module    module type], static,
+       [static dynamic])
 OL_ARG_ENABLE(tcl,[    --enable-tcl    enable tcl backend], no)dnl
+OL_ARG_WITH(tcl_module,[      --with-tcl-module        module type], static,
+       [static dynamic])
 
 dnl SLURPD OPTIONS
 AC_ARG_WITH(xxslurpdoptions,[SLURPD Options:])
 OL_ARG_ENABLE(slurpd,[  --enable-slurpd        enable building slurpd], auto)dnl
 
 AC_ARG_WITH(xxliboptions,[Library Generation & Linking Options])
-AM_ENABLE_STATIC
-dnl AM_DISABLE_SHARED
-AM_ENABLE_SHARED
+AC_ENABLE_STATIC
+dnl AC_DISABLE_SHARED
+AC_ENABLE_SHARED
 
 dnl General "enable" options
 # validate options
@@ -154,9 +171,6 @@ 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_aclgroups = yes ; then
-               AC_MSG_WARN([slapd disabled, ignoring --enable-aclgroups argument])
-       fi
        if test $ol_enable_modules = yes ; then
                AC_MSG_WARN([slapd disabled, ignoring --enable-modules argument])
        fi
@@ -175,6 +189,27 @@ if test $ol_enable_slapd = no ; then
        if test $ol_with_ldbm_type != auto ; then
                AC_MSG_WARN([slapd disabled, ignoring --with-ldbm-type argument])
        fi
+       if test $ol_with_bdb2_module != static ; then
+               AC_MSG_WARN([slapd disabled, ignoring --with-bdb2-module argument])
+       fi
+       if test $ol_with_ldap_module != static ; then
+               AC_MSG_WARN([slapd disabled, ignoring --with-ldap-module argument])
+       fi
+       if test $ol_with_ldbm_module != static ; then
+               AC_MSG_WARN([slapd disabled, ignoring --with-ldbm-module argument])
+       fi
+       if test $ol_with_passwd_module != static ; then
+               AC_MSG_WARN([slapd disabled, ignoring --with-passwd-module argument])
+       fi
+       if test $ol_with_perl_module != static ; then
+               AC_MSG_WARN([slapd disabled, ignoring --with-perl-module argument])
+       fi
+       if test $ol_with_shell_module != static ; then
+               AC_MSG_WARN([slapd disabled, ignoring --with-shell-module argument])
+       fi
+       if test $ol_with_tcl_module != static ; then
+               AC_MSG_WARN([slapd disabled, ignoring --with-tcl-module argument])
+       fi
        if test $ol_enable_slurpd = yes ; then
                AC_MSG_ERROR([slurpd requires slapd])
        fi
@@ -188,7 +223,6 @@ if test $ol_enable_slapd = no ; then
        ol_enable_shell=no
        ol_enable_tcl=no
 
-       ol_enable_aclgroups=no
        ol_enable_modules=no
        ol_enable_phonetic=no
        ol_enable_rlookups=no
@@ -197,6 +231,14 @@ if test $ol_enable_slapd = no ; then
        ol_with_ldbm_api=no
        ol_with_ldbm_type=no
 
+       ol_with_bdb2_module=static
+       ol_with_ldap_module=static
+       ol_with_ldbm_module=static
+       ol_with_passwd_module=static
+       ol_with_perl_module=static
+       ol_with_shell_module=static
+       ol_with_tcl_module=static
+
        ol_enable_slurpd=no
 
 elif test $ol_enable_ldbm = no ; then
@@ -210,6 +252,10 @@ elif test $ol_enable_ldbm = no ; then
                AC_MSG_WARN([LDBM disabled, ignoring --with-ldbm-type argument])
        fi
 
+       if test $ol_with_ldbm_module != static ; then
+               AC_MSG_WARN([LDBM disabled, ignoring --with-ldbm-module argument])
+       fi
+
        if test $ol_enable_bdb2 = yes ; then
                AC_MSG_ERROR([BDB2 requires --enable-ldbm])
        fi
@@ -225,6 +271,7 @@ elif test $ol_enable_ldbm = no ; then
 
        ol_with_ldbm_api=no
        ol_with_ldbm_type=no
+       ol_with_ldbm_module=static
 
 elif test $ol_enable_bdb2 = yes ; then
        dnl SLAPD with BDB2
@@ -293,6 +340,14 @@ BUILD_SHELL=no
 BUILD_TCL=no
 BUILD_THREAD=no
 
+BUILD_BDB2_DYNAMIC=no
+BUILD_LDAP_DYNAMIC=no
+BUILD_LDBM_DYNAMIC=no
+BUILD_PASSWD_DYNAMIC=no
+BUILD_PERL_DYNAMIC=no
+BUILD_SHELL_DYNAMIC=no
+BUILD_TCL_DYNAMIC=no
+
 SLAPD_MODULES_LDFLAGS=
 SLAPD_MODULES_CPPFLAGS=
 
@@ -309,57 +364,63 @@ dnl Checks for programs
 
 dnl AC_PROG_INSTALL
 
-dnl The default compiler is cc (NOT gcc)
-dnl    (should check to see if 'cc' exists)
-save_CC="$CC"
-if test -z "${CC}"; then
-       AC_CHECK_PROGS(CC,cc)
-fi
+AC_DEFINE(HAVE_MKVERSION, 1, [define this if you have mkversion])
 
-dnl The default CFLAGS is empty NOT whatever AC_PROG_CC sets.
-dnl CFLAGS=${CFLAGS-""}
 
 dnl
+dnl Determine which C translator to use
+dnl
+
 dnl AIX Thread requires we use cc_r or xlc_r.
-dnl But only do this IF AIX and CC is zero (initially),
-dnl and cc exists and threads are auto|yes|posix.
+dnl But only do this IF AIX and CC is not set
+dnl and threads are auto|yes|posix.
 dnl
 dnl If we find cc_r|xlc_r, force pthreads and assume
 dnl            pthread_create is in $LIBS (ie: don't bring in
 dnl            any additional thread libraries)
 dnl If we do not find cc_r|xlc_r, disable threads
-dnl
-AC_CANONICAL_HOST
-
-case "$host" in
-       *-*-aix*) ol_host_os=aix ;;
-esac
 
 ol_aix_threads=no
-if test -z "$save_CC" -a "$CC" = cc -a "$ol_host_os" = aix ; then
-       case "$ol_with_threads" in
+case "$target" in
+*-*-aix*) dnl all AIX is not a good idea.
+       if test -z "$CC" ; then
+               case "$ol_with_threads" in
                auto | yes |  posix) ol_aix_threads=yes ;;
-       esac
-fi
+               esac
+       fi
+;;
+esac
 
-if test ol_aix_threads = yes ; then
-       CC=
-       AC_CHECK_PROGS(CC,cc_r xlc_r)
+if test $ol_aix_threads = yes ; then
+       if test -z "${CC}" ; then
+               AC_CHECK_PROGS(CC,cc_r xlc_r cc)
 
-       if test "$CC" ; then
-               if test $ol_with_threads != auto ; then
-                       AC_MSG_ERROR([--with-threads requires cc_r (or other suitable compiler) on AIX])
-               else
-                       AC_MSG_WARN([disabling threads, no cc_r on AIX])
-               fi
-               ol_with_threads=no
-       else
+               if test "$CC" = cc ; then
+                       dnl no CC! don't allow --with-threads
+                       if test $ol_with_threads != auto ; then
+                               AC_MSG_ERROR([--with-threads requires cc_r (or other suitable compiler) on AIX])
+                       else
+                               AC_MSG_WARN([disabling threads, no cc_r on AIX])
+                       fi
+                       ol_with_threads=no
+               fi
+       fi
+
+       if test "${CC}" = "cc_r" -o "${CC}" = "xlc_r" ; then
                ol_with_threads=posix
                ol_cv_pthread_create=yes
        fi
 fi
 
-AM_PROG_LIBTOOL
+if test -z "${CC}"; then
+       AC_CHECK_PROGS(CC,cc)
+fi
+
+dnl The default CFLAGS is empty NOT whatever AC_PROG_CC sets.
+dnl (for now, let autoconf sort this out)
+dnl CFLAGS=${CFLAGS-""}
+
+AC_PROG_LIBTOOL
 dnl AC_PROG_MAKE_SET
 
 AC_PROG_AWK
@@ -375,25 +436,6 @@ AC_PATH_PROG(SENDMAIL, sendmail, /usr/lib/sendmail,
 AC_PATH_PROG(EDITOR, vi, /usr/ucb/vi, $PATH:/usr/ucb)
 AC_PATH_PROG(FINGER, finger, /usr/ucb/finger, $PATH:/usr/ucb)
 
-ol_link_modules=no
-if test $ol_enable_modules != no ; then
-       AC_PATH_PROG(GLIBCONFIG, glib-config)
-
-       if test "no$GLIBCONFIG" = "no" ; then
-               if test $ol_enable_modules = yes ; then
-                       AC_MSG_ERROR([could not locate glib-config])
-               fi
-
-       else
-               SLAPD_MODULES_VERSION="`$GLIBCONFIG --version gmodule`"
-               SLAPD_MODULES_CPPFLAGS="`$GLIBCONFIG --cflags gmodule`"
-               SLAPD_MODULES_LDFLAGS="`$GLIBCONFIG --libs gmodule`"
-
-               dnl should check glib version
-               ol_link_modules=yes
-       fi
-fi
-
 ol_link_perl=no
 if test $ol_enable_perl != no ; then
        AC_PATH_PROG(PERLBIN, perl, /usr/bin/perl)
@@ -431,9 +473,6 @@ AC_AIX
 AC_ISC_POSIX
 AC_MINIX
 
-dnl BeOS requires -lbe -lroot -lnet
-AC_CHECK_LIB(be, be_app, [LIBS="$LIBS -lbe -lroot -lnet"], :, [-lroot -lnet])
-
 dnl Checks for system services
 AC_CYGWIN
 AC_MINGW32
@@ -442,14 +481,15 @@ AC_OBJEXT
 
 AC_DEFINE_UNQUOTED( EXEEXT, "${EXEEXT}", [defined to be the EXE extension])
 
+dnl BeOS requires -lbe -lroot -lnet
+AC_CHECK_LIB(be, be_app, [LIBS="$LIBS -lbe -lroot -lnet"], :, [-lroot -lnet])
+
 dnl OpenLDAP requires STDC features
 AM_PROG_CC_STDC
 if test "X${am_cv_prog_cc_stdc}" = "Xno" ; then
-       AC_MSG_ERROR([OpenLDAP requires compiler to support STDC prototypes.])
+       AC_MSG_ERROR([OpenLDAP requires compiler to support STDC constructs.])
 fi
 
-dnl AM_C_PROTOTYPES
-
 dnl Check cc depend flags
 OL_MKDEPEND
 if test "${ol_cv_mkdep}" = no ; then
@@ -457,6 +497,37 @@ if test "${ol_cv_mkdep}" = no ; then
        AC_MSG_WARN([do not know how to generate dependencies])
 fi
 
+dnl
+dnl Check for module support
+dnl
+ol_link_modules=no
+if test $ol_enable_modules != no ; then
+       AC_PATH_PROG(GLIBCONFIG, glib-config)
+
+       if test "no$GLIBCONFIG" = "no" ; then
+               if test $ol_enable_modules = yes ; then
+                       AC_MSG_ERROR([could not locate glib-config])
+               fi
+
+       else
+               SLAPD_MODULES_VERSION="`$GLIBCONFIG --version gmodule`"
+               SLAPD_MODULES_CPPFLAGS="`$GLIBCONFIG --cflags gmodule`"
+               SLAPD_MODULES_LDFLAGS="`$GLIBCONFIG --libs gmodule`"
+
+               dnl should check glib version
+               ol_link_modules=yes
+       fi
+else
+       ol_with_bdb2_module=static
+       ol_with_ldap_module=static
+       ol_with_ldbm_module=static
+       ol_with_passwd_module=static
+       ol_with_perl_module=static
+       ol_with_shell_module=static
+       ol_with_tcl_module=static
+fi
+
+dnl ----------------------------------------------------------------
 dnl Checks for libraries
 
 dnl Find socket()
@@ -477,17 +548,25 @@ dnl
        AC_CHECK_LIB(gen, main)
 ])
 
-dnl Check for resolver routines
-AC_CHECK_FUNCS(res_search)
-if test $ac_cv_func_res_search = "no" ; then 
-       AC_CHECK_LIB(bind, res_search)
-       if test "$ac_cv_lib_bind_res_search" = "yes" ; then
-               AC_DEFINE(HAVE_RES_SEARCH,1)
-       else
+if test $ol_enable_dns != no ; then
+       dnl Check for resolver routines
+       AC_CHECK_FUNC(res_search,:)
+       if test $ac_cv_func_res_search = no ; then 
+               AC_CHECK_LIB(bind, res_search)
+               ac_cv_func_res_search=$ac_cv_lib_bind_res_search
+       fi
+       if test $ac_cv_func_res_search = no ; then 
                AC_CHECK_LIB(resolv, res_search)
-               if test "$ac_cv_lib_resolv_res_search" = "yes" ; then
-                       AC_DEFINE(HAVE_RES_SEARCH,1)
-               fi
+               ac_cv_func_res_search=$ac_cv_lib_resolv_res_search
+       fi
+
+       if test "$ac_cv_func_res_search" = yes ; then
+               AC_DEFINE(HAVE_RES_SEARCH,1,
+                       [define if you have res_search()])
+       elif test $ol_enable_dns = yes ; then
+               AC_MSG_ERROR([--enable-dns requires res_search])
+       else
+               AC_MSG_WARN([no res_search, disabling DNS support])
        fi
 fi
 
@@ -500,6 +579,11 @@ if test "$ac_cv_header_regex_h" != yes ; then
 fi
 AC_CHECK_FUNC(regfree, :, AC_MSG_ERROR([POSIX regex required.]))
 
+OL_POSIX_REGEX
+if test "$ol_cv_c_posix_regex" = no ; then
+       AC_MSG_ERROR([broken POSIX regex!])
+fi
+
 AC_CHECK_FUNC(select, :, AC_MSG_ERROR([select() required.]))
 
 dnl Select arg types
@@ -510,7 +594,7 @@ AC_FUNC_SELECT_ARGTYPES
 # ISODE tests
 ol_link_isode=no
 if test $ol_enable_ldapd != no ; then
-       AC_MSG_WARN([ldapd support deprecated.  Manual intervention required.])
+       AC_MSG_WARN([ldapd is not supported and may suffer from bit rot.])
 
        dnl look for ISODE libraries
        AC_CHECK_LIB(xtpp, main, [
@@ -610,15 +694,22 @@ dnl
 ol_link_tls=no
 if test $ol_with_tls != no ; then
        
-       AC_CHECK_HEADERS(ssl.h)
+       AC_CHECK_HEADERS(openssl/ssl.h ssl.h)
        
-       if test $ac_cv_header_ssl_h = yes ; then
+       if test $ac_cv_header_openssl_ssl_h = yes -o $ac_cv_header_ssl_h = yes ; then
                AC_CHECK_LIB(ssl, SSLeay_add_ssl_algorithms, 
                        [have_ssleay=yes
                        need_rsaref=no],
                        [have_ssleay=no],
                        [-lcrypto])
                        
+               if test $have_ssleay = no ; then
+                       AC_CHECK_LIB(ssl, SSL_library_init,
+                               [have_ssleay=yes
+                               need_rsaref=no], [have_ssleay=no],
+                               [-lcrypto])
+               fi
+
                if test $have_ssleay = no ; then
                        AC_CHECK_LIB(ssl, ssl3_accept, 
                                [have_ssleay=yes
@@ -725,6 +816,7 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \
                dnl     pthread_create() with -kthread (FreeBSD)
                dnl     pthread_create() with -pthread (FreeBSD/Digital Unix)
                dnl     pthread_create() with -pthreads (?)
+               dnl     pthread_create() with -mthreads (AIX)
                dnl     pthread_create() with -thread (?)
                dnl
                dnl Check pthread (final) libraries
@@ -746,8 +838,8 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \
                dnl
 
                dnl pthread_create in $LIBS
-               AC_MSG_CHECKING([for pthread_create in default libraries])
-               AC_CACHE_VAL(ol_cv_pthread_create,[
+               AC_CACHE_CHECK([for pthread_create in default libraries],
+                       ol_cv_pthread_create,[
                AC_TRY_RUN([
 #include <pthread.h>
 #ifndef NULL
@@ -792,7 +884,6 @@ int main(argc, argv)
                        [ol_cv_pthread_create=no],
                        [dnl assume yes
                        ol_cv_pthread_create=yes])])
-               AC_MSG_RESULT($ol_cv_pthread_create)
 
                if test $ol_cv_pthread_create != no ; then
                        ol_link_threads=posix
@@ -803,6 +894,7 @@ int main(argc, argv)
                OL_PTHREAD_TRY_LINK([-kthread], [ol_cv_pthread_kthread])
                OL_PTHREAD_TRY_LINK([-pthread], [ol_cv_pthread_pthread])
                OL_PTHREAD_TRY_LINK([-pthreads],[ol_cv_pthread_pthreads])
+               OL_PTHREAD_TRY_LINK([-mthreads],[ol_cv_pthread_mthreads])
                OL_PTHREAD_TRY_LINK([-thread],  [ol_cv_pthread_thread])
 
                OL_PTHREAD_TRY_LINK([-lpthread -lmach -lexc -lc_r],
@@ -850,7 +942,8 @@ dnl                 [ol_cv_pthread_lpthread_lexc])
                                dnl Digital UNIX has sched_yield() in -lrt
                                AC_CHECK_LIB(rt, sched_yield,
                                        [LTHREAD_LIBS="$LTHREAD_LIBS -lrt"
-                                       AC_DEFINE(HAVE_SCHED_YIELD,1)
+                                       AC_DEFINE(HAVE_SCHED_YIELD,1,
+                                               [Define if you have the sched_yield function.])
                                        ac_cv_func_sched_yield=yes],
                                        [ac_cv_func_sched_yield=no])
                        fi
@@ -907,8 +1000,8 @@ dnl                        [ol_cv_pthread_lpthread_lexc])
                                AC_MSG_ERROR([LinuxThreads header/library mismatch]);
                        fi
 
-                       AC_MSG_CHECKING([if pthread_create() works])
-                       AC_CACHE_VAL(ol_cv_pthread_create_works,[
+                       AC_CACHE_CHECK([if pthread_create() works],
+                               ol_cv_pthread_create_works,[
                        AC_TRY_RUN([
 #include <pthread.h>
 #ifndef NULL
@@ -937,7 +1030,6 @@ int main(argc, argv)
                                [ol_cv_pthread_create_works=no],
                                [dnl assume yes
                                ol_cv_pthread_create_works=yes])])
-                       AC_MSG_RESULT($ol_cv_pthread_create_works)
 
                        if test $ol_cv_pthread_create_works = no ; then
                                AC_MSG_ERROR([pthread_create is not usable, check environment settings])
@@ -945,8 +1037,8 @@ int main(argc, argv)
 
                        dnl Check if select causes an yield
                        if test $ol_with_yielding_select = auto ; then
-                               AC_MSG_CHECKING([if select yields when using pthreads])
-                               AC_CACHE_VAL(ol_cv_pthread_select_yields,[
+                               AC_CACHE_CHECK([if select yields when using pthreads],
+                                       ol_cv_pthread_select_yields,[
                                AC_TRY_RUN([
 #include <sys/types.h>
 #include <sys/time.h>
@@ -1021,9 +1113,12 @@ int main(argc, argv)
        exit(2);
 }],
                                [ol_cv_pthread_select_yields=no],
-                               [ol_cv_pthread_select_yields=yes], [
-                               AC_MSG_ERROR([crossing compiling: use --with-yielding_select=yes|no|manual])])])
-                               AC_MSG_RESULT($ol_cv_pthread_select_yields)
+                               [ol_cv_pthread_select_yields=yes],
+                               [ol_cv_pthread_select_yields=cross])])
+
+                               if test $ol_cv_pthread_select_yields = cross ; then
+                                       AC_MSG_ERROR([crossing compiling: use --with-yielding_select=yes|no|manual])
+                               fi
 
                                if test $ol_cv_pthread_select_yields = yes ; then
                                        ol_with_yielding_select=yes
@@ -1162,6 +1257,7 @@ if test $ol_link_threads != no ; then
        AC_DEFINE(_THREAD_SAFE,1)
        AC_DEFINE(THREADSAFE,1)
        AC_DEFINE(_THREADSAFE,1)
+       AC_DEFINE(_SGI_MP_SOURCE,1)
 
        dnl The errno declaration may dependent upon _REENTRANT.
        dnl If it does, we must link with thread support.
@@ -1269,9 +1365,11 @@ if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = db2 ; then
                ol_with_ldbm_api=db2
 
                if test $ol_with_ldbm_type = hash ; then
-                       AC_DEFINE(LDBM_USE_DBHASH,1)
+                       AC_DEFINE(LDBM_USE_DBHASH,1,
+                               [define this to use DBHASH w/ LDBM backend])
                else
-                       AC_DEFINE(LDBM_USE_DBBTREE,1)
+                       AC_DEFINE(LDBM_USE_DBBTREE,1,
+                               [define this to use DBBTREE w/ LDBM backend])
                fi
 
                dnl $ol_cv_lib_db2 should be yes or -ldb
@@ -1295,9 +1393,11 @@ if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = db ; then
                ol_with_ldbm_api=db
 
                if test $ol_with_ldbm_type = hash ; then
-                       AC_DEFINE(LDBM_USE_DBHASH,1)
+                       AC_DEFINE(LDBM_USE_DBHASH,1,
+                               [define this to use DBHASH w/ LDBM backend])
                else
-                       AC_DEFINE(LDBM_USE_DBBTREE,1)
+                       AC_DEFINE(LDBM_USE_DBBTREE,1,
+                               [define this to use DBBTREE w/ LDBM backend])
                fi
 
                dnl $ol_cv_lib_db should be yes or -ldb
@@ -1508,7 +1608,7 @@ if test $ol_enable_crypt != no ; then
                        have_crypt=yes], [have_crypt=no])])
 
        if test $have_crypt = yes ; then
-               AC_DEFINE(HAVE_CRYPT,1)
+               AC_DEFINE(HAVE_CRYPT,1, [define if crypt(3) is available])
        else
                AC_MSG_WARN(could not find crypt)
                if test $ol_enable_crypt = yes ; then
@@ -1530,7 +1630,8 @@ if test $ol_enable_proctitle != no ; then
                        LIBOBJS="$LIBOBJS setproctitle.o"])])
 
        if test $have_setproctitle = yes ; then
-               AC_DEFINE(HAVE_SETPROCTITLE,1)
+               AC_DEFINE(HAVE_SETPROCTITLE,1,
+                       [define if setproctitle(3) is available])
        fi
 fi
 
@@ -1563,12 +1664,14 @@ AC_CHECK_HEADERS(       \
        libutil.h               \
        limits.h                \
        locale.h                \
+       netinet/tcp.h   \
        malloc.h                \
        memory.h                \
        psap.h                  \
        pwd.h                   \
        resolv.h                \
        sgtty.h                 \
+       shadow.h                \
        stdarg.h                \
        stddef.h                \
        string.h                \
@@ -1600,10 +1703,12 @@ AM_TYPE_PTRDIFF_T
 AC_TYPE_SIGNAL
 OL_TYPE_SIG_ATOMIC_T
 AC_TYPE_SIZE_T
+OL_TYPE_SOCKLEN_T
 AC_STRUCT_ST_BLKSIZE
 AC_HEADER_TIME
 AC_STRUCT_TM
 OL_STRUCT_PASSWD_PW_GECOS
+OL_STRUCT_PASSWD_PW_PASSWD
 
 OL_C_UPPER_LOWER
 AC_C_CONST
@@ -1611,13 +1716,32 @@ 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)
+
+       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)
+               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
 fi
 
+AC_DEFINE(LBER_LEN_T,long)
+
 dnl ----------------------------------------------------------------
 dnl Checks for library functions.
 AC_FUNC_MEMCMP
@@ -1645,12 +1769,15 @@ AC_CHECK_FUNCS(         \
        gethostname             \
        getpass                 \
        getpwuid                \
+       getpwnam                \
+       getspnam                \
        gettimeofday    \
        initgroups              \
        lockf                   \
        memcpy                  \
        memmove                 \
        mkstemp                 \
+       read                    \
        recv                    \
        recvfrom                \
        setpwfile               \
@@ -1674,6 +1801,9 @@ AC_CHECK_FUNCS(           \
        sysconf                 \
        waitpid                 \
        wait4                   \
+       write                   \
+       send                    \
+       sendto                  \
 )
 
 dnl We actually may need to replace more than this.
@@ -1687,91 +1817,128 @@ dnl ----------------------------------------------------------------
 dnl Sort out defines
 
 if test "$ol_enable_debug" != no ; then
-       AC_DEFINE(LDAP_DEBUG,1)
+       AC_DEFINE(LDAP_DEBUG,1,
+               [define this to add debugging code])
 fi
 if test "$ol_enable_syslog" = yes ; then
-       AC_DEFINE(LDAP_SYSLOG,1)
+       AC_DEFINE(LDAP_SYSLOG,1,
+               [define this to add syslog code])
 fi
 if test "$ol_enable_libui" = yes ; then
-       AC_DEFINE(LDAP_LIBUI,1)
+       AC_DEFINE(LDAP_LIBUI,1,
+               [define this for LDAP User Interface support])
 fi
 if test "$ol_enable_cache" = no ; then
-       AC_DEFINE(LDAP_NOCACHE,1)
+       AC_DEFINE(LDAP_NOCACHE,1,
+               [define this to remove -lldap cache support])
 fi
 if test "$ol_enable_dns" != no ; then
        AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_V2_DNS,LDAP_VENDOR_VERSION)
 fi
 if test "$ol_enable_proctitle" != no ; then
-       AC_DEFINE(LDAP_PROCTITLE,1)
+       AC_DEFINE(LDAP_PROCTITLE,1,
+               [define this for LDAP process title support])
 fi
 if test "$ol_enable_referrals" != no ; then
        AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS,LDAP_VENDOR_VERSION)
 fi
 if test "$ol_enable_cldap" != no ; then
-       AC_DEFINE(LDAP_CONNECTIONLESS,1)
+       AC_DEFINE(LDAP_CONNECTIONLESS,1,[define to support CLDAP])
 fi
 
-if test "$ol_enable_aclgroups" != no ; then
-       AC_DEFINE(SLAPD_ACLGROUPS,1)
-fi
 if test "$ol_enable_crypt" != no ; then
-       AC_DEFINE(SLAPD_CRYPT,1)
+       AC_DEFINE(SLAPD_CRYPT,1,[define to support crypt(3) passwords])
 fi
 if test "$ol_enable_cleartext" != no ; then
-       AC_DEFINE(SLAPD_CLEARTEXT,1)
+       AC_DEFINE(SLAPD_CLEARTEXT,1,[define to support cleartext passwords])
 fi
 if test "$ol_enable_phonetic" != no ; then
-       AC_DEFINE(SLAPD_PHONETIC,1)
+       AC_DEFINE(SLAPD_PHONETIC,1,[define to support phonetic])
 fi
 if test "$ol_enable_rlookups" != no ; then
-       AC_DEFINE(SLAPD_RLOOKUPS,1)
+       AC_DEFINE(SLAPD_RLOOKUPS,1,[define to support reverse lookups])
 fi
 
 if test "$ol_link_modules" != no ; then
-       AC_DEFINE(SLAPD_MODULES,1)
+       AC_DEFINE(SLAPD_MODULES,1,[define to support modules])
        BUILD_SLAPD=yes
 fi
 
 if test "$ol_link_bdb2" != no ; then
-       AC_DEFINE(SLAPD_BDB2,1)
+       AC_DEFINE(SLAPD_BDB2,1,[define to support BDB2 backend])
        BUILD_SLAPD=yes
        BUILD_BDB2=yes
+       if test "$ol_with_bdb2_module" != static ; then
+               AC_DEFINE(SLAPD_BDB2_DYNAMIC,1,
+                       [define to support dynamic BDB2 backend])
+               BUILD_BDB2_DYNAMIC=yes
+       fi
 fi
 
 if test "$ol_enable_ldap" != no ; then
-       AC_DEFINE(SLAPD_LDAP,1)
+       AC_DEFINE(SLAPD_LDAP,1,[define to support LDAP backend])
        BUILD_SLAPD=yes
        BUILD_LDAP=yes
+       if test "$ol_with_ldap_module" != static ; then
+               AC_DEFINE(SLAPD_LDAP_DYNAMIC,1,
+                       [define to support dynamic LDAP backend])
+               BUILD_LDAP_DYNAMIC=yes
+       fi
 fi
 
 if test "$ol_link_ldbm" != no ; then
-       AC_DEFINE(SLAPD_LDBM,1)
+       AC_DEFINE(SLAPD_LDBM,1,[define to support LDBM backend])
        BUILD_SLAPD=yes
        BUILD_LDBM=yes
+       if test "$ol_with_ldbm_module" != static ; then
+               AC_DEFINE(SLAPD_LDBM_DYNAMIC,1,
+                       [define to support dynamic LDBM backend])
+               BUILD_LDBM_DYNAMIC=yes
+       fi
 fi
 
 if test "$ol_enable_passwd" != no ; then
-       AC_DEFINE(SLAPD_PASSWD,1)
+       AC_DEFINE(SLAPD_PASSWD,1,[define to support PASSWD backend])
        BUILD_SLAPD=yes
        BUILD_PASSWD=yes
+       if test "$ol_with_passwd_module" != static ; then
+               AC_DEFINE(SLAPD_PASSWD_DYNAMIC,1,
+                       [define to support dynamic PASSWD backend])
+               BUILD_PASSWD_DYNAMIC=yes
+       fi
 fi
 
 if test "$ol_link_perl" != no ; then
-       AC_DEFINE(SLAPD_PERL,1)
+       AC_DEFINE(SLAPD_PERL,1,[define to support PERL backend])
        BUILD_SLAPD=yes
        BUILD_PERL=yes
+       if test "$ol_with_perl_module" != static ; then
+               AC_DEFINE(SLAPD_PERL_DYNAMIC,1,
+                       [define to support dynamic PERL backend])
+               BUILD_PERL_DYNAMIC=yes
+       fi
 fi
 
 if test "$ol_enable_shell" != no ; then
-       AC_DEFINE(SLAPD_SHELL,1)
+       AC_DEFINE(SLAPD_SHELL,1,[define to support SHELL backend])
        BUILD_SLAPD=yes
        BUILD_SHELL=yes
+       if test "$ol_with_shell_module" != static ; then
+               AC_DEFINE(SLAPD_SHELL_DYNAMIC,1,
+                       [define to support dynamic SHELL backend])
+               BUILD_SHELL_DYNAMIC=yes
+       fi
 fi
 
 if test "$ol_enable_tcl" != no ; then
-       AC_DEFINE(SLAPD_TCL,1)
+       AC_DEFINE(SLAPD_TCL,1,[define to support TCL backend])
        BUILD_SLAPD=yes
        BUILD_TCL=yes
+       if test "$ol_with_tcl_module" != static; then
+               AC_DEFINE(SLAPD_TCL_DYNAMIC,1,
+                       [define to support dynamic TCL backend])
+               BUILD_TCL_DYNAMIC=yes
+       fi
 fi
 
 if test "$ol_enable_slurpd" != no -a "$ol_link_threads" != no -a \
@@ -1794,6 +1961,13 @@ AC_SUBST(BUILD_SLAPD)
   AC_SUBST(BUILD_PERL)
   AC_SUBST(BUILD_SHELL)
   AC_SUBST(BUILD_TCL)
+  AC_SUBST(BUILD_BDB2_DYNAMIC)
+  AC_SUBST(BUILD_LDAP_DYNAMIC)
+  AC_SUBST(BUILD_LDBM_DYNAMIC)
+  AC_SUBST(BUILD_PASSWD_DYNAMIC)
+  AC_SUBST(BUILD_PERL_DYNAMIC)
+  AC_SUBST(BUILD_SHELL_DYNAMIC)
+  AC_SUBST(BUILD_TCL_DYNAMIC)
 AC_SUBST(BUILD_SLURPD)
 
 AC_SUBST(LDAP_LIBS)