Diff for /configure.in between versions 1.408.2.38 and 1.409

version 1.408.2.38, 2004/01/18 21:25:26 version 1.409, 2002/04/02 16:16:13
Line 1 Line 1
 dnl $OpenLDAP: pkg/ldap/configure.in,v 1.408.2.37 2003/12/02 01:20:42 hyc Exp $  dnl $OpenLDAP: pkg/ldap/configure.in,v 1.408 2002/02/11 19:17:13 kurt Exp $
 dnl  dnl
 dnl Copyright 1998-2004 The OpenLDAP Foundation.  All Rights Reserved.  dnl Copyright 1998-2002 The OpenLDAP Foundation.  All Rights Reserved.
 dnl   dnl 
 dnl Redistribution and use in source and binary forms, with or without  dnl Redistribution and use in source and binary forms, with or without
 dnl modification, are permitted only as authorized by the OpenLDAP  dnl modification, are permitted only as authorized by the OpenLDAP
Line 14  dnl at top of generated configure script Line 14  dnl at top of generated configure script
 define([AC_INIT_BINSH],  define([AC_INIT_BINSH],
 [[#! /bin/sh  [[#! /bin/sh
 # $]OpenLDAP[$  # $]OpenLDAP[$
 # from] translit([$OpenLDAP: pkg/ldap/configure.in,v 1.408.2.37 2003/12/02 01:20:42 hyc Exp $], $")] [  # from] translit([$OpenLDAP: pkg/ldap/configure.in,v 1.408 2002/02/11 19:17:13 kurt Exp $], $")] [
   
 # Copyright 1998-2004 The OpenLDAP Foundation.  All Rights Reserved.  # Copyright 1998-2002 The OpenLDAP Foundation.  All Rights Reserved.
 #   # 
 # Redistribution and use in source and binary forms, with or without  # Redistribution and use in source and binary forms, with or without
 # modification, are permitted only as authorized by the OpenLDAP  # modification, are permitted only as authorized by the OpenLDAP
Line 24  define([AC_INIT_BINSH], Line 24  define([AC_INIT_BINSH],
 # http://www.OpenLDAP.org/license.html or in file LICENSE in the  # http://www.OpenLDAP.org/license.html or in file LICENSE in the
 # top-level directory of the distribution.  # top-level directory of the distribution.
   
 echo "Copyright 1998-2004 The OpenLDAP Foundation,  All Rights Reserved."  echo "Copyright 1998-2002 The OpenLDAP Foundation,  All Rights Reserved."
 echo "  Restrictions apply, see COPYRIGHT and LICENSE files."  echo "  Restrictions apply, see COPYRIGHT and LICENSE files."
 ])dnl  ])dnl
 dnl ----------------------------------------------------------------  dnl ----------------------------------------------------------------
Line 60  fi Line 60  fi
 SHTOOL="$ac_cv_shtool"  SHTOOL="$ac_cv_shtool"
 dnl AC_SUBST(SHTOOL)dnl  dnl AC_SUBST(SHTOOL)dnl
   
 TB="`$SHTOOL echo -e '%B' 2>/dev/null`"  TB=`$SHTOOL echo -e %B`
 TN="`$SHTOOL echo -e '%b' 2>/dev/null`"  TN=`$SHTOOL echo -e %b`
   
 OPENLDAP_CVS=""  echo "Configuring $TB$OL_STRING$TN ..."
 if test -d $ac_aux_dir/CVS; then  
         OPENLDAP_CVS="(from CVS sources) "  
 fi  
   
 echo "Configuring ${TB}${OL_STRING}${TN} ${OPENLDAP_CVS}..."  
   
 dnl Determine host platform  dnl Determine host platform
 dnl             we try not to use this for much  dnl             we try not to use this for much
Line 88  AC_DEFINE_UNQUOTED(LDAP_VENDOR_VERSION_P Line 83  AC_DEFINE_UNQUOTED(LDAP_VENDOR_VERSION_P
 OPENLDAP_LIBVERSION=$OL_API_LIB  OPENLDAP_LIBVERSION=$OL_API_LIB
 AC_SUBST(OPENLDAP_LIBVERSION)dnl  AC_SUBST(OPENLDAP_LIBVERSION)dnl
   
 OPENLDAP_RELEASE_DATE="$OL_RELEASE_DATE"  
 AC_SUBST(OPENLDAP_RELEASE_DATE)dnl  
   
 dnl We use autoconf features new to 2.13.  dnl 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.4.2 should be installed.  dnl libtool 1.4.2 should be installed.
Line 132  dnl ------------------------------------ Line 124  dnl ------------------------------------
 dnl General "enable" options  dnl General "enable" options
 OL_ARG_ENABLE(debug,[  --enable-debug     enable debugging], yes)dnl  OL_ARG_ENABLE(debug,[  --enable-debug     enable debugging], yes)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(dynamic,[  --enable-dynamic         enable linking built binaries with dynamic libs], no)dnl  
 OL_ARG_ENABLE(proctitle,[  --enable-proctitle     enable proctitle support], yes)dnl  OL_ARG_ENABLE(proctitle,[  --enable-proctitle     enable proctitle support], yes)dnl
 dnl OL_ARG_ENABLE(referrals,[  --enable-referrals         enable LDAPv2+ Referrals (experimental)], no)dnl  OL_ARG_ENABLE(cache,[  --enable-cache     enable caching (experimental)], no)dnl
 ol_enable_referrals=${ol_enable_referrals-no}  OL_ARG_ENABLE(referrals,[  --enable-referrals     enable LDAPv2+ Referrals (experimental)], no)dnl
 dnl OL_ARG_ENABLE(kbind,[  --enable-kbind         enable LDAPv2+ Kerberos IV bind (deprecated)], no)dnl  OL_ARG_ENABLE(kbind,[  --enable-kbind     enable LDAPv2+ Kerberos IV bind (deprecated)], no)dnl
 ol_enable_kbind=${ol_enable_kbind-no}  
 OL_ARG_ENABLE(ipv6,[  --enable-ipv6       enable IPv6 support], auto)dnl  OL_ARG_ENABLE(ipv6,[  --enable-ipv6       enable IPv6 support], auto)dnl
 OL_ARG_ENABLE(local,[  --enable-local     enable AF_LOCAL (AF_UNIX) socket support], auto)dnl  OL_ARG_ENABLE(local,[  --enable-local     enable AF_LOCAL (AF_UNIX) socket support], auto)dnl
   OL_ARG_ENABLE(rewrite,[  --enable-rewrite         enable rewrite], no)dnl
 OL_ARG_ENABLE(x_compile,[  --enable-x-compile     enable cross compiling],  OL_ARG_ENABLE(x_compile,[  --enable-x-compile     enable cross compiling],
         no, [yes no])dnl          no, [yes no])dnl
   
Line 149  dnl OL_ARG_ENABLE(dmalloc,[  --enable-dm Line 140  dnl OL_ARG_ENABLE(dmalloc,[  --enable-dm
   
 OL_ARG_WITH(cyrus_sasl,[  --with-cyrus-sasl       with Cyrus SASL support],  OL_ARG_WITH(cyrus_sasl,[  --with-cyrus-sasl       with Cyrus SASL support],
         auto, [auto yes no] )          auto, [auto yes no] )
 OL_ARG_WITH(fetch,[  --with-fetch                 with fetch(3) URL support],  OL_ARG_WITH(fetch,[  --with-fetch                 with fetch URL support],
         auto, [auto yes no] )          auto, [auto yes no] )
 dnl OL_ARG_WITH(kerberos,[  --with-kerberos       with Kerberos support],  OL_ARG_WITH(kerberos,[  --with-kerberos   with Kerberos support],
 dnl     auto, [auto k5 k5only k425 kth k4 afs yes no])          auto, [auto k5 k5only k425 kth k4 afs yes no])
 ol_with_kerberos=${ol_with_kerberos-auto}  
 OL_ARG_WITH(readline,[  --with-readline   with readline support],  OL_ARG_WITH(readline,[  --with-readline   with readline support],
         auto, [auto yes no] )          auto, [auto yes no] )
 OL_ARG_WITH(threads,[  --with-threads     with threads],  OL_ARG_WITH(threads,[  --with-threads     with threads],
Line 175  OL_ARG_ENABLE(slapd,[  --enable-slapd Line 165  OL_ARG_ENABLE(slapd,[  --enable-slapd
 OL_ARG_ENABLE(aci,[    --enable-aci       enable per-object ACIs (experimental)], no)dnl  OL_ARG_ENABLE(aci,[    --enable-aci       enable per-object ACIs (experimental)], no)dnl
 OL_ARG_ENABLE(cleartext,[    --enable-cleartext   enable cleartext passwords], yes)dnl  OL_ARG_ENABLE(cleartext,[    --enable-cleartext   enable cleartext passwords], yes)dnl
 OL_ARG_ENABLE(crypt,[    --enable-crypt   enable crypt(3) passwords], no)dnl  OL_ARG_ENABLE(crypt,[    --enable-crypt   enable crypt(3) passwords], no)dnl
 dnl OL_ARG_ENABLE(kpasswd,[    --enable-kpasswd   enable Kerberos password verification], no)dnl  OL_ARG_ENABLE(dynamic,[    --enable-dynamic       enable linking built binaries with dynamic libs], no)dnl
 ol_enable_kpasswd=${ol_enable_kpasswd-no}  OL_ARG_ENABLE(kpasswd,[    --enable-kpasswd       enable Kerberos password verification], no)dnl
 OL_ARG_ENABLE(lmpasswd,[    --enable-lmpasswd     enable LAN Manager passwords], no)dnl  OL_ARG_ENABLE(lmpasswd,[    --enable-lmpasswd     enable LAN Manager passwords], no)dnl
 OL_ARG_ENABLE(spasswd,[    --enable-spasswd       enable (Cyrus) SASL 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(modules,[    --enable-modules       enable dynamic module support], no)dnl
 dnl OL_ARG_ENABLE(multimaster,[    --enable-multimaster  enable multimaster replication], no)dnl  dnl OL_ARG_ENABLE(multimaster,[    --enable-multimaster  enable multimaster replication], no)dnl
 ol_enable_multimaster=${ol_enable_multimaster-no}  
 OL_ARG_ENABLE(phonetic,[    --enable-phonetic     enable phonetic/soundex], no)dnl  OL_ARG_ENABLE(phonetic,[    --enable-phonetic     enable phonetic/soundex], no)dnl
 OL_ARG_ENABLE(rewrite,[    --enable-rewrite       enable DN rewriting in back-ldap and back-meta], no)dnl  OL_ARG_ENABLE(rlookups,[    --enable-rlookups     enable reverse lookups], no)dnl
 OL_ARG_ENABLE(rlookups,[    --enable-rlookups     enable reverse lookups of client hostnames], no)dnl  
 OL_ARG_ENABLE(slp, [    --enable-slp          enable SLPv2 support], no)dnl       OL_ARG_ENABLE(slp, [    --enable-slp          enable SLPv2 support], no)dnl     
 OL_ARG_ENABLE(wrappers,[    --enable-wrappers     enable tcp wrapper support], no)dnl  OL_ARG_ENABLE(wrappers,[    --enable-wrappers     enable tcp wrapper support], no)dnl
   
 dnl SLAPD Backend options  dnl SLAPD Backend options
 OL_ARG_ENABLE(bdb,[    --enable-bdb       enable Berkeley DB backend], yes)dnl  OL_ARG_ENABLE(bdb,[    --enable-bdb       enable Berkeley DB backend], yes)dnl
 OL_ARG_WITH(bdb_module,[    --with-bdb-module     module type static|dynamic], static,  OL_ARG_WITH(bdb_module,[    --with-bdb-module     module type], static,
         [static dynamic])          [static dynamic])
 OL_ARG_ENABLE(dnssrv,[    --enable-dnssrv         enable dnssrv 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|dynamic], static,  OL_ARG_WITH(dnssrv_module,[    --with-dnssrv-module  module type], static,
         [static dynamic])          [static dynamic])
 OL_ARG_ENABLE(ldap,[    --enable-ldap     enable ldap backend], no)dnl  OL_ARG_ENABLE(ldap,[    --enable-ldap     enable ldap backend], no)dnl
 OL_ARG_WITH(ldap_module,[    --with-ldap-module   module type static|dynamic], static,  OL_ARG_WITH(ldap_module,[    --with-ldap-module   module type], static,
         [static dynamic])          [static dynamic])
 OL_ARG_ENABLE(ldbm,[    --enable-ldbm     enable ldbm backend], no)dnl  OL_ARG_ENABLE(ldbm,[    --enable-ldbm     enable ldbm backend], no)dnl
 OL_ARG_WITH(ldbm_api,[    --with-ldbm-api       with LDBM API auto|berkeley|bcompat|mdbm|gdbm], auto,  OL_ARG_WITH(ldbm_api,[    --with-ldbm-api       with LDBM API], auto,
         [auto berkeley bcompat mdbm gdbm])          [auto berkeley bcompat mdbm gdbm])
 OL_ARG_WITH(ldbm_module,[    --with-ldbm-module   module type static|dynamic], static,  OL_ARG_WITH(ldbm_module,[    --with-ldbm-module   module type], static,
         [static dynamic])          [static dynamic])
 OL_ARG_WITH(ldbm_type,[    --with-ldbm-type       use LDBM type auto|btree|hash], auto,  OL_ARG_WITH(ldbm_type,[    --with-ldbm-type       use LDBM type], auto,
         [auto btree hash])          [auto btree hash])
 OL_ARG_ENABLE(meta,[    --enable-meta     enable metadirectory backend], no)dnl  OL_ARG_ENABLE(meta,[    --enable-meta     enable metadirectory backend], no)dnl
 OL_ARG_WITH(meta_module,[    --with-meta-module   module type static|dynamic], static,  OL_ARG_WITH(meta_module,[    --with-meta-module   module type], static,
         [static dynamic])          [static dynamic])
 OL_ARG_ENABLE(monitor,[    --enable-monitor       enable monitor backend], no)dnl  OL_ARG_ENABLE(monitor,[    --enable-monitor       enable monitor backend], no)dnl
 OL_ARG_WITH(monitor_module,[    --with-monitor-module module type static|dynamic], static,  OL_ARG_WITH(monitor_module,[    --with-monitor-module module type], static,
         [static dynamic])  
 OL_ARG_ENABLE(null,[    --enable-null     enable null backend], no)dnl  
 OL_ARG_WITH(null_module,[    --with-null-module   module type static|dynamic], static,  
         [static dynamic])          [static dynamic])
 OL_ARG_ENABLE(passwd,[    --enable-passwd         enable passwd backend], no)dnl  OL_ARG_ENABLE(passwd,[    --enable-passwd         enable passwd backend], no)dnl
 OL_ARG_WITH(passwd_module,[    --with-passwd-module  module type static|dynamic], static,  OL_ARG_WITH(passwd_module,[    --with-passwd-module  module type], static,
         [static dynamic])          [static dynamic])
 OL_ARG_ENABLE(perl,[    --enable-perl     enable perl backend], no)dnl  OL_ARG_ENABLE(perl,[    --enable-perl     enable perl backend], no)dnl
 OL_ARG_WITH(perl_module,[    --with-perl-module   module type static|dynamic], static,  OL_ARG_WITH(perl_module,[    --with-perl-module   module type], static,
         [static dynamic])          [static dynamic])
 OL_ARG_ENABLE(shell,[    --enable-shell   enable shell backend], no)dnl  OL_ARG_ENABLE(shell,[    --enable-shell   enable shell backend], no)dnl
 OL_ARG_WITH(shell_module,[    --with-shell-module         module type static|dynamic], static,  OL_ARG_WITH(shell_module,[    --with-shell-module         module type], static,
         [static dynamic])          [static dynamic])
 OL_ARG_ENABLE(sql,[    --enable-sql       enable sql backend], no)dnl  OL_ARG_ENABLE(sql,[    --enable-sql       enable sql backend], no)dnl
 OL_ARG_WITH(sql_module,[    --with-sql-module     module type static|dynamic], static,  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])          [static dynamic])
   
 dnl ----------------------------------------------------------------  dnl ----------------------------------------------------------------
Line 237  dnl ------------------------------------ Line 225  dnl ------------------------------------
 AC_ARG_WITH(xxliboptions,[  AC_ARG_WITH(xxliboptions,[
 Library Generation & Linking Options])  Library Generation & Linking Options])
 AC_ENABLE_STATIC  AC_ENABLE_STATIC
   dnl AC_DISABLE_SHARED
 AC_ENABLE_SHARED  AC_ENABLE_SHARED
   
 dnl ----------------------------------------------------------------  dnl ----------------------------------------------------------------
Line 263  if test $ol_enable_slapd = no ; then Line 252  if test $ol_enable_slapd = no ; then
         if test $ol_enable_monitor = yes ; then          if test $ol_enable_monitor = yes ; then
                 AC_MSG_WARN([slapd disabled, ignoring --enable-monitor argument])                  AC_MSG_WARN([slapd disabled, ignoring --enable-monitor argument])
         fi          fi
         if test $ol_enable_null = yes ; then  
                 AC_MSG_WARN([slapd disabled, ignoring --enable-null argument])  
         fi  
         if test $ol_enable_passwd = yes ; then          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          fi
Line 275  if test $ol_enable_slapd = no ; then Line 261  if test $ol_enable_slapd = no ; then
         if test $ol_enable_shell = yes ; then          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          fi
           if test $ol_enable_tcl = yes ; then
                   AC_MSG_WARN([slapd disabled, ignoring --enable-tcl argument])
           fi
         if test $ol_enable_sql = yes ; then          if test $ol_enable_sql = yes ; then
                 AC_MSG_WARN([slapd disabled, ignoring --enable-sql argument])                  AC_MSG_WARN([slapd disabled, ignoring --enable-sql argument])
         fi          fi
         if test $ol_enable_modules = yes ; then          if test $ol_enable_modules = yes ; then
                 AC_MSG_WARN([slapd disabled, ignoring --enable-modules argument])                  AC_MSG_WARN([slapd disabled, ignoring --enable-modules argument])
         fi          fi
         if test $ol_enable_multimaster = yes ; then  dnl     if test $ol_enable_multimaster = yes ; then
                 AC_MSG_WARN([slapd disabled, ignoring --enable-multimaster argument])  dnl             AC_MSG_WARN([slapd disabled, ignoring --enable-multimaster argument])
         fi  dnl     fi
         if test $ol_enable_wrappers = yes ; then          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          fi
Line 320  if test $ol_enable_slapd = no ; then Line 309  if test $ol_enable_slapd = no ; then
         if test $ol_with_monitor_module != static ; then          if test $ol_with_monitor_module != static ; then
                 AC_MSG_WARN([slapd disabled, ignoring --with-monitor-module argument])                  AC_MSG_WARN([slapd disabled, ignoring --with-monitor-module argument])
         fi          fi
         if test $ol_with_null_module != static ; then  
                 AC_MSG_WARN([slapd disabled, ignoring --with-null-module argument])  
         fi  
         if test $ol_with_passwd_module != static ; then          if test $ol_with_passwd_module != static ; then
                 AC_MSG_WARN([slapd disabled, ignoring --with-passwd-module argument])                  AC_MSG_WARN([slapd disabled, ignoring --with-passwd-module argument])
         fi          fi
Line 332  if test $ol_enable_slapd = no ; then Line 318  if test $ol_enable_slapd = no ; then
         if test $ol_with_shell_module != static ; then          if test $ol_with_shell_module != static ; then
                 AC_MSG_WARN([slapd disabled, ignoring --with-shell-module argument])                  AC_MSG_WARN([slapd disabled, ignoring --with-shell-module argument])
         fi          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          if test $ol_with_sql_module != static ; then
                 AC_MSG_WARN([slapd disabled, ignoring --with-sql-module argument])                  AC_MSG_WARN([slapd disabled, ignoring --with-sql-module argument])
         fi          fi
Line 349  if test $ol_enable_slapd = no ; then Line 338  if test $ol_enable_slapd = no ; then
         ol_enable_ldbm=no          ol_enable_ldbm=no
         ol_enable_meta=no          ol_enable_meta=no
         ol_enable_monitor=no          ol_enable_monitor=no
         ol_enable_null=no  
         ol_enable_passwd=no          ol_enable_passwd=no
         ol_enable_perl=no          ol_enable_perl=no
         ol_enable_shell=no          ol_enable_shell=no
           ol_enable_tcl=no
         ol_enable_sql=no          ol_enable_sql=no
   
         ol_enable_modules=no          ol_enable_modules=no
         ol_enable_multimaster=no  dnl     ol_enable_multimaster=no
         ol_enable_phonetic=no          ol_enable_phonetic=no
         ol_enable_rlookups=no          ol_enable_rlookups=no
         ol_enable_aci=no          ol_enable_aci=no
Line 372  if test $ol_enable_slapd = no ; then Line 361  if test $ol_enable_slapd = no ; then
         ol_with_ldbm_module=static          ol_with_ldbm_module=static
         ol_with_meta_module=static          ol_with_meta_module=static
         ol_with_monitor_module=static          ol_with_monitor_module=static
         ol_with_null_module=static  
         ol_with_passwd_module=static          ol_with_passwd_module=static
         ol_with_perl_module=static          ol_with_perl_module=static
         ol_with_shell_module=static          ol_with_shell_module=static
           ol_with_tcl_module=static
         ol_with_sql_module=static          ol_with_sql_module=static
   
         ol_enable_slurpd=no          ol_enable_slurpd=no
Line 403  elif test $ol_enable_ldbm = no ; then Line 392  elif test $ol_enable_ldbm = no ; then
                 $ol_enable_ldap = no -a \                  $ol_enable_ldap = no -a \
                 $ol_enable_meta = no -a \                  $ol_enable_meta = no -a \
                 $ol_enable_monitor = no -a \                  $ol_enable_monitor = no -a \
                 $ol_enable_null = no -a \  
                 $ol_enable_passwd = no -a \                  $ol_enable_passwd = no -a \
                 $ol_enable_perl = no -a \                  $ol_enable_perl = no -a \
                 $ol_enable_shell = no -a \                  $ol_enable_shell = no -a \
                 $ol_enable_sql = no ; then                  $ol_enable_sql = no -a \
                   $ol_enable_tcl = no ; then
   
                 if test $ol_enable_slapd = yes ; then                  if test $ol_enable_slapd = yes ; then
                         AC_MSG_ERROR([slapd requires a backend])                          AC_MSG_ERROR([slapd requires a backend])
Line 498  dnl ------------------------------------ Line 487  dnl ------------------------------------
 dnl Initialize vars  dnl Initialize vars
 LDAP_LIBS=  LDAP_LIBS=
 LDIF_LIBS=  LDIF_LIBS=
   LDBM_LIB=
 LDBM_LIBS=  LDBM_LIBS=
 LTHREAD_LIBS=  LTHREAD_LIBS=
 LUTIL_LIBS=  LUTIL_LIBS=
Line 516  BUILD_LDAP=no Line 506  BUILD_LDAP=no
 BUILD_LDBM=no  BUILD_LDBM=no
 BUILD_META=no  BUILD_META=no
 BUILD_MONITOR=no  BUILD_MONITOR=no
 BUILD_NULL=no  
 BUILD_PASSWD=no  BUILD_PASSWD=no
 BUILD_PERL=no  BUILD_PERL=no
 BUILD_SHELL=no  BUILD_SHELL=no
 BUILD_SQL=no  BUILD_SQL=no
   BUILD_TCL=no
   
 BUILD_BDB_DYNAMIC=static  BUILD_BDB_DYNAMIC=static
 BUILD_DNSSRV_DYNAMIC=static  BUILD_DNSSRV_DYNAMIC=static
Line 528  BUILD_LDAP_DYNAMIC=static Line 518  BUILD_LDAP_DYNAMIC=static
 BUILD_LDBM_DYNAMIC=static  BUILD_LDBM_DYNAMIC=static
 BUILD_META_DYNAMIC=static  BUILD_META_DYNAMIC=static
 BUILD_MONITOR_DYNAMIC=static  BUILD_MONITOR_DYNAMIC=static
 BUILD_NULL_DYNAMIC=static  
 BUILD_PASSWD_DYNAMIC=static  BUILD_PASSWD_DYNAMIC=static
 BUILD_PERL_DYNAMIC=static  BUILD_PERL_DYNAMIC=static
 BUILD_SHELL_DYNAMIC=static  BUILD_SHELL_DYNAMIC=static
   BUILD_TCL_DYNAMIC=static
 BUILD_SQL_DYNAMIC=static  BUILD_SQL_DYNAMIC=static
   
 SLAPD_MODULES_LDFLAGS=  SLAPD_MODULES_LDFLAGS=
 SLAPD_MODULES_CPPFLAGS=  SLAPD_MODULES_CPPFLAGS=
   SLAPD_MODULES_LIST=
   
 SLAPD_STATIC_BACKENDS=  SLAPD_STATIC_BACKENDS=
 SLAPD_DYNAMIC_BACKENDS=  SLAPD_DYNAMIC_BACKENDS=
Line 548  SLAPD_SQL_LDFLAGS= Line 539  SLAPD_SQL_LDFLAGS=
 SLAPD_SQL_LIBS=  SLAPD_SQL_LIBS=
 SLAPD_SQL_INCLUDES=  SLAPD_SQL_INCLUDES=
   
   MOD_TCL_LIB=
 KRB4_LIBS=  KRB4_LIBS=
 KRB5_LIBS=  KRB5_LIBS=
 READLINE_LIBS=  READLINE_LIBS=
Line 613  if test $ol_aix_threads = yes ; then Line 605  if test $ol_aix_threads = yes ; then
 fi  fi
   
 if test -z "${CC}"; then  if test -z "${CC}"; then
         AC_CHECK_PROGS(CC,cc gcc,missing)          AC_CHECK_PROGS(CC,cc)
   
         if test "${CC}" = "missing" ; then  
                 AC_MSG_ERROR([Unable to locate cc(1) or suitable replacement.  Check PATH or set CC.])  
         fi  
 fi  fi
   
 if test -z "${AR}"; then  dnl The default CFLAGS is empty NOT whatever AC_PROG_CC sets.
         AC_CHECK_PROGS(AR,ar gar,missing)  dnl (for now, let autoconf sort this out)
   dnl CFLAGS=${CFLAGS-""}
   
         if test "${AR}" = "missing" ; then  AC_CHECK_PROGS(AR,ar gar,ar)
                 AC_MSG_ERROR([Unable to locate ar(1) or suitable replacement.  Check PATH or set AR.])  
         fi  
 fi  
   
 AC_LIBTOOL_WIN32_DLL  AC_LIBTOOL_WIN32_DLL
 AC_LIBTOOL_DLOPEN  AC_LIBTOOL_DLOPEN
 AC_PROG_LIBTOOL  AC_PROG_LIBTOOL
   
   AC_PROG_AWK
 OL_PROG_LN_H  OL_PROG_LN_H
 AC_PROG_LN_S  AC_PROG_LN_S
   
   AC_PATH_PROG(SENDMAIL, sendmail, /usr/lib/sendmail,
           $PATH:/usr/libexec:/usr/lib:/usr/sbin:/usr/etc:/etc)
   AC_PATH_PROG(EDITOR, vi, /usr/ucb/vi, $PATH:/usr/ucb)
   AC_PATH_PROG(FINGER, finger, /usr/ucb/finger, $PATH:/usr/ucb)
   
 dnl ----------------------------------------------------------------  dnl ----------------------------------------------------------------
 dnl Perl  dnl Perl
 ol_link_perl=no  ol_link_perl=no
Line 648  if test $ol_enable_perl != no ; then Line 640  if test $ol_enable_perl != no ; then
   
         else          else
                 PERL_CPPFLAGS="`$PERLBIN -MExtUtils::Embed -e ccopts`"                  PERL_CPPFLAGS="`$PERLBIN -MExtUtils::Embed -e ccopts`"
                 PERL_LDFLAGS="`$PERLBIN -MExtUtils::Embed -e ldopts|sed -e 's/ -lc / /' -e 's/ -lc$//'`"  
                 if test x"$ol_with_perl_module" = "xstatic" ; then                  if test x"$ol_with_perl_module" = "xstatic" ; then
                         SLAPD_PERL_LDFLAGS="$PERL_LDFLAGS"                          SLAPD_PERL_LDFLAGS="`$PERLBIN -MExtUtils::Embed -e ldopts|sed -e s/-lc//`"
                 else                  else
                         MOD_PERL_LDFLAGS="$PERL_LDFLAGS"                          MOD_PERL_LDFLAGS="`$PERLBIN -MExtUtils::Embed -e ldopts|sed -e s/-lc//`"
                 fi                  fi
                 dnl should check perl version                  dnl should check perl version
                 ol_link_perl=yes                  ol_link_perl=yes
Line 688  AC_MINGW32 Line 679  AC_MINGW32
 AC_EXEEXT  AC_EXEEXT
 AC_OBJEXT  AC_OBJEXT
   
 AC_DEFINE_UNQUOTED(EXEEXT, "${EXEEXT}", [defined to be the EXE extension])  AC_DEFINE_UNQUOTED( EXEEXT, "${EXEEXT}", [defined to be the EXE extension])
   
 dnl ----------------------------------------------------------------  dnl ----------------------------------------------------------------
 dnl BeOS requires -lbe -lroot -lnet  dnl BeOS requires -lbe -lroot -lnet
Line 716  AC_CHECK_LIB(s, afopen, [ Line 707  AC_CHECK_LIB(s, afopen, [
         AC_DEFINE(HAVE_AIX_SECURITY,1,[define if you have AIX security lib])          AC_DEFINE(HAVE_AIX_SECURITY,1,[define if you have AIX security lib])
 ])  ])
   
 dnl ----------------------------------------------------------------  
 dnl Check for IBM OS/390  
 case "$target" in  
 *-ibm-openedition)  
         ac_cv_func_getopt=no  
         AC_DEFINE(BOTH_STRINGS_H,1,[define to use both <string.h> and <strings.h>])  
         ;;  
 esac  
   
 dnl ----------------------------------------------------------------  dnl ----------------------------------------------------------------
 dnl Check for module support  dnl Check for module support
Line 751  else Line 734  else
         ol_with_ldbm_module=static          ol_with_ldbm_module=static
         ol_with_meta_module=static          ol_with_meta_module=static
         ol_with_monitor_module=static          ol_with_monitor_module=static
         ol_with_null_module=static  
         ol_with_passwd_module=static          ol_with_passwd_module=static
         ol_with_perl_module=static          ol_with_perl_module=static
         ol_with_shell_module=static          ol_with_shell_module=static
           ol_with_tcl_module=static
         ol_with_sql_module=static          ol_with_sql_module=static
 fi  fi
   
Line 811  AC_CHECK_HEADERS( \ Line 794  AC_CHECK_HEADERS( \
         sys/resource.h  \          sys/resource.h  \
         sys/select.h    \          sys/select.h    \
         sys/socket.h    \          sys/socket.h    \
         sys/stat.h              \  
         sys/syslog.h    \          sys/syslog.h    \
         sys/time.h              \          sys/time.h              \
         sys/types.h             \          sys/types.h             \
         sys/ucred.h             \  
         sys/uio.h               \  
         syslog.h                \          syslog.h                \
         termios.h               \          termios.h               \
         unistd.h                \          unistd.h                \
Line 1001  fi Line 981  fi
 dnl ----------------------------------------------------------------  dnl ----------------------------------------------------------------
 dnl PF_INET6 support requires getaddrinfo and INET6_ADDRSTRLEN  dnl PF_INET6 support requires getaddrinfo and INET6_ADDRSTRLEN
 dnl PF_LOCAL may use getaddrinfo in available  dnl PF_LOCAL may use getaddrinfo in available
 AC_CHECK_FUNCS( getaddrinfo getnameinfo gai_strerror inet_ntop )  AC_CHECK_FUNCS( getaddrinfo gai_strerror inet_ntop )
   
 ol_link_ipv6=no  ol_link_ipv6=no
 if test $ac_cv_func_getaddrinfo = no -o $ac_cv_func_inet_ntop = no ; then  if test $ac_cv_func_getaddrinfo = no -o $ac_cv_func_inet_ntop = no ; then
Line 1017  elif test $ol_enable_ipv6 != no ; then Line 997  elif test $ol_enable_ipv6 != no ; then
 #                       endif  #                       endif
                 ], [ol_cv_inet6_addrstrlen=yes], [ol_cv_inet6_addrstrlen=no])])                  ], [ol_cv_inet6_addrstrlen=yes], [ol_cv_inet6_addrstrlen=no])])
   
           if test $ol_cv_inet6_addrstrlen = yes ; then
         AC_CACHE_CHECK([struct sockaddr_storage],ol_cv_struct_sockaddr_storage,[  
                 AC_TRY_COMPILE([  
 #include <sys/types.h>  
 #include <sys/socket.h>  
 ],[  
                         struct sockaddr_storage ss;  
 ],                      [ol_cv_struct_sockaddr_storage=yes],  
                         [ol_cv_struct_sockaddr_storage=no])])  
   
         if test $ol_cv_inet6_addrstrlen = yes \  
                 -a $ol_cv_struct_sockaddr_storage = yes ; then  
                 ol_link_ipv6=yes                  ol_link_ipv6=yes
         elif test $ol_enable_ipv6 = yes \          elif test $ol_enable_ipv6 = yes ; then
                         -a $ol_cv_inet6_addrstrlen = no ; then  
                 AC_MSG_ERROR([IPv6 support requires INET6_ADDRSTRLEN])                  AC_MSG_ERROR([IPv6 support requires INET6_ADDRSTRLEN])
         elif test $ol_enable_ipv6 = yes \  
                         -a $ol_cv_struct_sockaddr_storage = no ; then  
                 AC_MSG_ERROR([IPv6 support requires struct sockaddr_storage])  
         fi          fi
 fi  fi
   
Line 1083  if test $ol_with_kerberos = yes -o $ol_w Line 1048  if test $ol_with_kerberos = yes -o $ol_w
                                 [-l$krb5crypto -lcom_err])                                  [-l$krb5crypto -lcom_err])
   
                 elif test $krb5_impl = heimdal; then                  elif test $krb5_impl = heimdal; then
                         AC_CHECK_LIB(des, main,  
                                 [krb5crypto=des],  
                                 [krb5crypto=crypto])  
   
                         AC_CHECK_LIB(krb5, main,                          AC_CHECK_LIB(krb5, main,
                                 [have_krb5=yes                                  [have_krb5=yes
                                 KRB5_LIBS="-lkrb5 -l$krb5crypto -lasn1 -lroken -lcom_err"],                                  KRB5_LIBS="-lkrb5 -ldes -lasn1 -lroken -lcom_err"],
                                 [have_krb5=no],                                  [have_krb5=no],
                                 [-l$krb5crypto -lasn1 -lroken -lcom_err])                                  [-ldes -lasn1 -lroken -lcom_err])
   
                         AC_DEFINE(HAVE_HEIMDAL_KERBEROS, 1,                          AC_DEFINE(HAVE_HEIMDAL_KERBEROS, 1,
                                 [define if you have HEIMDAL Kerberos])                                  [define if you have HEIMDAL Kerberos])
   
                 else                  else
                         have_krb5=no                          have_krb5=no
                         AC_MSG_WARN([Unrecognized Kerberos5 Implementation])                          AC_MSG_WARN([Unrecongized Kerberos5 Implementation])
                 fi                  fi
   
                 if test $have_krb5 = yes ; then                  if test $have_krb5 = yes ; then
Line 1136  if test $ol_link_krb5 = yes -a \( $ol_wi Line 1097  if test $ol_link_krb5 = yes -a \( $ol_wi
                 elif test $krb5_impl = heimdal; then                  elif test $krb5_impl = heimdal; then
                         AC_CHECK_LIB(krb4, main, [have_k425=yes                          AC_CHECK_LIB(krb4, main, [have_k425=yes
                                 KRB4_LIBS="-lkrb4"], [have_k425=no],                                  KRB4_LIBS="-lkrb4"], [have_k425=no],
                                 [-lkrb5 -l$krb5crypto -lasn1 -lroken -lcom_err])                                  [-lkrb5 -ldes -lasn1 -lroken -lcom_err])
   
                 else                  else
                         have_425=no                          have_425=no
Line 1231  ol_link_tls=no Line 1192  ol_link_tls=no
 if test $ol_with_tls != no ; then  if test $ol_with_tls != no ; then
         AC_CHECK_HEADERS(openssl/ssl.h ssl.h)          AC_CHECK_HEADERS(openssl/ssl.h ssl.h)
                   
         if test $ac_cv_header_openssl_ssl_h = yes \          if test $ac_cv_header_openssl_ssl_h = yes -o $ac_cv_header_ssl_h = yes ; then
                 -o $ac_cv_header_ssl_h = yes ; then  
                 AC_CHECK_LIB(ssl, SSLeay_add_ssl_algorithms,                   AC_CHECK_LIB(ssl, SSLeay_add_ssl_algorithms, 
                         [have_ssleay=yes                          [have_ssleay=yes
                         need_rsaref=no],                          need_rsaref=no],
Line 1297  if test $ol_enable_lmpasswd != no; then Line 1257  if test $ol_enable_lmpasswd != no; then
 fi  fi
   
 dnl ----------------------------------------------------------------  dnl ----------------------------------------------------------------
   dnl Tests for reentrant functions necessary to build a
   dnl thread_safe -lldap.
   AC_CHECK_FUNCS(         \
           ctime_r                 \
           gethostbyname_r gethostbyaddr_r \
   )
   
   if test "$ac_cv_func_ctime_r" = no ; then
           ol_cv_func_ctime_r_nargs=0
   else
           OL_FUNC_CTIME_R_NARGS
   dnl     OL_FUNC_CTIME_R_TYPE
   fi
   
   if test "$ac_cv_func_gethostbyname_r" = yes ; then
           OL_FUNC_GETHOSTBYNAME_R_NARGS
   else
           ol_cv_func_gethostbyname_r_nargs=0
   fi
    
   if test "$ac_cv_func_gethostbyaddr_r" = yes ; then
           OL_FUNC_GETHOSTBYADDR_R_NARGS
   else
           ol_cv_func_gethostbyaddr_r_nargs=0
   fi
   
   if test "$ac_cv_func_ctime_r" = yes \
           -a "$ol_cv_func_ctime_r_nargs" -ge 2 \
           -a "$ol_cv_func_ctime_r_nargs" -le 3 \
           -a "$ac_cv_func_gethostbyname_r" = yes \
           -a "$ol_cv_func_gethostbyname_r_nargs" -ge 5 \
           -a "$ol_cv_func_gethostbyname_r_nargs" -le 6 \
           -a "$ac_cv_func_gethostbyaddr_r" = yes \
           -a "$ol_cv_func_gethostbyaddr_r_nargs" -ge 5 \
           -a "$ol_cv_func_gethostbyaddr_r_nargs" -le 6 \
           ; then
    
           AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_REENTRANT,1)
   fi
   
   dnl ----------------------------------------------------------------
 dnl Threads?  dnl Threads?
 ol_link_threads=no  ol_link_threads=no
   
Line 1327  if test $ol_with_threads = auto -o $ol_w Line 1328  if test $ol_with_threads = auto -o $ol_w
         if test $ac_cv_header_pthread_h = yes ; then          if test $ac_cv_header_pthread_h = yes ; then
                 OL_POSIX_THREAD_VERSION                  OL_POSIX_THREAD_VERSION
   
                 if test $ol_cv_pthread_version != 0 ; then                  if test $ol_cv_pthread_version = final ; then
                         AC_DEFINE_UNQUOTED(HAVE_PTHREADS,$ol_cv_pthread_version,                          AC_DEFINE(HAVE_PTHREADS_FINAL,1,
                                 [define to pthreads API spec revision])                                  [define if pthreads API compatible with final spec])
                   elif test $ol_cv_pthread_version = draft4 ; then
                           AC_DEFINE(HAVE_PTHREADS_D4,1,
                                   [define if pthreads API compatible with draft4 spec])
                 else                  else
                         AC_MSG_ERROR([unknown pthread version])                          AC_MSG_ERROR([unknown pthread version])
                 fi                  fi
Line 1424  dnl   [ol_cv_pthread_lpthread_lexc]) Line 1428  dnl   [ol_cv_pthread_lpthread_lexc])
                 OL_PTHREAD_TRY([-lpthreads],[ol_cv_pthread_lib_lpthreads])                  OL_PTHREAD_TRY([-lpthreads],[ol_cv_pthread_lib_lpthreads])
   
                 if test $ol_link_threads != no ; then                  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"                          LTHREAD_LIBS="$LTHREAD_LIBS $ol_link_pthreads"
   
                         dnl save flags                          dnl save flags
Line 1433  dnl   [ol_cv_pthread_lpthread_lexc]) Line 1440  dnl   [ol_cv_pthread_lpthread_lexc])
   
                         dnl All POSIX Thread (final) implementations should have                          dnl All POSIX Thread (final) implementations should have
                         dnl sched_yield instead of pthread yield.                          dnl sched_yield instead of pthread yield.
                         dnl check for both, and thr_yield for Solaris                          dnl check for both
                         AC_CHECK_FUNCS(sched_yield pthread_yield thr_yield)                          AC_CHECK_FUNCS(sched_yield pthread_yield)
   
                         if test $ac_cv_func_sched_yield = no -a \                          if test $ac_cv_func_sched_yield = no -a \
                                 $ac_cv_func_pthread_yield = no -a \                                  $ac_cv_func_pthread_yield = no ; then
                                 $ac_cv_func_thr_yield = no ; then  
                                 dnl Digital UNIX has sched_yield() in -lrt                                  dnl Digital UNIX has sched_yield() in -lrt
                                 AC_CHECK_LIB(rt, sched_yield,                                  AC_CHECK_LIB(rt, sched_yield,
                                         [LTHREAD_LIBS="$LTHREAD_LIBS -lrt"                                          [LTHREAD_LIBS="$LTHREAD_LIBS -lrt"
Line 1448  dnl   [ol_cv_pthread_lpthread_lexc]) Line 1454  dnl   [ol_cv_pthread_lpthread_lexc])
                                         [ac_cv_func_sched_yield=no])                                          [ac_cv_func_sched_yield=no])
                         fi                          fi
                         if test $ac_cv_func_sched_yield = no -a \                          if test $ac_cv_func_sched_yield = no -a \
                                   $ac_cv_func_pthread_yield = no ; then
                                   dnl Solaris has sched_yield() stub in -lposix4
                                   dnl but we'll use thr_yield instead.
                                   AC_CHECK_FUNCS(thr_yield)
                           fi
                           if test $ac_cv_func_sched_yield = no -a \
                                 $ac_cv_func_pthread_yield = no -a \                                  $ac_cv_func_pthread_yield = no -a \
                                 "$ac_cv_func_thr_yield" = no ; then                                  "$ac_cv_func_thr_yield" = no ; then
                                 AC_MSG_WARN([could not locate sched_yield() or pthread_yield()])                                  AC_MSG_WARN([could not locate sched_yield() or pthread_yield()])
Line 1567  int main(argc, argv) Line 1579  int main(argc, argv)
 #endif  #endif
 #endif  #endif
   
 #if HAVE_PTHREADS < 6  #if HAVE_PTHREADS_D4
         pthread_create(&t, pthread_attr_default, task, NULL);          pthread_create(&t, pthread_attr_default, task, NULL);
 #else  #else
         pthread_create(&t, NULL, task, NULL);          pthread_create(&t, NULL, task, NULL);
 #endif  #endif
   
         /* make sure task runs first */  #if HAVE_SCHED_YIELD
 #if HAVE_THR_YIELD          sched_yield();  /* make sure task runs first */
         thr_yield();  #else
 #elif defined( HAVE_SCHED_YIELD )  #ifdef HAVE_PTHREAD_YIELD
         sched_yield();          pthread_yield();        /* make sure task runs first */
 #elif defined( HAVE_PTHREAD_YIELD )  #endif
         pthread_yield();  
 #endif  #endif
   
         exit(2);          exit(2);
Line 1796  if test $ol_link_threads != no -a $ol_li Line 1807  if test $ol_link_threads != no -a $ol_li
         fi          fi
   
 dnl When in thread environment, use   dnl When in thread environment, use 
 dnl             #if defined( HAVE_REENTRANT_FUNCTIONS ) || defined( HAVE_FUNC_R )  dnl             #if defined( HAVE_REENTRANT_FUNCTIONS ) \ 
   dnl                     || defined( HAVE_FUNC_R )
 dnl                     func_r(...);  dnl                     func_r(...);
 dnl             #else  dnl             #else
 dnl             #       if defined( HAVE_THREADS )   dnl             #       if defined( HAVE_THREADS ) 
Line 1813  dnl  _POSIX_REENTRANT_FUNCTIONS Line 1825  dnl  _POSIX_REENTRANT_FUNCTIONS
 dnl             _POSIX_THREAD_SAFE_FUNCTIONS  dnl             _POSIX_THREAD_SAFE_FUNCTIONS
 dnl             _POSIX_THREADSAFE_FUNCTIONS  dnl             _POSIX_THREADSAFE_FUNCTIONS
 dnl  dnl
 dnl             and is currently defined in <ldap_pvt_thread.h>  dnl             and is currently defined in lthread.h
 dnl  dnl
 dnl HAVE_THREADS is defined by <ldap_pvt_thread.h> iff -UNO_THREADS  dnl HAVE_THREADS is defined by lthread.h iff -UNO_THREADS
 dnl   dnl 
 dnl libldap/*.c should only include <ldap_pvt_thread.h> iff  dnl libldap/*.c should only include <lthread.h> iff
 dnl LDAP_R_COMPILE is defined.  ie:  dnl LDAP_R_COMPILE is defined.  ie:
 dnl             #ifdef LDAP_R_COMPILE  dnl             #ifdef LDAP_R_COMPILE
 dnl             #       include <ldap_pvt_thread.h>  dnl             #       include LDAP_R_COMPILE
 dnl             #endif  dnl             #endif
 dnl  dnl
 dnl LDAP_R_COMPILE is defined by libldap_r/Makefile.in  dnl LDAP_R_COMPILE is defined by libldap_r/Makefile.in
Line 1866  if test $ol_link_threads != no ; then Line 1878  if test $ol_link_threads != no ; then
 fi  fi
   
 dnl ----------------------------------------------------------------  dnl ----------------------------------------------------------------
 dnl Tests for reentrant functions necessary to build -lldap_r  
 AC_CHECK_FUNCS(         \  
         ctime_r                 \  
         gethostbyname_r gethostbyaddr_r \  
 )  
   
 if test "$ac_cv_func_ctime_r" = no ; then  
         ol_cv_func_ctime_r_nargs=0  
 else  
         OL_FUNC_CTIME_R_NARGS  
 dnl     OL_FUNC_CTIME_R_TYPE  
 fi  
   
 if test "$ac_cv_func_gethostbyname_r" = yes ; then  
         OL_FUNC_GETHOSTBYNAME_R_NARGS  
 else  
         ol_cv_func_gethostbyname_r_nargs=0  
 fi  
    
 if test "$ac_cv_func_gethostbyaddr_r" = yes ; then  
         OL_FUNC_GETHOSTBYADDR_R_NARGS  
 else  
         ol_cv_func_gethostbyaddr_r_nargs=0  
 fi  
   
 dnl ----------------------------------------------------------------  
 ol_link_ldbm=no   ol_link_ldbm=no 
   
 if test $ol_with_ldbm_api = auto \  if test $ol_with_ldbm_api = auto \
Line 1995  if test $ol_link_ldbm = no -a $ol_enable Line 1981  if test $ol_link_ldbm = no -a $ol_enable
 fi  fi
   
 dnl ----------------------------------------------------------------  dnl ----------------------------------------------------------------
   
 if test $ol_enable_dynamic = yes -a $enable_shared = yes ; then  if test $ol_enable_dynamic = yes -a $enable_shared = yes ; then
         BUILD_LIBS_DYNAMIC=shared          BUILD_LIBS_DYNAMIC=shared
         AC_DEFINE(LDAP_LIBS_DYNAMIC, 1, [define if LDAP libs are dynamic])          AC_DEFINE(LDAP_LIBS_DYNAMIC, 1, [define if LDAP libs are dynamic])
         LTSTATIC=""  
 else  else
         BUILD_LIBS_DYNAMIC=static          BUILD_LIBS_DYNAMIC=static
         LTSTATIC="-static"  
 fi  fi
 AC_SUBST(LTSTATIC)dnl  
   
 dnl ----------------------------------------------------------------  dnl ----------------------------------------------------------------
 if test $ol_enable_wrappers != no ; then  if test $ol_enable_wrappers != no ; then
Line 2072  dnl ------------------------------------ Line 2054  dnl ------------------------------------
 dnl SQL  dnl SQL
 ol_link_sql=no  ol_link_sql=no
 if test $ol_enable_sql != no ; then  if test $ol_enable_sql != no ; then
         AC_CHECK_HEADERS(sql.h sqlext.h,[],[  
                 AC_MSG_ERROR([could not locate SQL headers])  
         ])  
   
         AC_CHECK_LIB(iodbc,SQLDriverConnect,[have_iodbc=yes],[have_iodbc=no])          AC_CHECK_LIB(iodbc,SQLDriverConnect,[have_iodbc=yes],[have_iodbc=no])
         if test $have_iodbc = yes ; then          if test $have_iodbc = yes ; then
                 ol_link_sql="-liodbc"                  ol_link_sql="-liodbc"
Line 2095  if test $ol_enable_sql != no ; then Line 2073  if test $ol_enable_sql != no ; then
 fi  fi
   
 dnl ----------------------------------------------------------------  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
                   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
                   AC_MSG_WARN([could not find -ltcl])
                   if test $ol_enable_tcl = yes ; then
                           AC_MSG_ERROR([could not find tcl, select appropriate options or disable])
                   fi
   
                   ol_enable_tcl=no
           fi
   fi
   
   dnl ----------------------------------------------------------------
 dnl ud needs termcap (should insert check here)  dnl ud needs termcap (should insert check here)
 ol_link_termcap=no  ol_link_termcap=no
 AC_CHECK_HEADERS(termcap.h ncurses.h)  AC_CHECK_HEADERS(termcap.h ncurses.h)
Line 2149  if test $ol_with_cyrus_sasl != no ; then Line 2156  if test $ol_with_cyrus_sasl != no ; then
                         fi                          fi
                 fi                  fi
         else          else
                 OL_SASL_COMPAT  
                 if test $ol_cv_sasl_compat = no ; then  
                         ol_link_sasl=no  
                         AC_MSG_ERROR([Cyrus SASL library located but incompatible])  
                 fi  
   
                 AC_DEFINE(HAVE_CYRUS_SASL,1,[define if you have Cyrus SASL])                  AC_DEFINE(HAVE_CYRUS_SASL,1,[define if you have Cyrus SASL])
                 SASL_LIBS="$ol_link_sasl"                  SASL_LIBS="$ol_link_sasl"
                 if test $ol_enable_spasswd != no ; then                  if test $ol_enable_spasswd != no ; then
                         ol_link_spasswd=yes                          ol_link_spasswd=yes
                 fi                  fi
   
                 ac_save_LIBS="$LIBS"  
                 LIBS="$LIBS $ol_link_sasl"  
                 AC_CHECK_FUNC(sasl_version, [AC_DEFINE(HAVE_SASL_VERSION,1,  
                         [define if your SASL library has sasl_version()])])  
                 LIBS="$ac_save_LIBS"  
         fi          fi
   
 else  else
Line 2246  fi Line 2241  fi
 dnl ----------------------------------------------------------------  dnl ----------------------------------------------------------------
 dnl FreeBSD (and others) have crypt(3) in -lcrypt  dnl FreeBSD (and others) have crypt(3) in -lcrypt
 if test $ol_enable_crypt != no ; then  if test $ol_enable_crypt != no ; then
         save_LIBS="$LIBS"  
         LIBS="$TLS_LIBS $LIBS"  
   
         AC_CHECK_FUNC(crypt, [have_crypt=yes], [          AC_CHECK_FUNC(crypt, [have_crypt=yes], [
                 LIBS="$save_LIBS"  
                 AC_CHECK_LIB(crypt, crypt, [LUTIL_LIBS="$LUTIL_LIBS -lcrypt"                  AC_CHECK_LIB(crypt, crypt, [LUTIL_LIBS="$LUTIL_LIBS -lcrypt"
                         have_crypt=yes], [have_crypt=no])])                          have_crypt=yes], [have_crypt=no])])
   
         LIBS="$save_LIBS"  
   
         if test $have_crypt = yes ; then          if test $have_crypt = yes ; then
                 AC_DEFINE(HAVE_CRYPT,1, [define if crypt(3) is available])                  AC_DEFINE(HAVE_CRYPT,1, [define if crypt(3) is available])
         else          else
Line 2377  AC_FUNC_VPRINTF Line 2366  AC_FUNC_VPRINTF
   
 if test $ac_cv_func_vprintf = yes ; then  if test $ac_cv_func_vprintf = yes ; then
         dnl check for vsnprintf          dnl check for vsnprintf
         AC_CHECK_FUNCS(snprintf vsnprintf)          AC_CHECK_FUNCS(vsnprintf vsprintf)
 fi  fi
   
 AC_CHECK_FUNCS(         \  AC_CHECK_FUNCS(         \
Line 2388  AC_CHECK_FUNCS(  \ Line 2377  AC_CHECK_FUNCS(  \
         endpwent                \          endpwent                \
         fcntl                   \          fcntl                   \
         flock                   \          flock                   \
         fstat                   \  
         getdtablesize   \          getdtablesize   \
         getgrgid                \          getgrgid                \
         gethostname             \          gethostname             \
Line 2432  AC_CHECK_FUNCS(  \ Line 2420  AC_CHECK_FUNCS(  \
         wait4                   \          wait4                   \
         write                   \          write                   \
         send                    \          send                    \
         sendmsg                 \  
         sendto                  \          sendto                  \
 )  )
   
 dnl We actually may need to replace more than this.  dnl We actually may need to replace more than this.
 AC_REPLACE_FUNCS(getopt getpeereid)  AC_REPLACE_FUNCS(getopt)
   
 if test "$ac_cv_func_getopt" != yes; then  if test "$ac_cv_func_getopt" != yes; then
         LIBSRCS="$LIBSRCS getopt.c"          LIBSRCS="$LIBSRCS getopt.c"
 fi  fi
 if test "$ac_cv_func_getpeereid" != yes; then  
         OL_MSGHDR_MSG_ACCRIGHTS  
         LIBSRCS="$LIBSRCS getpeereid.c"  
 fi  
 if test "$ac_cv_func_snprintf" != yes -o "$ac_cv_func_vsnprintf" != yes; then  
         if test "$ac_cv_func_snprintf" != yes; then  
                 AC_DEFINE(snprintf, ber_pvt_snprintf, [define to snprintf routine])  
         fi  
         if test "$ac_cv_func_vsnprintf" != yes; then  
                 AC_DEFINE(vsnprintf, ber_pvt_vsnprintf, [define to snprintf routine])  
         fi  
 fi  
   
 dnl ----------------------------------------------------------------  dnl ----------------------------------------------------------------
 # Check Configuration  # Check Configuration
Line 2470  if test "$ol_enable_syslog" = yes ; then Line 2445  if test "$ol_enable_syslog" = yes ; then
         AC_DEFINE(LDAP_SYSLOG,1,          AC_DEFINE(LDAP_SYSLOG,1,
                 [define this to add syslog code])                  [define this to add syslog code])
 fi  fi
   if test "$ol_enable_cache" = no ; then
           AC_DEFINE(LDAP_NOCACHE,1,
                   [define this to remove -lldap cache support])
   fi
 if test "$ol_link_kbind" != no ; then  if test "$ol_link_kbind" != no ; then
         AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND,LDAP_VENDOR_VERSION)          AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND,LDAP_VENDOR_VERSION)
 fi  fi
Line 2498  fi Line 2477  fi
 if test "$ol_link_spasswd" != no ; then  if test "$ol_link_spasswd" != no ; then
         AC_DEFINE(SLAPD_SPASSWD,1,[define to support SASL passwords])          AC_DEFINE(SLAPD_SPASSWD,1,[define to support SASL passwords])
 fi  fi
 if test "$ol_enable_multimaster" != no ; then  dnl if test "$ol_enable_multimaster" != no ; then
         AC_DEFINE(SLAPD_MULTIMASTER,1,[define to support multimaster replication])  dnl     AC_DEFINE(SLAPD_MULTIMASTER,1,[define to support multimaster replication])
 fi  dnl fi
 if test "$ol_enable_phonetic" != no ; then  if test "$ol_enable_phonetic" != no ; then
         AC_DEFINE(SLAPD_PHONETIC,1,[define to support phonetic])          AC_DEFINE(SLAPD_PHONETIC,1,[define to support phonetic])
 fi  fi
Line 2526  if test "$ol_enable_bdb" != no ; then Line 2505  if test "$ol_enable_bdb" != no ; then
                         [define to support dynamic BDB backend])                          [define to support dynamic BDB backend])
                 BUILD_BDB=mod                  BUILD_BDB=mod
                 BUILD_BDB_DYNAMIC=shared                  BUILD_BDB_DYNAMIC=shared
                   SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-bdb/back_bdb.la"
                 SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-bdb"                  SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-bdb"
         else          else
                 SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-bdb"                  SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-bdb"
Line 2541  if test "$ol_link_dnssrv" != no ; then Line 2521  if test "$ol_link_dnssrv" != no ; then
                         [define to support dynamic DNS SRV backend])                          [define to support dynamic DNS SRV backend])
                 BUILD_DNSSRV=mod                  BUILD_DNSSRV=mod
                 BUILD_DNSSRV_DYNAMIC=shared                  BUILD_DNSSRV_DYNAMIC=shared
                   SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-dnssrv/back_dnssrv.la"
                 SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-dnssrv"                  SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-dnssrv"
         else          else
                 SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-dnssrv"                  SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-dnssrv"
Line 2556  if test "$ol_enable_ldap" != no ; then Line 2537  if test "$ol_enable_ldap" != no ; then
                         [define to support dynamic LDAP backend])                          [define to support dynamic LDAP backend])
                 BUILD_LDAP=mod                  BUILD_LDAP=mod
                 BUILD_LDAP_DYNAMIC=shared                  BUILD_LDAP_DYNAMIC=shared
                   SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-ldap/back_ldap.la"
                 SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-ldap"                  SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-ldap"
         else          else
                 SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-ldap"                  SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-ldap"
Line 2566  if test "$ol_link_ldbm" != no -a $ol_ena Line 2548  if test "$ol_link_ldbm" != no -a $ol_ena
         AC_DEFINE(SLAPD_LDBM,1,[define to support LDBM backend])          AC_DEFINE(SLAPD_LDBM,1,[define to support LDBM backend])
         BUILD_SLAPD=yes          BUILD_SLAPD=yes
         BUILD_LDBM=yes          BUILD_LDBM=yes
           LDBM_LIB="-lldbm"
         if test "$ol_with_ldbm_module" != static ; then          if test "$ol_with_ldbm_module" != static ; then
                 AC_DEFINE(SLAPD_LDBM_DYNAMIC,1,                  AC_DEFINE(SLAPD_LDBM_DYNAMIC,1,
                         [define to support dynamic LDBM backend])                          [define to support dynamic LDBM backend])
                 BUILD_LDBM=mod                  BUILD_LDBM=mod
                 BUILD_LDBM_DYNAMIC=shared                  BUILD_LDBM_DYNAMIC=shared
                   SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-ldbm/back_ldbm.la"
                 SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-ldbm"                  SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-ldbm"
         else          else
                 SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-ldbm"                  SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-ldbm"
Line 2587  if test "$ol_enable_meta" != no ; then Line 2571  if test "$ol_enable_meta" != no ; then
         AC_DEFINE(SLAPD_META,1,[define to support LDAP Metadirectory backend])          AC_DEFINE(SLAPD_META,1,[define to support LDAP Metadirectory backend])
         BUILD_SLAPD=yes          BUILD_SLAPD=yes
         BUILD_META=yes          BUILD_META=yes
         BUILD_REWRITE=yes  
         if test "$ol_with_meta_module" != static ; then          if test "$ol_with_meta_module" != static ; then
                 AC_DEFINE(SLAPD_META_DYNAMIC,1,                  AC_DEFINE(SLAPD_META_DYNAMIC,1,
                         [define to support dynamic LDAP Metadirectory backend])                          [define to support dynamic LDAP Metadirectory backend])
                 BUILD_META=mod                  BUILD_META=mod
                 BUILD_META_DYNAMIC=shared                  BUILD_META_DYNAMIC=shared
                   SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-meta/back_meta.la"
                 SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-meta"                  SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-meta"
         else          else
                 SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-meta"                  SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-meta"
Line 2608  if test "$ol_enable_monitor" != no ; the Line 2592  if test "$ol_enable_monitor" != no ; the
                         [define to support dynamic cn=Monitor backend])                          [define to support dynamic cn=Monitor backend])
                 BUILD_MONITOR=mod                  BUILD_MONITOR=mod
                 BUILD_MONITOR_DYNAMIC=shared                  BUILD_MONITOR_DYNAMIC=shared
                   SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-monitor/back_monitor.la"
                 SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-monitor"                  SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-monitor"
         else          else
                 SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-monitor"                  SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-monitor"
         fi          fi
 fi  fi
   
 if test "$ol_enable_null" != no ; then  
         AC_DEFINE(SLAPD_NULL,1,[define to support NULL backend])  
         BUILD_SLAPD=yes  
         BUILD_NULL=yes  
         if test "$ol_with_null_module" != static ; then  
                 AC_DEFINE(SLAPD_NULL_DYNAMIC,1,  
                         [define to support dynamic NULL backend])  
                 BUILD_NULL=mod  
                 BUILD_NULL_DYNAMIC=shared  
                 SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-null"  
         else  
                 SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-null"  
         fi  
 fi  
   
 if test "$ol_enable_passwd" != no ; then  if test "$ol_enable_passwd" != no ; then
         AC_DEFINE(SLAPD_PASSWD,1,[define to support PASSWD backend])          AC_DEFINE(SLAPD_PASSWD,1,[define to support PASSWD backend])
         BUILD_SLAPD=yes          BUILD_SLAPD=yes
Line 2638  if test "$ol_enable_passwd" != no ; then Line 2608  if test "$ol_enable_passwd" != no ; then
                         [define to support dynamic PASSWD backend])                          [define to support dynamic PASSWD backend])
                 BUILD_PASSWD=mod                  BUILD_PASSWD=mod
                 BUILD_PASSWD_DYNAMIC=shared                  BUILD_PASSWD_DYNAMIC=shared
                   SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-passwd/back_passwd.la"
                 SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-passwd"                  SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-passwd"
         else          else
                 SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-passwd"                  SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-passwd"
Line 2653  if test "$ol_link_perl" != no ; then Line 2624  if test "$ol_link_perl" != no ; then
                         [define to support dynamic PERL backend])                          [define to support dynamic PERL backend])
                 BUILD_PERL=mod                  BUILD_PERL=mod
                 BUILD_PERL_DYNAMIC=shared                  BUILD_PERL_DYNAMIC=shared
                   SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-perl/back_perl.la"
                 SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-perl"                  SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-perl"
         else          else
                 SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-perl"                  SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-perl"
Line 2660  if test "$ol_link_perl" != no ; then Line 2632  if test "$ol_link_perl" != no ; then
 fi  fi
   
 if test "$ol_enable_shell" != no ; then  if test "$ol_enable_shell" != no ; then
         if test "$ol_link_thread" != no ; then  
                 AC_MSG_WARN([Use of --without-threads is recommended with back-shell])  
         fi  
         AC_DEFINE(SLAPD_SHELL,1,[define to support SHELL backend])          AC_DEFINE(SLAPD_SHELL,1,[define to support SHELL backend])
         BUILD_SLAPD=yes          BUILD_SLAPD=yes
         BUILD_SHELL=yes          BUILD_SHELL=yes
Line 2671  if test "$ol_enable_shell" != no ; then Line 2640  if test "$ol_enable_shell" != no ; then
                         [define to support dynamic SHELL backend])                          [define to support dynamic SHELL backend])
                 BUILD_SHELL=mod                  BUILD_SHELL=mod
                 BUILD_SHELL_DYNAMIC=shared                  BUILD_SHELL_DYNAMIC=shared
                   SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-shell/back_shell.la"
                 SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-shell"                  SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-shell"
         else          else
                 SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-shell"                  SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-shell"
         fi          fi
 fi  fi
   
   if test "$ol_enable_tcl" != no ; then
           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"
                   SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-tcl"
           else
                   SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-tcl"
           fi
   fi
   
 if test "$ol_link_sql" != no ; then  if test "$ol_link_sql" != no ; then
         AC_DEFINE(SLAPD_SQL,1,[define to support SQL backend])          AC_DEFINE(SLAPD_SQL,1,[define to support SQL backend])
         BUILD_SLAPD=yes          BUILD_SLAPD=yes
Line 2686  if test "$ol_link_sql" != no ; then Line 2672  if test "$ol_link_sql" != no ; then
                         [define to support dynamic SQL backend])                          [define to support dynamic SQL backend])
                 BUILD_SQL=mod                  BUILD_SQL=mod
                 BUILD_SQL_DYNAMIC=shared                  BUILD_SQL_DYNAMIC=shared
                   SLAPD_MODULES_LIST="$SLAPD_MODULES_LIST -dlopen \$(SLAP_DIR)back-sql/back_sql.la"
                 SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-sql"                  SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-sql"
         else          else
                 SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-sql"                  SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-sql"
Line 2712  dnl Line 2699  dnl
 if test "$ac_cv_mingw32" = yes ; then  if test "$ac_cv_mingw32" = yes ; then
         PLAT=NT          PLAT=NT
         SLAPD_MODULES_LDFLAGS=          SLAPD_MODULES_LDFLAGS=
           SLAPD_MODULES_LIST=
 else  else
         PLAT=UNIX          PLAT=UNIX
 fi  fi
   
 if test -z "$SLAPD_STATIC_BACKENDS"; then  
         SLAPD_NO_STATIC='#'  
 else  
         SLAPD_NO_STATIC=  
 fi  
   
 AC_SUBST(LIBSRCS)  AC_SUBST(LIBSRCS)
 AC_SUBST(PLAT)  AC_SUBST(PLAT)
 AC_SUBST(BUILD_LIBS_DYNAMIC)  AC_SUBST(BUILD_LIBS_DYNAMIC)
Line 2733  AC_SUBST(BUILD_SLAPD) Line 2715  AC_SUBST(BUILD_SLAPD)
   AC_SUBST(BUILD_LDBM)    AC_SUBST(BUILD_LDBM)
   AC_SUBST(BUILD_META)    AC_SUBST(BUILD_META)
   AC_SUBST(BUILD_MONITOR)    AC_SUBST(BUILD_MONITOR)
   AC_SUBST(BUILD_NULL)  
   AC_SUBST(BUILD_PASSWD)    AC_SUBST(BUILD_PASSWD)
   AC_SUBST(BUILD_PERL)    AC_SUBST(BUILD_PERL)
   AC_SUBST(BUILD_SHELL)    AC_SUBST(BUILD_SHELL)
   AC_SUBST(BUILD_SQL)    AC_SUBST(BUILD_SQL)
     AC_SUBST(BUILD_TCL)
   AC_SUBST(BUILD_BDB_DYNAMIC)    AC_SUBST(BUILD_BDB_DYNAMIC)
   AC_SUBST(BUILD_DNSSRV_DYNAMIC)    AC_SUBST(BUILD_DNSSRV_DYNAMIC)
   AC_SUBST(BUILD_LDAP_DYNAMIC)    AC_SUBST(BUILD_LDAP_DYNAMIC)
   AC_SUBST(BUILD_LDBM_DYNAMIC)    AC_SUBST(BUILD_LDBM_DYNAMIC)
   AC_SUBST(BUILD_META_DYNAMIC)    AC_SUBST(BUILD_META_DYNAMIC)
   AC_SUBST(BUILD_MONITOR_DYNAMIC)    AC_SUBST(BUILD_MONITOR_DYNAMIC)
   AC_SUBST(BUILD_NULL_DYNAMIC)  
   AC_SUBST(BUILD_PASSWD_DYNAMIC)    AC_SUBST(BUILD_PASSWD_DYNAMIC)
   AC_SUBST(BUILD_PERL_DYNAMIC)    AC_SUBST(BUILD_PERL_DYNAMIC)
   AC_SUBST(BUILD_SHELL_DYNAMIC)    AC_SUBST(BUILD_SHELL_DYNAMIC)
   AC_SUBST(BUILD_SQL_DYNAMIC)    AC_SUBST(BUILD_SQL_DYNAMIC)
     AC_SUBST(BUILD_TCL_DYNAMIC)
 AC_SUBST(BUILD_SLURPD)  AC_SUBST(BUILD_SLURPD)
   
   AC_SUBST(LDBM_LIB)
   
 AC_SUBST(LDAP_LIBS)  AC_SUBST(LDAP_LIBS)
 AC_SUBST(LDIF_LIBS)  AC_SUBST(LDIF_LIBS)
 AC_SUBST(SLAPD_LIBS)  AC_SUBST(SLAPD_LIBS)
Line 2759  AC_SUBST(LDBM_LIBS) Line 2743  AC_SUBST(LDBM_LIBS)
 AC_SUBST(LTHREAD_LIBS)  AC_SUBST(LTHREAD_LIBS)
 AC_SUBST(LUTIL_LIBS)  AC_SUBST(LUTIL_LIBS)
 AC_SUBST(WRAP_LIBS)  AC_SUBST(WRAP_LIBS)
   AC_SUBST(MOD_TCL_LIB)
   
 AC_SUBST(SLAPD_MODULES_CPPFLAGS)  AC_SUBST(SLAPD_MODULES_CPPFLAGS)
 AC_SUBST(SLAPD_MODULES_LDFLAGS)  AC_SUBST(SLAPD_MODULES_LDFLAGS)
   AC_SUBST(SLAPD_MODULES_LIST)
   
 AC_SUBST(SLAPD_NO_STATIC)  
 AC_SUBST(SLAPD_STATIC_BACKENDS)  AC_SUBST(SLAPD_STATIC_BACKENDS)
 AC_SUBST(SLAPD_DYNAMIC_BACKENDS)  AC_SUBST(SLAPD_DYNAMIC_BACKENDS)
   
Line 2804  doc/man/man3/Makefile:build/top.mk:doc/m Line 2789  doc/man/man3/Makefile:build/top.mk:doc/m
 doc/man/man5/Makefile:build/top.mk:doc/man/man5/Makefile.in:build/man.mk \  doc/man/man5/Makefile:build/top.mk:doc/man/man5/Makefile.in:build/man.mk \
 doc/man/man8/Makefile:build/top.mk:doc/man/man8/Makefile.in:build/man.mk \  doc/man/man8/Makefile:build/top.mk:doc/man/man8/Makefile.in:build/man.mk \
 clients/Makefile:build/top.mk:clients/Makefile.in:build/dir.mk \  clients/Makefile:build/top.mk:clients/Makefile.in:build/dir.mk \
   clients/finger/Makefile:build/top.mk:clients/finger/Makefile.in:build/rules.mk \
   clients/mail500/Makefile:build/top.mk:clients/mail500/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 \  clients/tools/Makefile:build/top.mk:clients/tools/Makefile.in:build/rules.mk \
 include/Makefile:build/top.mk:include/Makefile.in \  include/Makefile:build/top.mk:include/Makefile.in \
 libraries/Makefile:build/top.mk:libraries/Makefile.in:build/dir.mk      \  libraries/Makefile:build/top.mk:libraries/Makefile.in:build/dir.mk      \
Line 2824  servers/slapd/back-ldap/Makefile:build/t Line 2813  servers/slapd/back-ldap/Makefile:build/t
 servers/slapd/back-ldbm/Makefile:build/top.mk:servers/slapd/back-ldbm/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-meta/Makefile:build/top.mk:servers/slapd/back-meta/Makefile.in:build/mod.mk \  servers/slapd/back-meta/Makefile:build/top.mk:servers/slapd/back-meta/Makefile.in:build/mod.mk \
 servers/slapd/back-monitor/Makefile:build/top.mk:servers/slapd/back-monitor/Makefile.in:build/mod.mk \  servers/slapd/back-monitor/Makefile:build/top.mk:servers/slapd/back-monitor/Makefile.in:build/mod.mk \
 servers/slapd/back-null/Makefile:build/top.mk:servers/slapd/back-null/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-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-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-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-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/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/slapd/tools/Makefile:build/top.mk:servers/slapd/tools/Makefile.in \
 servers/slurpd/Makefile:build/top.mk:servers/slurpd/Makefile.in:build/srv.mk \  servers/slurpd/Makefile:build/top.mk:servers/slurpd/Makefile.in:build/srv.mk \

Removed from v.1.408.2.38  
changed lines
  Added in v.1.409


______________
© Copyright 1998-2020, OpenLDAP Foundation, info@OpenLDAP.org