X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=configure.in;h=b7ceb8c6664c504d08e1b8a8d8e829af34d7d46e;hb=d4d03e36e5990c8cb51eb759821c3f447af79c9f;hp=3f687c5c807372bf51e4d50e32167f78de7cb65c;hpb=a9ed7c24e2b19c1b9949e976030eba8768a89961;p=openldap diff --git a/configure.in b/configure.in index 3f687c5c80..b7ceb8c666 100644 --- a/configure.in +++ b/configure.in @@ -1,24 +1,74 @@ +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 dnl license is available at http://www.OpenLDAP.org/license.html or dnl in file LICENSE in the top-level directory of the distribution. dnl - +dnl ---------------------------------------------------------------- +dnl Redefine AC_INIT_BINSH to provide RCS IDs and copyright notice +dnl at top of generated configure script. Prints simple copyright. +define([AC_INIT_BINSH], +[[#! /bin/sh +# $]OpenLDAP[$ +# from] translit([$OpenLDAP$], $")] [ + +# 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-2000 The OpenLDAP Foundation, All Rights Reserved." +echo "Restrictions apply, see COPYRIGHT and LICENSE files." +])dnl +dnl ---------------------------------------------------------------- +dnl Disable config.cache! +define([AC_CACHE_LOAD], )dnl +define([AC_CACHE_SAVE], )dnl +dnl ================================================================ dnl Configure.in for OpenLDAP -AC_INIT(include/ldap.h)dnl +AC_INIT(build/version)dnl + +# set unset (borrowed from autoconf 2.14a) +if (unset 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 + AC_CONFIG_AUX_DIR(build)dnl -AM_INIT_AUTOMAKE(OpenLDAP,[2.0-devel], [no ac_define])dnl + +OL_VERSION=`cat $ac_aux_dir/version` +if test -z "$OL_VERSION"; then + AC_MSG_ERROR([could not determine version]) +fi + +echo "Configuring OpenLDAP $OL_VERSION ..." + +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) +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) @@ -26,200 +76,276 @@ AC_PREFIX_DEFAULT(/usr/local) top_builddir=`pwd` AC_SUBST(top_builddir)dnl -ldap_subdir="openldap" - -AC_ARG_WITH(subdir, [ --with-subdir=DIR change default subdirectory used for installs], [ - if test "$withval" = "no"; then - ldap_subdir="" - elif test "$withval" != "yes"; then +dnl ---------------------------------------------------------------- +dnl --with-subdir +ldap_subdir="/openldap" + +AC_ARG_WITH(subdir, +[ --with-subdir=DIR change default subdirectory used for installs], +[case "$withval" in + no) ldap_subdir="" + ;; + yes) + ;; + /*|\\*) ldap_subdir="$withval" - fi + ;; + *) + ldap_subdir="/$withval" + ;; +esac ])dnl AC_SUBST(ldap_subdir)dnl +dnl ---------------------------------------------------------------- +dnl General "enable" options OL_ARG_ENABLE(debug,[ --enable-debug enable debugging], yes)dnl -ol_enable_syslog=no -dnl OL_ARG_ENABLE(syslog,[ --enable-syslog enable syslog support], auto)dnl +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], yes)dnl -OL_ARG_ENABLE(dns,[ --enable-dns enable V2 DNS 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(ipv6,[ --enable-ipv6 enable IPv6 support], auto)dnl +OL_ARG_ENABLE(unix,[ --enable-unix enable UNIX domain socket support], auto)dnl OL_ARG_ENABLE(x_compile,[ --enable-x-compile enable cross compiling], no, [yes no])dnl +dnl ---------------------------------------------------------------- dnl General "with" options -OL_ARG_ENABLE(dmalloc,[ --enable-dmalloc enable debug malloc support], no)dnl +dnl OL_ARG_ENABLE(dmalloc,[ --enable-dmalloc enable debug malloc support], no)dnl -OL_ARG_WITH(kerberos,[ --with-kerberos with Kerberos support], - auto, [auto k5 k4 afs yes no]) -OL_ARG_WITH(readline,[ --with-readline with readline support], +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 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], - auto, [auto posix mach lwp yes no manual] ) -OL_ARG_WITH(tls,[ --with-tls with TLS/SSL support], + auto, [auto nt posix mach pth lwp yes no manual] ) +OL_ARG_WITH(tls,[ --with-tls with TLS/SSL support], auto, [auto ssleay openssl yes no] ) OL_ARG_WITH(yielding_select,[ --with-yielding-select with implicitly yielding select], auto, [auto yes no manual] ) +dnl ---------------------------------------------------------------- dnl Server options +dnl ---------------------------------------------------------------- -dnl LDAPD OPTIONS -AC_ARG_WITH(xxldapdoptions,[LDAPD Options:]) -OL_ARG_ENABLE(ldapd,[ --enable-ldapd enable building ldapd], no)dnl - +dnl ---------------------------------------------------------------- dnl SLAPD OPTIONS -AC_ARG_WITH(xxslapdoptions,[SLAPD Options:]) +AC_ARG_WITH(xxslapdoptions,[SLAPD (Standalone LDAP Daemon) 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(wrappers,[ --enable-wrappers enable tcp wrapper support], no)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 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(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 dnl SLAPD Backend options -OL_ARG_ENABLE(bdb2,[ --enable-bdb2 enable bdb2 backend], no)dnl +OL_ARG_ENABLE(dnssrv,[ --enable-dnssrv enable dnssrv backend], no)dnl +OL_ARG_WITH(dnssrv_module,[ --with-dnssrv-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_api,[ --with-ldbm-api use LDBM API], auto, - [auto db2 db gdbm ndbm manual]) + [auto berkeley bcompat mdbm gdbm]) +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, [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(sql,[ --enable-sql enable sql backend], no)dnl +OL_ARG_WITH(sql_module,[ --with-sql-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 ---------------------------------------------------------------- dnl SLURPD OPTIONS -AC_ARG_WITH(xxslurpdoptions,[SLURPD Options:]) +AC_ARG_WITH(xxslurpdoptions,[SLURPD (Replication Daemon) Options:]) OL_ARG_ENABLE(slurpd,[ --enable-slurpd enable building slurpd], auto)dnl +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 ---------------------------------------------------------------- dnl General "enable" options # validate options -if test $ol_enable_dns = yes ; then - if test $ol_enable_referrals = no ; then - AC_MSG_ERROR([DNS requires --enable-referrals]) - fi - if test $ol_enable_referrals = auto ; then - AC_MSG_WARN([DNS requires referrals, adding --enable-referrals]) - ol_enable_referrals=yes - fi -fi - if test $ol_enable_slapd = no ; then dnl SLAPD was specificallly disabled - if test $ol_enable_bdb2 = yes ; then - AC_MSG_WARN([slapd disabled, ignoring --enable_bdb2 argument]) + if test $ol_enable_dnssrv = yes ; then + AC_MSG_WARN([slapd disabled, ignoring --enable-dnssrv argument]) + fi + if test $ol_enable_ldap = yes ; then + AC_MSG_WARN([slapd disabled, ignoring --enable-ldap argument]) fi if test $ol_enable_ldbm = yes ; then - AC_MSG_WARN([slapd disabled, ignoring --enable_ldbm argument]) + AC_MSG_WARN([slapd disabled, ignoring --enable-ldbm argument]) fi if test $ol_enable_passwd = yes ; then - AC_MSG_WARN([slapd disabled, ignoring --enable_passwd argument]) + AC_MSG_WARN([slapd disabled, ignoring --enable-passwd argument]) fi if test $ol_enable_perl = yes ; then - AC_MSG_WARN([slapd disabled, ignoring --enable_perl argument]) + AC_MSG_WARN([slapd disabled, ignoring --enable-perl argument]) fi if test $ol_enable_shell = yes ; then - AC_MSG_WARN([slapd disabled, ignoring --enable_shell argument]) + AC_MSG_WARN([slapd disabled, ignoring --enable-shell argument]) fi if test $ol_enable_tcl = yes ; then - AC_MSG_WARN([slapd disabled, ignoring --enable_tcl argument]) + 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_aclgroups = yes ; then - AC_MSG_WARN([slapd disabled, ignoring --enable_aclgroups argument]) + if test $ol_enable_modules = yes ; then + AC_MSG_WARN([slapd disabled, ignoring --enable-modules argument]) + 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]) + AC_MSG_WARN([slapd disabled, ignoring --enable-wrappers argument]) fi if test $ol_enable_phonetic = yes ; then - AC_MSG_WARN([slapd disabled, ignoring --enable_phonetic argument]) + AC_MSG_WARN([slapd disabled, ignoring --enable-phonetic argument]) fi if test $ol_enable_rlookups = yes ; then - AC_MSG_WARN([slapd disabled, ignoring --enable_rlookups argument]) + AC_MSG_WARN([slapd disabled, ignoring --enable-rlookups argument]) + fi + if test $ol_enable_aci = yes ; then + AC_MSG_WARN([slapd disabled, ignoring --enable-aci argument]) fi if test $ol_with_ldbm_api != auto ; then - AC_MSG_WARN([slapd disabled, ignoring --with_ldbm_api argument]) + AC_MSG_WARN([slapd disabled, ignoring --with-ldbm-api argument]) fi if test $ol_with_ldbm_type != auto ; then - AC_MSG_WARN([slapd disabled, ignoring --with_ldbm_type argument]) + AC_MSG_WARN([slapd disabled, ignoring --with-ldbm-type argument]) + fi + if test $ol_with_dnssrv_module != static ; then + AC_MSG_WARN([slapd disabled, ignoring --with-dnssrv-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_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 # force settings to no - ol_enable_bdb2=no + ol_enable_dnssrv=no + ol_enable_ldap=no ol_enable_ldbm=no ol_enable_passwd=no ol_enable_perl=no ol_enable_shell=no ol_enable_tcl=no - ol_enable_aclgroups=no - ol_enable_wrappers=no + ol_enable_sql=no + + ol_enable_modules=no + ol_enable_multimaster=no ol_enable_phonetic=no ol_enable_rlookups=no + ol_enable_aci=no + ol_enable_wrappers=no + ol_enable_dynamic=no + ol_with_ldbm_api=no ol_with_ldbm_type=no + + ol_with_dnssrv_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_with_sql_module=static + ol_enable_slurpd=no elif test $ol_enable_ldbm = no ; then dnl SLAPD without LDBM if test $ol_with_ldbm_api != auto ; then - AC_MSG_WARN([LDBM disabled, ignoring --with_ldbm_api argument]) + AC_MSG_WARN([LDBM disabled, ignoring --with-ldbm-api argument]) fi if test $ol_with_ldbm_type != auto ; then - AC_MSG_WARN([LDBM disabled, ignoring --with_ldbm_type argument]) + AC_MSG_WARN([LDBM disabled, ignoring --with-ldbm-type argument]) fi - if test $ol_enable_bdb2 = yes ; then - AC_MSG_ERROR([BDB2 requires --enable-ldbm]) + if test $ol_with_ldbm_module != static ; then + AC_MSG_WARN([LDBM disabled, ignoring --with-ldbm-module argument]) fi - if test $ol_enable_passwd = no -a \ + if test $ol_enable_modules != yes -a \ + $ol_enable_dnssrv = no -a \ + $ol_enable_ldap = no -a \ + $ol_enable_passwd = no -a \ $ol_enable_perl = no -a \ $ol_enable_shell = no -a \ + $ol_enable_sql = no -a \ $ol_enable_tcl = no ; then AC_MSG_ERROR([slapd requires a backend]) fi ol_with_ldbm_api=no ol_with_ldbm_type=no - -elif test $ol_enable_bdb2 = yes ; then - dnl SLAPD with BDB2 - - if test $ol_with_ldbm_api != auto -a \ - $ol_with_ldbm_api != db2 ; then - AC_MSG_ERROR([BDB2 requires LDBM API DB2]) - fi - - ol_with_ldbm_api=db2 + ol_with_ldbm_module=static else dnl SLAPD with LDBM - - if test $ol_enable_bdb2 != no ; then - if test $ol_with_ldbm_api != auto -a \ - $ol_with_ldbm_api != db2 ; then - AC_MSG_WARN([BDB2 requires LDBM api db2 or auto]) - ol_enable_bdb2=no - fi - fi - if test $ol_with_ldbm_api = gdbm -a \ $ol_with_ldbm_type = btree ; then AC_MSG_ERROR([GDBM only supports LDBM type hash]) fi + if test $ol_with_ldbm_api = mdbm -a \ + $ol_with_ldbm_type = btree ; then + AC_MSG_ERROR([MDBM only supports LDBM type hash]) + fi if test $ol_with_ldbm_api = ndbm -a \ $ol_with_ldbm_type = btree ; then AC_MSG_ERROR([NDBM only supports LDBM type hash]) @@ -233,52 +359,147 @@ if test $ol_enable_slurpd = yes ; then fi fi -AC_MSG_RESULT(done) +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_CANONICAL_HOST +if test $ol_enable_spasswd = yes ; then + if test $ol_with_cyrus_sasl = no ; then + AC_MSG_ERROR([options require --with-cyrus-sasl]) + fi + ol_link_spasswd=yes +fi -## Initialize vars +AC_MSG_RESULT(done) + +dnl ---------------------------------------------------------------- +dnl Initialize vars LDAP_LIBS= +LDIF_LIBS= LDBM_LIBS= LTHREAD_LIBS= LUTIL_LIBS= -LDAPD_LIBS= SLAPD_LIBS= SLURPD_LIBS= -BUILD_LDAPD=no BUILD_SLAPD=no BUILD_SLURPD=no -BUILD_BDB2=no +BUILD_THREAD=no + +BUILD_DNSSRV=no +BUILD_LDAP=no BUILD_LDBM=no BUILD_PASSWD=no BUILD_PERL=no BUILD_SHELL=no +BUILD_SQL=no BUILD_TCL=no -BUILD_THREAD=no + +BUILD_DNSSRV_DYNAMIC=static +BUILD_LDAP_DYNAMIC=static +BUILD_LDBM_DYNAMIC=static +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= +SLAPD_MODULES_LIST= SLAPD_PERL_LDFLAGS= -SLAPD_PERL_CPPFLAGS= +MOD_PERL_LDFLAGS= +PERL_CPPFLAGS= -KRB_LIBS= +SLAPD_SQL_LDFLAGS= +SLAPD_SQL_LIBS= +SLAPD_SQL_INCLUDES= + +MOD_TCL_LIB= +KRB4_LIBS= +KRB5_LIBS= READLINE_LIBS= +SASL_LIBS= TERMCAP_LIBS= TLS_LIBS= +MODULES_LIBS= +AUTH_LIBS= -dnl ---------------------------------------------------------------- +dnl ================================================================ dnl Checks for programs -AC_PROG_INSTALL +dnl AC_PROG_INSTALL + +AC_DEFINE(HAVE_MKVERSION, 1, [define this if you have mkversion]) + +dnl ---------------------------------------------------------------- +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 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 + +ol_aix_threads=no +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 + +if test $ol_aix_threads = yes ; then + if test -z "${CC}" ; then + AC_CHECK_PROGS(CC,cc_r xlc_r cc) + + 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 + +if test -z "${CC}"; then + AC_CHECK_PROGS(CC,cc) +fi -dnl The default compiler is cc (NOT gcc) -CC=${CC-"cc"} dnl The default CFLAGS is empty NOT whatever AC_PROG_CC sets. +dnl (for now, let autoconf sort this out) dnl CFLAGS=${CFLAGS-""} -AM_PROG_LIBTOOL -dnl AC_PROG_MAKE_SET +AC_LIBTOOL_WIN32_DLL +AC_LIBTOOL_DLOPEN +AC_PROG_LIBTOOL AC_PROG_AWK OL_PROG_LN_H @@ -293,19 +514,33 @@ 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) -if test $ol_enable_perl = yes ; then +dnl ---------------------------------------------------------------- +dnl Perl +ol_link_perl=no +if test $ol_enable_perl != no ; then AC_PATH_PROG(PERLBIN, perl, /usr/bin/perl) if test "no$PERLBIN" = "no" ; then - ol_enable_perl=no - fi + if test $ol_enable_perl = yes ; then + AC_MSG_ERROR([could not locate perl]) + fi - SLAPD_PERL_LDFLAGS="`$PERLBIN -MExtUtils::Embed -e ldopts|sed -e s/-lc//`" - SLAPD_PERL_CPPFLAGS="`$PERLBIN -MExtUtils::Embed -e perl_inc`" + else + PERL_CPPFLAGS="`$PERLBIN -MExtUtils::Embed -e ccopts`" + 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//`" + fi + dnl should check perl version + ol_link_perl=yes + fi fi AC_PROG_CPP +dnl ---------------------------------------------------------------- +dnl Cross compiling checks if test $cross_compiling = yes -a $ol_enable_x_compile = yes; then AC_MSG_WARN([cross compiling.... some functionality will be removed.]) @@ -318,39 +553,195 @@ elif test $cross_compiling = yes -a $ol_enable_x_compile = no; then AC_MSG_ERROR([ if cross compiling, add --enable-x-compile.]) fi +dnl ---------------------------------------------------------------- dnl Checks for UNIX Variants AC_AIX AC_ISC_POSIX AC_MINIX -dnl BeOS requires -lbe -lroot -AC_CHECK_LIB(be, be_app, [LIBS="$LIBS -lbe -lroot"], :, [-lroot]) - +dnl ---------------------------------------------------------------- dnl Checks for system services AC_CYGWIN AC_MINGW32 AC_EXEEXT AC_OBJEXT +AC_DEFINE_UNQUOTED( EXEEXT, "${EXEEXT}", [defined to be the EXE extension]) + +dnl ---------------------------------------------------------------- +dnl BeOS requires -lbe -lroot -lnet +AC_CHECK_LIB(be, be_app, [LIBS="$LIBS -lbe -lroot -lnet"], :, [-lroot -lnet]) + +dnl ---------------------------------------------------------------- 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 ---------------------------------------------------------------- +dnl Check cc depend flags +OL_MKDEPEND +if test "${ol_cv_mkdep}" = no ; then + # this will soon become an error + AC_MSG_WARN([do not know how to generate dependencies]) +fi + +dnl ---------------------------------------------------------------- +dnl Check for AIX security library +AC_CHECK_LIB(s, afopen, [ + AUTH_LIBS=-ls + AC_DEFINE(HAVE_AIX_SECURITY,1,[define if you have AIX security lib]) +]) + + +dnl ---------------------------------------------------------------- +dnl PF_INET6 support requires getaddrinfo +dnl PF_UNIX may use getaddrinfo in available +AC_CHECK_FUNCS( getaddrinfo ) + +if test $ac_cv_func_getaddrinfo = no ; then + if test $ol_enable_ipv6 = yes ; then + AC_MSG_ERROR([IPv6 support requires getaddrinfo()]) + fi + ol_enable_ipv6=no +fi + +if test $ol_enable_unix != no ; then + AC_CHECK_HEADERS( sys/un.h ) + + if test $ol_enable_unix = auto ; then + ol_enable_unix=$ac_cv_header_sys_un_h + elif test $ac_cv_header_sys_un_h = no ; then + AC_MSG_ERROR([UNIX domain support requires sys/un.h]) + fi +fi + +dnl ---------------------------------------------------------------- +dnl Check for module support +ol_link_modules=no +if test $ol_enable_modules != no ; then + AC_CHECK_HEADERS(ltdl.h) + + if test $ac_cv_header_ltdl_h = no ; then + AC_MSG_ERROR([could not locate libtool ltdl.h]) + fi + + AC_CHECK_LIB(ltdl, lt_dlinit, [ + MODULES_LIBS=-lltdl + AC_DEFINE(HAVE_LIBLTDL,1,[define if you have libtool -ltdl]) + ]) + + if test "$ac_cv_lib_ltdl_lt_dlinit" = no ; then + AC_MSG_ERROR([could not locate libtool -lltdl]) + fi + ol_link_modules=yes +else + ol_with_dnssrv_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_with_sql_module=static +fi + +dnl ---------------------------------------------------------------- +dnl Checks for header files. +OL_HEADER_STDC + +if test $ol_cv_header_stdc != yes; then + AC_MSG_WARN([could not locate Standard C compliant headers]) +fi + +AC_HEADER_DIRENT +AC_HEADER_SYS_WAIT +AM_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL +if test $am_cv_sys_posix_termios = yes ; then + AC_DEFINE(HAVE_POSIX_TERMIOS,1, + [define if you have POSIX termios]) +fi + +AC_CHECK_HEADERS( \ + arpa/inet.h \ + arpa/nameser.h \ + assert.h \ + conio.h \ + crypt.h \ + direct.h \ + errno.h \ + fcntl.h \ + filio.h \ + getopt.h \ + grp.h \ + io.h \ + libutil.h \ + limits.h \ + locale.h \ + netinet/tcp.h \ + malloc.h \ + memory.h \ + psap.h \ + pwd.h \ + process.h \ + resolv.h \ + sgtty.h \ + shadow.h \ + stddef.h \ + string.h \ + strings.h \ + sysexits.h \ + sys/file.h \ + sys/filio.h \ + sys/errno.h \ + sys/ioctl.h \ + sys/param.h \ + sys/resource.h \ + sys/select.h \ + sys/socket.h \ + sys/syslog.h \ + sys/time.h \ + sys/types.h \ + syslog.h \ + termios.h \ + unistd.h \ + winsock.h \ +) + +dnl ---------------------------------------------------------------- dnl Checks for libraries +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_CACHE_CHECK([for winsock], [ol_cv_winsock], + AC_TRY_LINK([#include ],[ + 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() dnl Likely combinations: dnl -lsocket [ -lnsl_s | -lnsl ] dnl -linet -AC_CHECK_FUNC(socket, [have_socket=yes], [ -dnl +AC_CHECK_FUNC(socket, :, [ dnl hopefully we won't include too many libraries -dnl AC_CHECK_LIB(socket, main) AC_CHECK_LIB(net, main) AC_CHECK_LIB(nsl_s, main) @@ -359,78 +750,162 @@ dnl AC_CHECK_LIB(gen, main) ]) +dnl require select +AC_CHECK_FUNC(select, :, AC_MSG_ERROR([select() required.])) + +if test "${ac_cv_header_winsock_h}" != yes; then + dnl Select arg types + dnl (if this detection becomes permenent, it and the select() detection + dnl should be done before the yielding select test) + AC_FUNC_SELECT_ARGTYPES +fi + +dnl check to see if system call automatically restart +dnl AC_SYS_RESTARTABLE_SYSCALLS + +dnl ---------------------------------------------------------------- +dnl require POSIX regex +AC_CHECK_HEADERS( regex.h ) +if test "$ac_cv_header_regex_h" != yes ; then + AC_MSG_ERROR([POSIX regex.h required.]) +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 + +dnl ---------------------------------------------------------------- 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 - AC_CHECK_LIB(resolv, res_search) - if test "$ac_cv_lib_resolv_res_search" = "yes" ; then - AC_DEFINE(HAVE_RES_SEARCH,1) - fi +ol_link_dnssrv=no +AC_CHECK_FUNC(res_query,:) +if test $ac_cv_func_res_query = no ; then + AC_CHECK_LIB(bind, res_query) + ac_cv_func_res_query=$ac_cv_lib_bind_res_query +fi + +if test $ac_cv_func_res_query = no ; then + AC_CHECK_LIB(bind, __res_query) + ac_cv_func_res_query=$ac_cv_lib_bind___res_query +fi + +if test $ac_cv_func_res_query = no ; then + AC_CHECK_LIB(resolv, res_query) + ac_cv_func_res_query=$ac_cv_lib_resolv_res_query +fi + +if test "$ac_cv_func_res_query" = yes ; then + AC_DEFINE(HAVE_RES_QUERY,1, + [define if you have res_query()]) + + if test $ol_enable_dnssrv != no ; then + ol_link_dnssrv=yes fi fi -dnl HP-UX requires -lV3 -AC_CHECK_LIB(V3, sigset) +if test "$ol_enable_dnssrv" = yes -a "$ol_link_dnssrv" = no ; then + AC_MSG_ERROR([DNSSRV requires res_query()]) +fi + +dnl ---------------------------------------------------------------- +dnl Kerberos +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 -# ISODE tests -ol_link_isode=no -if test $ol_enable_ldapd != no ; then - dnl look for ISODE libraries - AC_CHECK_LIB(xtpp, main, [ - ol_link_isode=yes - AC_DEFINE(HAVE_XTPP,1, [define if you have -lxttp]) - LDAPD_LIBS="$LDAPD_LIBS -lxtpp -lxtdsap -lxtisode -losi" - ],:,[-lxtdsap -lxtisode -losi]) - AC_CHECK_LIB(dsap, main, [ - ol_link_isode=yes - AC_DEFINE(HAVE_DSAP,1, [define if you have -ldsap]) - LDAPD_LIBS="$LDAPD_LIBS -ldsap" - ],:,[-lisode]) - AC_CHECK_LIB(isode, main, [ - ol_link_isode=yes - AC_DEFINE(HAVE_ISODE,1, [define if you have -lisode]) - LDAPD_LIBS="$LDAPD_LIBS -lisode" - ],:) -fi - -if test $ol_link_isode != no; then - AC_CHECK_LIB(pp, main, [ - AC_DEFINE(HAVE_PP,1, [define if you have -lpp]) - LDAPD_LIBS="-lpp $LDAPD_LIBS" - ],:) - - AC_PATH_PROG(PEPSY, pepsy) + elif test $ol_with_kerberos != auto ; then + AC_MSG_ERROR([Required Kerberos 5 support not available]) + fi + + fi fi -dnl -dnl check for kerberos -dnl -ol_link_kerberos=no +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]) - KRB_LIBS="-lkrb4 -lkrb5 -ldes425" + else + have_425=no + AC_MSG_WARN([Unrecongized Kerberos5 Implementation]) + fi + + 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 #include @@ -452,40 +927,67 @@ des_debug = 1; fi fi -if test $ol_with_kerberos = auto -o $ol_with_kerberos = k4 ; then - AC_CHECK_HEADERS(krb.h des.h) +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 + + AC_CHECK_HEADERS(krb.h des.h krb-archaeology.h ) if test $ac_cv_header_krb_h = yes ; then AC_CHECK_LIB(krb, main, [have_k4=yes], [have_k4=no], [-ldes]) if test $have_k4 = yes ; then ol_with_kerberos=found - ol_link_kerberos=yes + ol_link_krb4=yes + + AC_DEFINE(HAVE_KRB4, 1, + [define if you have Kerberos IV]) - KRB_LIBS="-lkrb -ldes" + KRB4_LIBS="-lkrb -ldes" + + if test $ac_cv_header_krb_archaeology_h = yes ; then + AC_DEFINE(HAVE_KTH_KERBEROS, 1, + [define if you have Kth Kerberos]) + fi fi 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_MSG_ERROR([Kerberos detection failed.]) fi -dnl -dnl Check for SSL/TLS -dnl +dnl ---------------------------------------------------------------- +dnl TLS/SSL 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 @@ -516,6 +1018,7 @@ if test $ol_link_tls = yes ; then AC_DEFINE(HAVE_TLS, 1, [define if you have TLS]) fi +dnl ---------------------------------------------------------------- dnl Tests for reentrant functions necessary to build a dnl thread_safe -lldap. AC_CHECK_FUNCS( \ @@ -556,11 +1059,33 @@ if test "$ac_cv_func_ctime_r" = yes \ AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_REENTRANT,1) fi +dnl ---------------------------------------------------------------- +dnl Threads? ol_link_threads=no + +if test $ol_with_threads = auto -o $ol_with_threads = yes \ + -o $ol_with_threads = nt ; 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_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 + if test $ol_with_threads = auto -o $ol_with_threads = yes \ -o $ol_with_threads = posix ; then - AC_CHECK_HEADERS(pthread.h sched.h) + AC_CHECK_HEADERS(pthread.h) if test $ac_cv_header_pthread_h = yes ; then OL_POSIX_THREAD_VERSION @@ -575,340 +1100,101 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \ AC_MSG_ERROR([unknown pthread version]) fi - # consider threads found - ol_with_threads=found - - OL_LINUX_THREADS - - if test $ol_cv_linux_threads = yes ; then - AC_DEFINE(HAVE_LINUX_THREADS,1, - [define if you have LinuxThreads]) - fi - - dnl Now the hard part, how to link? - dnl - dnl currently supported checks: - dnl - dnl Check for no flags - dnl pthread_create() in $LIBS - dnl - dnl Check special pthread (final) flags - dnl pthread_create() with -mt (Solaris) - dnl pthread_create() with -kthread (FreeBSD) - dnl pthread_create() with -pthread (FreeBSD/Digital Unix) - dnl pthread_create() with -pthreads (?) - dnl pthread_create() with -thread (?) - dnl - dnl Check pthread (final) libraries - dnl pthread_mutex_unlock() in -lpthread -lmach -lexc -lc_r (OSF/1) - dnl pthread_mutex_lock() in -lpthread -lmach -lexc (OSF/1) - dnl pthread_mutex_trylock() in -lpthread -lexc (OSF/1) - dnl pthread_create() in -lpthread (many) - dnl pthread_create() in -lc_r (FreeBSD) - dnl pthread_create() in -lpthreads (many) - dnl pthread_join() -Wl,-woff,85 -lpthreads (IRIX) - dnl - dnl Check pthread (draft4) flags (depreciated) - dnl pthread_create() with -threads (OSF/1) - dnl - dnl Check pthread (final) libraries (depreciated) - dnl pthread_mutex_unlock() in -lpthreads -lmach -lexc -lc_r (OSF/1) - dnl pthread_mutex_lock() in -lpthreads -lmach -lexc (OSF/1) - dnl pthread_mutex_trylock() in -lpthreads -lexc (OSF/1) - dnl - - dnl pthread_create in $LIBS - AC_MSG_CHECKING([for pthread_create in default libraries]) - AC_CACHE_VAL(ol_cv_pthread_create,[ - AC_TRY_RUN([ -#include -#ifndef NULL -#define NULL (void*)0 -#endif - -static void *task(p) - void *p; -{ - return (void *) (p == NULL); -} - -int main(argc, argv) - int argc; - char **argv; -{ - pthread_t t; -#if HAVE_PTHREADS_D4 - exit(pthread_create(&t, pthread_attr_default, task, NULL)); -#else - exit(pthread_create(&t, NULL, task, NULL)); -#endif -} -], - [ol_cv_pthread_create=yes], - [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 - fi - - if test $ol_link_threads = no ; then - dnl try -mt - AC_CACHE_CHECK([for pthread_create with -mt], - [ol_cv_thread_flag], [ - dnl save the flags - save_LIBS="$LIBS" - LIBS="-mt $LIBS" - AC_TRY_LINK([char pthread_create();], - [pthread_create();], - [ol_cv_thread_flag=yes], [ol_cv_thread_flag=no]) - dnl restore the LIBS - LIBS="$save_LIBS" - ]) - - if test $ol_cv_thread_flag = yes ; then - LTHREAD_LIBS="$LTHREAD_LIBS -mt" - ol_link_threads=posix - fi - fi - - if test $ol_link_threads = no ; then - dnl try -kthread - AC_CACHE_CHECK([for pthread_create with -kthread], - [ol_cv_kthread_flag], [ - dnl save the flags - save_LIBS="$LIBS" - LIBS="-kthread $LIBS" - AC_TRY_LINK([#include ],[ -#if HAVE_PTHREADS_D4 - pthread_create(NULL,pthread_attr_default,NULL,NULL); -#else - pthread_create(NULL,NULL,NULL,NULL); -#endif -], - [ol_cv_kthread_flag=yes], [ol_cv_kthread_flag=no]) - dnl restore the LIBS - LIBS="$save_LIBS" - ]) - - if test $ol_cv_kthread_flag = yes ; then - LTHREAD_LIBS="$LTHREAD_LIBS -kthread" - ol_link_threads=posix - fi - fi - - if test $ol_link_threads = no ; then - dnl try -pthread - AC_CACHE_CHECK([for pthread_create with -pthread], - [ol_cv_pthread_flag], [ - dnl save the flags - save_LIBS="$LIBS" - LIBS="-pthread $LIBS" - AC_TRY_LINK([#include ],[ -#if HAVE_PTHREADS_D4 - pthread_create(NULL,pthread_attr_default,NULL,NULL); -#else - pthread_create(NULL,NULL,NULL,NULL); -#endif -], - [ol_cv_pthread_flag=yes], [ol_cv_pthread_flag=no]) - dnl restore the LIBS - LIBS="$save_LIBS" - ]) - - if test $ol_cv_pthread_flag = yes ; then - LTHREAD_LIBS="$LTHREAD_LIBS -pthread" - ol_link_threads=posix - fi - fi - - if test $ol_link_threads = no ; then - dnl try -pthreads - AC_CACHE_CHECK([for pthread_create with -pthreads], - [ol_cv_pthreads_flag], [ - dnl save the flags - save_LIBS="$LIBS" - LIBS="-pthreads $LIBS" - AC_TRY_LINK([#include ],[ -#if HAVE_PTHREADS_D4 - pthread_create(NULL,pthread_attr_default,NULL,NULL); -#else - pthread_create(NULL,NULL,NULL,NULL); -#endif -], - [ol_cv_pthreads_flag=yes], [ol_cv_pthreads_flag=no]) - dnl restore the LIBS - LIBS="$save_LIBS" - ]) - - if test $ol_cv_pthreads_flag = yes ; then - LTHREAD_LIBS="$LTHREAD_LIBS -pthreads" - ol_link_threads=posix - fi - fi - - if test $ol_link_threads = no ; then - dnl try -thread - AC_CACHE_CHECK([for pthread_create with -thread], - [ol_cv_thread_flag], [ - dnl save the flags - save_LIBS="$LIBS" - LIBS="-thread $LIBS" - AC_TRY_LINK([char pthread_create();], - [pthread_create();], - [ol_cv_thread_flag=yes], [ol_cv_thread_flag=no]) - dnl restore the LIBS - LIBS="$save_LIBS" - ]) - - if test $ol_cv_thread_flag = yes ; then - LTHREAD_LIBS="$LTHREAD_LIBS -thread" - ol_link_threads=posix - fi - fi - - if test $ol_link_threads = no ; then - dnl try DEC Threads -lpthread -lmach -lexc -lc_r - save_LIBS="$LIBS" - AC_CHECK_LIB(pthread, pthread_mutex_unlock, [ - ol_link_threads=posix - LTHREAD_LIBS="$LTHREAD_LIBS -lpthread -lmach -lexc -lc_r" - if test $ol_with_yielding_select = auto ; then - ol_with_yielding_select=yes - fi - ],:,[-lmach -lexc -lc_r]) - LIBS="$save_LIBS" - fi - - if test $ol_link_threads = no ; then - dnl try DEC Threads -lpthread -lmach -lexc - save_LIBS="$LIBS" - AC_CHECK_LIB(pthread, pthread_mutex_lock, [ - ol_link_threads=posix - LTHREAD_LIBS="$LTHREAD_LIBS -lpthread -lmach -lexc" - if test $ol_with_yielding_select = auto ; then - ol_with_yielding_select=yes - fi - ],:,[-lmach -lexc]) - LIBS="$save_LIBS" - fi - - if test $ol_link_threads = no ; then - dnl try DEC Threads -lpthread -lexc - save_LIBS="$LIBS" - AC_CHECK_LIB(pthread, pthread_mutex_trylock, [ - ol_link_threads=posix - LTHREAD_LIBS="$LTHREAD_LIBS -lpthread -lexc" - if test $ol_with_yielding_select = auto ; then - ol_with_yielding_select=yes - fi - ],:,[-lexc]) - LIBS="$save_LIBS" - fi - - if test $ol_link_threads = no ; then - dnl try -lpthread - save_LIBS="$LIBS" - AC_CHECK_LIB(pthread, pthread_create, [ - ol_link_threads=posix - LTHREAD_LIBS="$LTHREAD_LIBS -lpthread"],:) - LIBS="$save_LIBS" - fi - - if test $ol_link_threads = no ; then - dnl try -lc_r - save_LIBS="$LIBS" - AC_CHECK_LIB(c_r, pthread_create, [ - ol_link_threads=posix - LTHREAD_LIBS="$LTHREAD_LIBS -lc_r"],:) - LIBS="$save_LIBS" - fi - - if test $ol_link_threads = no ; then - dnl try -lpthreads - save_LIBS="$LIBS" - AC_CHECK_LIB(pthreads, pthread_create, [ - ol_link_threads=posix - LTHREAD_LIBS="$LTHREAD_LIBS -lpthreads"],:) - LIBS="$save_LIBS" - fi - - dnl IRIX Pthread check - if test $ol_link_threads = no ; then - dnl try IRIX Pthreads -Wl,-woff,85 -lpthreads - save_LIBS="$LIBS" - AC_CHECK_LIB(pthreads, pthread_join, [ - ol_link_threads=posix - LTHREAD_LIBS="$LTHREAD_LIBS -lpthreads" - ],:,[-Wl,-woff,85]) - LIBS="$save_LIBS" - fi - - if test $ol_link_threads = no ; then - dnl try -threads - AC_CACHE_CHECK([for pthread_create with -threads], - [ol_cv_thread_flag], [ - dnl save the flags - save_LIBS="$LIBS" - LIBS="-threads $LIBS" - AC_TRY_LINK([char pthread_create();],[ - pthread_create(); - ], ol_cv_thread_flag=yes, ol_cv_thread_flag=no) - dnl restore the LIBS - LIBS="$save_LIBS" - ]) - - if test $ol_cv_thread_flag = yes ; then - LTHREAD_LIBS="$LTHREAD_LIBS -threads" - ol_link_threads=posix - fi - fi - - if test $ol_link_threads = no ; then - dnl try DEC Threads -lpthreads -lmach -lexc -lc_r - save_LIBS="$LIBS" - AC_CHECK_LIB(pthreads, pthread_mutex_unlock, [ - ol_link_threads=posix - LTHREAD_LIBS="$LTHREAD_LIBS -lpthreads -lmach -lexc -lc_r" - if test $ol_with_yielding_select = auto ; then - ol_with_yielding_select=yes - fi - ],:,[-lmach -lexc -lc_r]) - LIBS="$save_LIBS" - fi - - if test $ol_link_threads = no ; then - dnl try DEC Threads -lpthreads -lmach -lexc - save_LIBS="$LIBS" - AC_CHECK_LIB(pthreads, pthread_mutex_lock, [ - ol_link_threads=posix - LTHREAD_LIBS="$LTHREAD_LIBS -lpthreads -lmach -lexc" - if test $ol_with_yielding_select = auto ; then - ol_with_yielding_select=yes - fi - ],:,[-lmach -lexc]) - LIBS="$save_LIBS" + # consider threads found + ol_with_threads=found + + OL_HEADER_LINUX_THREADS + OL_HEADER_GNU_PTH_PTHREAD_H + + if test $ol_cv_header_gnu_pth_pthread_h = no ; then + AC_CHECK_HEADERS(sched.h) fi - if test $ol_link_threads = no ; then - dnl try DEC Threads -lpthreads -lexc - save_LIBS="$LIBS" - AC_CHECK_LIB(pthreads, pthread_mutex_trylock, [ - ol_link_threads=posix - LTHREAD_LIBS="$LTHREAD_LIBS -lpthreads -lexc" - if test $ol_with_yielding_select = auto ; then - ol_with_yielding_select=yes - fi - ],:,[-lexc]) - LIBS="$save_LIBS" + dnl Now the hard part, how to link? + dnl + dnl currently supported checks: + dnl + dnl Check for no flags + dnl pthread_create() in $LIBS + dnl + dnl Check special pthread (final) flags + dnl [skipped] pthread_create() with -mt (Solaris) [disabled] + 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 + dnl pthread_mutex_unlock() in -lpthread -lmach -lexc -lc_r (OSF/1) + dnl pthread_mutex_lock() in -lpthread -lmach -lexc (OSF/1) + dnl [skipped] pthread_mutex_trylock() in -lpthread -lexc (OSF/1) + dnl pthread_join() -Wl,-woff,85 -lpthread (IRIX) + dnl pthread_create() in -lpthread (many) + dnl pthread_create() in -lc_r (FreeBSD) + dnl + dnl Check pthread (draft4) flags (depreciated) + dnl pthread_create() with -threads (OSF/1) + dnl + dnl Check pthread (draft4) libraries (depreciated) + dnl pthread_mutex_unlock() in -lpthreads -lmach -lexc -lc_r (OSF/1) + dnl pthread_mutex_lock() in -lpthreads -lmach -lexc (OSF/1) + dnl pthread_mutex_trylock() in -lpthreads -lexc (OSF/1) + dnl pthread_create() in -lpthreads (many) + dnl + + dnl pthread_create in $LIBS + AC_CACHE_CHECK([for pthread_create in default libraries], + ol_cv_pthread_create,[ + AC_TRY_RUN(OL_PTHREAD_TEST_PROGRAM, + [ol_cv_pthread_create=yes], + [ol_cv_pthread_create=no], + [AC_TRY_LINK(OL_PTHREAD_TEST_INCLUDES,OL_PTHREAD_TEST_FUNCTION, + [ol_cv_pthread_create=yes], + [ol_cv_pthread_create=no])])]) + + if test $ol_cv_pthread_create != no ; then + ol_link_threads=posix + ol_link_pthreads="" fi + +dnl OL_PTHREAD_TRY([-mt], [ol_cv_pthread_mt]) + OL_PTHREAD_TRY([-kthread], [ol_cv_pthread_kthread]) + OL_PTHREAD_TRY([-pthread], [ol_cv_pthread_pthread]) + OL_PTHREAD_TRY([-pthreads], [ol_cv_pthread_pthreads]) + OL_PTHREAD_TRY([-mthreads], [ol_cv_pthread_mthreads]) + OL_PTHREAD_TRY([-thread], [ol_cv_pthread_thread]) + + OL_PTHREAD_TRY([-lpthread -lmach -lexc -lc_r], + [ol_cv_pthread_lpthread_lmach_lexc_lc_r]) + OL_PTHREAD_TRY([-lpthread -lmach -lexc], + [ol_cv_pthread_lpthread_lmach_lexc]) +dnl OL_PTHREAD_TRY([-lpthread -lexc], +dnl [ol_cv_pthread_lpthread_lexc]) + + OL_PTHREAD_TRY([-lpthread -Wl,-woff,85], + [ol_cv_pthread_lib_lpthread_woff]) + + OL_PTHREAD_TRY([-lpthread], [ol_cv_pthread_lpthread]) + OL_PTHREAD_TRY([-lc_r], [ol_cv_pthread_lc_r]) + + OL_PTHREAD_TRY([-threads], [ol_cv_pthread_threads]) + + OL_PTHREAD_TRY([-lpthreads -lmach -lexc -lc_r], + [ol_cv_pthread_lpthreads_lmach_lexc_lc_r]) + OL_PTHREAD_TRY([-lpthreads -lmach -lexc], + [ol_cv_pthread_lpthreads_lmach_lexc]) + OL_PTHREAD_TRY([-lpthreads -lexc], + [ol_cv_pthread_lpthreads_lexc]) + + OL_PTHREAD_TRY([-lpthreads],[ol_cv_pthread_lib_lpthreads]) if test $ol_link_threads != no ; then AC_DEFINE(HAVE_PTHREADS,1, [define if you have POSIX Threads]) + LTHREAD_LIBS="$LTHREAD_LIBS $ol_link_pthreads" + dnl save flags save_CPPFLAGS="$CPPFLAGS" save_LIBS="$LIBS" @@ -924,13 +1210,14 @@ int main(argc, argv) 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 if test $ac_cv_func_sched_yield = no -a \ $ac_cv_func_pthread_yield = no ; then - dnl Solaris has sched_yield() in -lposix4 + dnl Solaris has sched_yield() stub in -lposix4 dnl but we'll use thr_yield instead. AC_CHECK_FUNCS(thr_yield) fi @@ -941,7 +1228,7 @@ int main(argc, argv) fi dnl Check functions for compatibility - AC_CHECK_FUNCS(pthread_kill) + AC_CHECK_FUNCS(pthread_kill pthread_rwlock_destroy) dnl Check for pthread_detach with inclusion dnl as it's symbol may have been mangled. @@ -974,37 +1261,20 @@ int main(argc, argv) thr_getconcurrency \ ) - AC_MSG_CHECKING([if pthread_create() works]) - AC_CACHE_VAL(ol_cv_pthread_create_works,[ - AC_TRY_RUN([ -#include -#ifndef NULL -#define NULL (void*)0 -#endif + OL_SYS_LINUX_THREADS + OL_LINUX_THREADS -static void *task(p) - void *p; -{ - return (void *) (p == NULL); -} + if test $ol_cv_linux_threads = error; then + AC_MSG_ERROR([LinuxThreads header/library mismatch]); + fi -int main(argc, argv) - int argc; - char **argv; -{ - pthread_t t; -#if HAVE_PTHREADS_D4 - exit(pthread_create(&t, pthread_attr_default, task, NULL)); -#else - exit(pthread_create(&t, NULL, task, NULL)); -#endif -} -], + AC_CACHE_CHECK([if pthread_create() works], + ol_cv_pthread_create_works,[ + AC_TRY_RUN(OL_PTHREAD_TEST_PROGRAM, [ol_cv_pthread_create_works=yes], [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]) @@ -1012,8 +1282,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 #include @@ -1088,9 +1358,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 @@ -1156,6 +1429,26 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \ fi fi +if test $ol_with_threads = auto -o $ol_with_threads = yes \ + -o $ol_with_threads = pth ; then + + AC_CHECK_HEADERS(pth.h) + + if test $ac_cv_header_pth_h = yes ; then + AC_CHECK_LIB(pth, pth_version, [have_pth=yes], [have_pth=no]) + + if test $have_pth = yes ; then + AC_DEFINE(HAVE_GNU_PTH,1,[if you have GNU Pth]) + LTHREAD_LIBS="$LTHREAD_LIBS -lpth" + ol_link_threads=pth + + if test $ol_with_yielding_select = auto ; then + ol_with_yielding_select=yes + fi + fi + fi +fi + if test $ol_with_threads = auto -o $ol_with_threads = yes \ -o $ol_with_threads = lwp ; then @@ -1213,14 +1506,14 @@ if test $ol_with_threads = manual ; then AC_CHECK_HEADERS(pthread.h sched.h) AC_CHECK_FUNCS(sched_yield pthread_yield) - OL_LINUX_THREADS + OL_HEADER_LINUX_THREADS AC_CHECK_HEADERS(mach/cthreads.h) AC_CHECK_HEADERS(lwp/lwp.h) AC_CHECK_HEADERS(thread.h synch.h) fi -if test $ol_link_threads != no ; then +if test $ol_link_threads != no -a $ol_link_threads != nt ; then dnl needed to get reentrant/threadsafe versions dnl AC_DEFINE(REENTRANT,1) @@ -1229,19 +1522,28 @@ 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 this might cause the errno symbol to be - dnl replaced with a function to get a thread specific errno. - dnl check to see if everything needs to be compiled - dnl with the thread libraries + dnl The errno declaration may dependent upon _REENTRANT. + dnl If it does, we must link with thread support. AC_CACHE_CHECK([for thread specific errno], [ol_cv_errno_thread_specific], [ - AC_TRY_LINK([#include ], [int x = errno;], + AC_TRY_LINK([#include ], [errno = 0;], [ol_cv_errno_thread_specific=yes], [ol_cv_errno_thread_specific=no]) ]) - if test $ol_cv_errno_thread_specific != yes ; then + dnl The h_errno declaration may dependent upon _REENTRANT. + dnl If it does, we must link with thread support. + AC_CACHE_CHECK([for thread specific h_errno], + [ol_cv_h_errno_thread_specific], [ + AC_TRY_LINK([#include ], [h_errno = 0;], + [ol_cv_h_errno_thread_specific=yes], + [ol_cv_h_errno_thread_specific=no]) + ]) + + if test $ol_cv_errno_thread_specific != yes \ + -o $ol_cv_h_errno_thread_specific != yes ; then LIBS="$LTHREAD_LIBS $LIBS" LTHREAD_LIBS="" fi @@ -1275,7 +1577,7 @@ dnl #ifdef LDAP_R_COMPILE dnl # include LDAP_R_COMPILE dnl #endif dnl -dnl LDAP_R_COMIPLE is defined by libldap_r/Makefile.in +dnl LDAP_R_COMPILE is defined by libldap_r/Makefile.in dnl specifically for compiling the threadsafe version of dnl the ldap library (-lldap_r). dnl @@ -1318,45 +1620,31 @@ if test $ol_link_threads != no ; then fi dnl ---------------------------------------------------------------- - ol_link_ldbm=no -if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = db2 ; then - OL_BERKELEY_DB2 - - if test $ol_cv_berkeley_db2 = yes ; then - ol_link_ldbm=db2 - ol_with_ldbm_api=db2 - if test $ol_with_ldbm_type = hash ; then - AC_DEFINE(LDBM_USE_DBHASH,1) - else - AC_DEFINE(LDBM_USE_DBBTREE,1) - fi +if test $ol_with_ldbm_api = auto \ + -o $ol_with_ldbm_api = berkeley \ + -o $ol_with_ldbm_api = bcompat ; then - dnl $ol_cv_lib_db2 should be yes or -ldb - dnl (it could be no, but that would be an error - if test $ol_cv_lib_db2 != yes ; then - LDBM_LIBS="$LDBM_LIBS $ol_cv_lib_db2" - fi + if test $ol_with_ldbm_api = bcompat; then \ + OL_BERKELEY_COMPAT_DB + else + OL_BERKELEY_DB fi -fi - -ol_link_bdb2=no -if test $ol_link_ldbm = db2 -a $ol_enable_bdb2 != no ; then - ol_link_bdb2=yes -fi -if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = db ; then - OL_BERKELEY_DB + if test $ol_cv_berkeley_db != no ; then + AC_DEFINE(HAVE_BERKELEY_DB,1, + [define this if Berkeley DB is available]) - if test $ol_cv_berkeley_db = yes ; then - ol_link_ldbm=db + ol_link_ldbm=berkeley 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 @@ -1367,20 +1655,23 @@ if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = db ; then fi fi -if test $ol_with_ldbm_api = manual ; then - dnl User thinks he can manually configure LDBM api. - ol_link_ldbm=yes - - AC_MSG_WARN([LDBM defines and link options must be set manually]) - - AC_CHECK_HEADERS(db.h db_185.h gdbm.h ndbm.h) -fi - if test $ol_link_ldbm = no -a $ol_with_ldbm_type = btree ; then AC_MSG_WARN(Could not find LDBM with BTREE support) ol_with_ldbm_api=none fi +if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = mdbm ; then + OL_MDBM + + if test $ol_cv_mdbm = yes ; then + ol_link_ldbm=mdbm + ol_with_ldbm_api=mdbm + if test $ol_cv_lib_mdbm != yes ; then + LDBM_LIBS="$LDBM_LIBS $ol_cv_lib_mdbm" + fi + fi +fi + if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = gdbm ; then OL_GDBM @@ -1394,9 +1685,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 @@ -1419,19 +1708,33 @@ if test $ol_link_ldbm = no -a $ol_enable_ldbm != no ; then ol_enable_ldbm=no fi +dnl ---------------------------------------------------------------- +if test $ol_enable_dynamic = yes -a $enable_shared = yes ; then + LINK_BINS_DYNAMIC="yes" +else + LINK_BINS_DYNAMIC="no" +fi + +dnl ---------------------------------------------------------------- if test $ol_enable_wrappers != no ; then AC_CHECK_HEADERS(tcpd.h) if test $ac_cv_header_tcpd_h != yes ; then have_wrappers=no else - AC_CHECK_LIB(wrap, main, - [have_wrappers=yes], [have_wrappers=no]) + AC_TRY_COMPILE([ +int allow_severity = 0; +int deny_severity = 0; + ],[hosts_access()],[have_wrappers=yes],[have_wrappers=no]) fi if test $have_wrappers = yes ; then AC_DEFINE(HAVE_TCPD,1, [define if you have -lwrap]) - SLAPD_LIBS="$SLAPD_LIBS -lwrap" + WRAP_LIBS="-lwrap" + + dnl We add another check for -lnsl since some libwrap's + dnl need it, but it isn't always included from above + AC_CHECK_LIB(nsl, main) else AC_MSG_WARN(could not find -lwrap) if test $ol_enable_wrappers = yes ; then @@ -1440,9 +1743,11 @@ if test $ol_enable_wrappers != no ; then AC_MSG_WARN(disabling wrappers support) ol_enable_wrappers=no + WRAP_LIBS="" fi fi +dnl ---------------------------------------------------------------- if test $ol_enable_syslog != no ; then AC_CHECK_FUNC(openlog) if test $ac_cv_func_openlog = no -a $ol_enable_syslog = yes; then @@ -1451,32 +1756,29 @@ if test $ol_enable_syslog != no ; then ol_enable_syslog=$ac_cv_func_openlog fi -if test $ol_enable_dmalloc != no ; then - AC_CHECK_HEADERS(dmalloc.h) - AC_CHECK_LIB(dmalloc, dmalloc_shutdown) -fi - +dnl ---------------------------------------------------------------- +dnl dmalloc support (deprecated in favor of -DCSRIMALLOC support) +dnl if test $ol_enable_dmalloc != no ; then +dnl AC_CHECK_HEADERS(dmalloc.h) +dnl AC_CHECK_LIB(dmalloc, dmalloc_shutdown) +dnl fi +dnl ---------------------------------------------------------------- +dnl TCL if test $ol_enable_tcl != no ; then AC_CHECK_HEADERS(tcl.h) if test $ac_cv_header_tcl_h != yes ; then have_tcl=no else - AC_CHECK_LIB(tcl,main, - [have_tcl=yes; SLAPD_LIBS="$SLAPD_LIBS -ltcl"], - [have_tcl=no]) - - if test $have_tcl != yes; then - AC_CHECK_LIB(tcl7.6,main, - [have_tcl=yes; SLAPD_LIBS="$SLAPD_LIBS -ltcl7.6"], - [have_tcl=no]) - fi - - if test $have_tcl != yes; then - AC_CHECK_LIB(tcl8.0,main, - [have_tcl=yes; SLAPD_LIBS="$SLAPD_LIBS -ltcl8.0"], - [have_tcl=no]) - fi + 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 + SLAPD_LIBS="$SLAPD_LIBS -l${lib}" + else + MOD_TCL_LIB="-l${lib}" + fi;break],[have_tcl=no]) + done fi if test $have_tcl != yes ; then @@ -1489,7 +1791,8 @@ if test $ol_enable_tcl != no ; then fi fi -# ud needs termcap (should insert check here) +dnl ---------------------------------------------------------------- +dnl ud needs termcap (should insert check here) ol_link_termcap=no AC_CHECK_HEADERS(termcap.h ncurses.h) @@ -1516,6 +1819,71 @@ if test $ol_link_termcap = no ; then TERMCAP_LIBS= fi +dnl ---------------------------------------------------------------- +dnl +dnl Check for Cyrus SASL +dnl +ol_link_sasl=no +ol_link_spasswd=no +if test $ol_with_cyrus_sasl != no ; then + AC_CHECK_HEADER(sasl.h) + + if test $ac_cv_header_sasl_h = yes ; then + AC_CHECK_LIB(sasl, sasl_client_init, + [have_cyrus_sasl=yes], [have_cyrus_sasl=no]) + + if test $have_cyrus_sasl != no ; then + SASL_LIBS="-lsasl" + AC_DEFINE(HAVE_CYRUS_SASL,1,[define if you have Cyrus SASL]) + ol_link_sasl=yes + fi + fi + + if test $ol_link_sasl = no -a $ol_with_cyrus_sasl = yes ; then + AC_MSG_ERROR(no suitable API for --with-cyrus-sasl=$ol_with_cyrus_sasl) + fi +fi + +dnl ---------------------------------------------------------------- +dnl Check for entropy sources +if test $cross_compiling != yes ; then + dev=no + if test -r /dev/urandom ; then + dev="/dev/urandom"; + elif test -r /idev/urandom ; then + dev="/idev/urandom"; + elif test -r /dev/srandom ; then + dev="/dev/srandom"; + elif test -r /dev/random ; then + dev="/dev/random"; + elif test -r /idev/random ; then + dev="/idev/random"; + fi + + if test $dev != no ; then + AC_DEFINE_UNQUOTED(URANDOM_DEVICE,"$dev",[set to urandom device]) + fi +fi + +dnl ---------------------------------------------------------------- +dnl +dnl Check for fetch URL support +dnl should be extended to support other fetch URL APIs +dnl +ol_link_fetch=no +if test $ol_with_fetch != no ; then + OL_LIB_FETCH + + if test $ol_cv_lib_fetch != no ; then + LDIF_LIBS="$LDIF_LIBS $ol_link_fetch" + ol_link_fetch=freebsd + + elif test $ol_with_fetch != auto ; then + AC_MSG_ERROR(no suitable API for --with-fetch=$ol_with_fetch) + fi +fi + +dnl ---------------------------------------------------------------- dnl dnl Check for GNU readline dnl @@ -1544,14 +1912,15 @@ if test $ol_link_readline = yes ; then fi -# FreeBSD (and others) have crypt(3) in -lcrypt +dnl ---------------------------------------------------------------- +dnl FreeBSD (and others) have crypt(3) in -lcrypt if test $ol_enable_crypt != no ; then AC_CHECK_FUNC(crypt, [have_crypt=yes], [ AC_CHECK_LIB(crypt, crypt, [LUTIL_LIBS="$LUTIL_LIBS -lcrypt" 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 @@ -1563,89 +1932,46 @@ if test $ol_enable_crypt != no ; then fi fi -# FreeBSD (and others) have setproctitle(3) in -lutil +dnl ---------------------------------------------------------------- +dnl FreeBSD (and others) have setproctitle(3) in -lutil if test $ol_enable_proctitle != no ; then AC_CHECK_FUNC(setproctitle, [have_setproctitle=yes], [ AC_CHECK_LIB(util, setproctitle, [have_setproctitle=yes LUTIL_LIBS="$LUTIL_LIBS -lutil"], [have_setproctitle=no - LIBOBJS="$LIBOBJS setproctitle.o"])]) + LIBOBJS="$LIBOBJS setproctitle.o" + LIBSRCS="$LIBSRCS setproctitle.c"])]) if test $have_setproctitle = yes ; then - AC_DEFINE(HAVE_SETPROCTITLE,1) + AC_DEFINE(HAVE_SETPROCTITLE,1, + [define if setproctitle(3) is available]) fi fi -dnl ---------------------------------------------------------------- -dnl Checks for header files. -OL_HEADER_STDC - -if test $ol_cv_header_stdc != yes; then - AC_MSG_WARN([could not Standard C compliant headers]) -fi - -AC_HEADER_DIRENT -AC_HEADER_SYS_WAIT -AM_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL -if test $am_cv_sys_posix_termios = yes ; then - AC_DEFINE(HAVE_POSIX_TERMIOS,1, - [define if you have POSIX termios]) -fi - -AC_CHECK_HEADERS( \ - arpa/inet.h \ - arpa/nameser.h \ - assert.h \ - crypt.h \ - errno.h \ - fcntl.h \ - filio.h \ - getopt.h \ - libutil.h \ - limits.h \ - locale.h \ - malloc.h \ - memory.h \ - regex.h \ - psap.h \ - pwd.h \ - resolv.h \ - sgtty.h \ - stdarg.h \ - stddef.h \ - string.h \ - strings.h \ - sysexits.h \ - sys/file.h \ - sys/filio.h \ - sys/errno.h \ - sys/ioctl.h \ - sys/param.h \ - sys/resource.h \ - sys/socket.h \ - sys/syslog.h \ - sys/time.h \ - sys/types.h \ - syslog.h \ - termios.h \ - unistd.h \ -) - dnl ---------------------------------------------------------------- dnl Checks for typedefs, structures, and compiler characteristics. -AC_TYPE_GETGROUPS dnl requires AC_TYPE_UID_T AC_TYPE_MODE_T AC_TYPE_OFF_T AC_TYPE_PID_T AM_TYPE_PTRDIFF_T AC_TYPE_SIGNAL -OL_TYPE_SIG_ATOMIC_T 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 AC_STRUCT_TM +AC_TYPE_UID_T +OL_TYPE_SIG_ATOMIC_T + +dnl AC_TYPE_GETGROUPS + OL_STRUCT_PASSWD_PW_GECOS +OL_STRUCT_PASSWD_PW_PASSWD OL_C_UPPER_LOWER AC_C_CONST @@ -1655,17 +1981,44 @@ if test $cross_compiling = yes ; then AC_DEFINE(CROSS_COMPILING, 1, [define if cross compiling]) else AC_C_BIGENDIAN - AC_CHECK_SIZEOF(short) - AC_CHECK_SIZEOF(int) - AC_CHECK_SIZEOF(long) fi +AC_COMPILE_CHECK_SIZEOF(short) +AC_COMPILE_CHECK_SIZEOF(int) +AC_COMPILE_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) +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. AC_FUNC_MEMCMP dnl AM_FUNC_MKTIME dnl checks for sys/time.h and unistd.h AC_FUNC_STRFTIME dnl AM_FUNC_STRTOD + +OL_FUNC_INET_ATON + +dnl Check for NT specific routines +AC_CHECK_FUNC(_spawnlp, AC_DEFINE(HAVE_SPAWNLP,1,[if you have spawnlp()])) + +AC_CHECK_FUNC(_snprintf, [ac_cv_func_snprintf=yes + AC_DEFINE(snprintf, _snprintf, [define to snprintf routine]) +]) + +AC_CHECK_FUNC(_vsnprintf, [ac_cv_func_vsnprintf=yes + AC_DEFINE(vsnprintf, _vsnprintf, [define to vsnprintf routine]) +]) + AC_FUNC_VPRINTF if test $ac_cv_func_vprintf = yes ; then @@ -1675,23 +2028,39 @@ fi AC_CHECK_FUNCS( \ bcopy \ + closesocket \ + chroot \ + endgrent \ + endpwent \ flock \ - getdtablesize \ + getdtablesize \ + getgrgid \ gethostname \ getpass \ + getpassphrase \ getpwuid \ - gettimeofday \ + getpwnam \ + getspnam \ + gettimeofday \ + initgroups \ lockf \ memcpy \ memmove \ mkstemp \ - select \ + pipe \ + read \ + recv \ + recvfrom \ setpwfile \ + setgid \ + setegid \ setsid \ + setuid \ + seteuid \ + sigaction \ signal \ sigset \ snprintf \ - socket \ strdup \ strerror \ strpbrk \ @@ -1703,97 +2072,199 @@ AC_CHECK_FUNCS( \ strspn \ sysconf \ waitpid \ + wait4 \ + write \ + send \ + sendto \ ) dnl We actually may need to replace more than this. AC_REPLACE_FUNCS(getopt tempnam) +if test "$ac_cv_func_getopt" != yes; then + LIBSRCS="$LIBSRCS getopt.c" +fi + +if test "$ac_cv_func_tempnam" != yes; then + LIBSRCS="$LIBSRCS tempnam.c" +fi + dnl ---------------------------------------------------------------- # Check Configuration OL_SYS_ERRLIST -dnl ---------------------------------------------------------------- -dnl Check our declaration of strdup() -OL_DECL_STRDUP - 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) +if test "$ol_link_kbind" != no ; then + AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND,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) +if test "$ol_enable_unix" != no; then + AC_DEFINE(LDAP_PF_UNIX,1,[define to support PF_UNIX]) fi -if test "$ol_enable_crypt" != no ; then - AC_DEFINE(SLAPD_CRYPT,1) +if test "$ol_enable_ipv6" != no; then + AC_DEFINE(LDAP_PF_INET6,1,[define to support PF_INET6]) 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_crypt" != no ; then + AC_DEFINE(SLAPD_CRYPT,1,[define to support crypt(3) passwords]) +fi +if test "$ol_link_kpasswd" != no ; then + AC_DEFINE(SLAPD_KPASSWD,1,[define to support Kerberos passwords]) +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 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_enable_aci" != no ; then + AC_DEFINE(SLAPD_ACI_ENABLED,1,[define to support per-object ACIs]) +fi + +if test "$ol_link_modules" != no ; then + AC_DEFINE(SLAPD_MODULES,1,[define to support modules]) + BUILD_SLAPD=yes + SLAPD_MODULES_LDFLAGS="-dlopen self" fi -if test "$ol_link_bdb2" != no ; then - AC_DEFINE(SLAPD_BDB2,1) +if test "$ol_link_dnssrv" != no ; then + AC_DEFINE(SLAPD_DNSSRV,1,[define to support DNS SRV backend]) BUILD_SLAPD=yes - BUILD_BDB2=yes + BUILD_DNSSRV=yes + if test "$ol_with_dnssrv_module" != static ; then + AC_DEFINE(SLAPD_DNSSRV_DYNAMIC,1, + [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" + fi +fi + +if test "$ol_enable_ldap" != no ; then + 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=mod + BUILD_LDAP_DYNAMIC=shared + SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-ldap/back_ldap.la" + 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=mod + BUILD_LDBM_DYNAMIC=shared + SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-ldbm/back_ldbm.la" + 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=mod + BUILD_PASSWD_DYNAMIC=shared + SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-passwd/back_passwd.la" + fi fi -if test "$ol_enable_perl" != no ; then - AC_DEFINE(SLAPD_PERL,1) +if test "$ol_link_perl" != no ; then + 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=mod + BUILD_PERL_DYNAMIC=shared + SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-perl/back_perl.la" + 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=mod + BUILD_SHELL_DYNAMIC=shared + SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-shell/back_shell.la" + 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=mod + BUILD_TCL_DYNAMIC=shared + SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-tcl/back_tcl.la" + 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 \ @@ -1801,37 +2272,81 @@ if test "$ol_enable_slurpd" != no -a "$ol_link_threads" != no -a \ BUILD_SLURPD=yes fi -if test "$ol_link_isode" != no ; then - BUILD_LDAPD=yes +dnl ---------------------------------------------------------------- + +if test "$LINK_BINS_DYNAMIC" = yes; then + LIB_LINKAGE=DYN + LT_LIB_LINKAGE=shared +else + LIB_LINKAGE=STAT + LT_LIB_LINKAGE=static +fi + +if test "$ac_cv_mingw32" = yes ; then + PLAT=NT + DYN_EXT=dll +else + PLAT=UNIX + DYN_EXT=so fi -dnl ---------------------------------------------------------------- +AC_SUBST(LIBSRCS) + +AC_SUBST(PLAT) +AC_SUBST(LIB_LINKAGE) +AC_SUBST(LT_LIB_LINKAGE) +AC_SUBST(DYN_EXT) -AC_SUBST(BUILD_LDAPD) AC_SUBST(BUILD_SLAPD) - AC_SUBST(BUILD_BDB2) + AC_SUBST(BUILD_DNSSRV) + AC_SUBST(BUILD_LDAP) AC_SUBST(BUILD_LDBM) AC_SUBST(BUILD_PASSWD) AC_SUBST(BUILD_PERL) AC_SUBST(BUILD_SHELL) + AC_SUBST(BUILD_SQL) AC_SUBST(BUILD_TCL) + AC_SUBST(BUILD_DNSSRV_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_SQL_DYNAMIC) + AC_SUBST(BUILD_TCL_DYNAMIC) AC_SUBST(BUILD_SLURPD) AC_SUBST(LDAP_LIBS) -AC_SUBST(LDAPD_LIBS) +AC_SUBST(LDIF_LIBS) AC_SUBST(SLAPD_LIBS) AC_SUBST(SLURPD_LIBS) AC_SUBST(LDBM_LIBS) AC_SUBST(LTHREAD_LIBS) AC_SUBST(LUTIL_LIBS) +AC_SUBST(WRAP_LIBS) +AC_SUBST(MOD_TCL_LIB) +AC_SUBST(LINK_BINS_DYNAMIC) -AC_SUBST(SLAPD_PERL_CPPFLAGS) +AC_SUBST(SLAPD_MODULES_CPPFLAGS) +AC_SUBST(SLAPD_MODULES_LDFLAGS) +AC_SUBST(SLAPD_MODULES_LIST) + +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(AUTH_LIBS) + +AC_SUBST(SLAPD_SQL_LDFLAGS) +AC_SUBST(SLAPD_SQL_LIBS) +AC_SUBST(SLAPD_SQL_INCLUDES) dnl ---------------------------------------------------------------- dnl final output @@ -1852,6 +2367,7 @@ clients/gopher/Makefile:build/top.mk:clients/gopher/Makefile.in:build/rules.mk \ clients/mail500/Makefile:build/top.mk:clients/mail500/Makefile.in:build/rules.mk \ clients/rcpt500/Makefile:build/top.mk:clients/rcpt500/Makefile.in:build/rules.mk \ clients/ud/Makefile:build/top.mk:clients/ud/Makefile.in:build/rules.mk \ +clients/maildap/Makefile:build/top.mk:clients/maildap/Makefile.in:build/rules.mk \ clients/tools/Makefile:build/top.mk:clients/tools/Makefile.in:build/rules.mk \ include/Makefile:build/top.mk:include/Makefile.in \ libraries/Makefile:build/top.mk:libraries/Makefile.in:build/dir.mk \ @@ -1861,16 +2377,18 @@ 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 \ servers/slapd/Makefile:build/top.mk:servers/slapd/Makefile.in:build/srv.mk \ -servers/slapd/back-bdb2/Makefile:build/top.mk:servers/slapd/back-bdb2/Makefile.in:build/srv.mk \ -servers/slapd/back-ldbm/Makefile:build/top.mk:servers/slapd/back-ldbm/Makefile.in:build/srv.mk \ -servers/slapd/back-passwd/Makefile:build/top.mk:servers/slapd/back-passwd/Makefile.in:build/srv.mk \ -servers/slapd/back-perl/Makefile:build/top.mk:servers/slapd/back-perl/Makefile.in:build/srv.mk \ -servers/slapd/back-shell/Makefile:build/top.mk:servers/slapd/back-shell/Makefile.in:build/srv.mk \ -servers/slapd/back-tcl/Makefile:build/top.mk:servers/slapd/back-tcl/Makefile.in:build/srv.mk \ +servers/slapd/back-dnssrv/Makefile:build/top.mk:servers/slapd/back-dnssrv/Makefile.in:build/mod.mk \ +servers/slapd/back-ldap/Makefile:build/top.mk:servers/slapd/back-ldap/Makefile.in:build/mod.mk \ +servers/slapd/back-ldbm/Makefile:build/top.mk:servers/slapd/back-ldbm/Makefile.in:build/mod.mk \ +servers/slapd/back-passwd/Makefile:build/top.mk:servers/slapd/back-passwd/Makefile.in:build/mod.mk \ +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-sql/Makefile:build/top.mk:servers/slapd/back-sql/Makefile.in:build/mod.mk \ +servers/slapd/back-tcl/Makefile:build/top.mk:servers/slapd/back-tcl/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 \ @@ -1878,6 +2396,7 @@ tests/Makefile:build/top.mk:tests/Makefile.in:build/dir.mk \ tests/progs/Makefile:build/top.mk:tests/progs/Makefile.in:build/rules.mk \ contrib/Makefile:build/top.mk:contrib/Makefile.in:build/dir.mk \ contrib/saucer/Makefile:build/top.mk:contrib/saucer/Makefile.in:build/rules.mk \ +contrib/web_ldap/Makefile:build/top.mk:contrib/web_ldap/Makefile.in:build/rules.mk \ ,[ date > stamp-h echo Please \"make depend\" to build dependencies