Diff for /configure.in between versions 1.478 and 1.478.2.20

version 1.478, 2003/05/23 04:27:39 version 1.478.2.20, 2004/06/29 21:55:43
Line 1 Line 1
 dnl $OpenLDAP: pkg/ldap/configure.in,v 1.477 2003/05/23 03:27:34 kurt Exp $  dnl $OpenLDAP: pkg/ldap/configure.in,v 1.478.2.19 2004/04/16 15:21:40 kurt Exp $
   dnl This work is part of OpenLDAP Software <http://www.openldap.org/>.
   dnl
   dnl Copyright 1998-2004 The OpenLDAP Foundation.
   dnl All rights reserved.
 dnl  dnl
 dnl Copyright 1998-2003 The OpenLDAP Foundation.  All Rights Reserved.  
 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
 dnl Public License.  A copy of this license is available at  dnl Public License.
 dnl http://www.OpenLDAP.org/license.html or in file LICENSE in the  dnl
 dnl top-level directory of the distribution.  dnl A copy of this license is available in the file LICENSE in the
   dnl top-level directory of the distribution or, alternatively, at
   dnl <http://www.OpenLDAP.org/license.html>.
 dnl  dnl
 dnl ----------------------------------------------------------------  dnl ----------------------------------------------------------------
   dnl
 dnl Redefine AC_INIT_BINSH to provide RCS IDs and copyright notice  dnl Redefine AC_INIT_BINSH to provide RCS IDs and copyright notice
 dnl at top of generated configure script.  Prints simple copyright.  dnl at top of generated configure script.  Prints simple copyright.
 define([AC_INIT_BINSH],  define([AC_INIT_BINSH],
 [[#! /bin/sh  [[#! /bin/sh
 # $]OpenLDAP[$  # $]OpenLDAP[$
 # from] translit([$OpenLDAP: pkg/ldap/configure.in,v 1.477 2003/05/23 03:27:34 kurt Exp $], $")] [  # from] translit([$OpenLDAP: pkg/ldap/configure.in,v 1.542 2004/06/18 01:56:35 kurt Exp $], $")] [
   
 # Copyright 1998-2003 The OpenLDAP Foundation.  All Rights Reserved.  # This work is part of OpenLDAP Software <http://www.openldap.org/>.
 #   #
   # Copyright 1998-2004 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
 # Public License.  A copy of this license is available at  # Public License.
 # http://www.OpenLDAP.org/license.html or in file LICENSE in the  #
 # top-level directory of the distribution.  # A copy of this license is available in the file LICENSE in the
   # top-level directory of the distribution or, alternatively, at
   # <http://www.OpenLDAP.org/license.html>.
   
 echo "Copyright 1998-2003 The OpenLDAP Foundation,  All Rights Reserved."  echo "Copyright 1998-2004 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 85  AC_DEFINE_UNQUOTED(LDAP_VENDOR_VERSION_M Line 95  AC_DEFINE_UNQUOTED(LDAP_VENDOR_VERSION_M
 AC_DEFINE_UNQUOTED(LDAP_VENDOR_VERSION_MINOR,$OL_MINOR,Minor)  AC_DEFINE_UNQUOTED(LDAP_VENDOR_VERSION_MINOR,$OL_MINOR,Minor)
 AC_DEFINE_UNQUOTED(LDAP_VENDOR_VERSION_PATCH,$OL_PATCH,Patch)  AC_DEFINE_UNQUOTED(LDAP_VENDOR_VERSION_PATCH,$OL_PATCH,Patch)
   
 OPENLDAP_LIBVERSION=$OL_API_LIB  OPENLDAP_LIBRELEASE=$OL_API_LIB_RELEASE
   AC_SUBST(OPENLDAP_LIBRELEASE)dnl
   
   OPENLDAP_LIBVERSION=$OL_API_LIB_VERSION
 AC_SUBST(OPENLDAP_LIBVERSION)dnl  AC_SUBST(OPENLDAP_LIBVERSION)dnl
   
 OPENLDAP_RELEASE_DATE="$OL_RELEASE_DATE"  OPENLDAP_RELEASE_DATE="$OL_RELEASE_DATE"
 AC_SUBST(OPENLDAP_RELEASE_DATE)dnl  AC_SUBST(OPENLDAP_RELEASE_DATE)dnl
   
 dnl We use autoconf features new to 2.13.  dnl We use autoconf features new to 2.13.  Later versions like won't work.
 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.3 should be installed.
 AC_PREREQ(2.13)dnl Required Autoconf version  AC_PREREQ(2.13)dnl Required Autoconf version
   
 AC_CONFIG_HEADER(include/portable.h include/ldap_features.h include/lber_types.h)dnl  AC_CONFIG_HEADER(include/portable.h include/ldap_features.h include/lber_types.h)dnl
Line 140  dnl OL_ARG_ENABLE(kbind,[  --enable-kbin Line 153  dnl OL_ARG_ENABLE(kbind,[  --enable-kbin
 ol_enable_kbind=${ol_enable_kbind-no}  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(x_compile,[  --enable-x-compile     enable cross compiling],  
         no, [yes no])dnl  
   
 dnl ----------------------------------------------------------------  dnl ----------------------------------------------------------------
 dnl General "with" options  dnl General "with" options
Line 151  OL_ARG_WITH(cyrus_sasl,[  --with-cyrus-s Line 162  OL_ARG_WITH(cyrus_sasl,[  --with-cyrus-s
         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(3) URL support],
         auto, [auto yes no] )          auto, [auto yes no] )
 OL_ARG_WITH(kerberos,[  --with-kerberos   with Kerberos support],  dnl     OL_ARG_WITH(kerberos,[  --with-kerberos   with Kerberos support],
         auto, [auto k5 k5only k425 kth k4 afs yes no])  dnl             auto, [auto k5 k5only k425 kth k4 afs yes no])
   ol_with_kerberos=${ol_with_kerberos-auto}
 OL_ARG_WITH(threads,[  --with-threads     with threads],  OL_ARG_WITH(threads,[  --with-threads     with threads],
         auto, [auto nt posix mach pth lwp yes no manual] )          auto, [auto nt posix mach pth lwp yes no manual] )
 OL_ARG_WITH(tls,[  --with-tls             with TLS/SSL support],  OL_ARG_WITH(tls,[  --with-tls             with TLS/SSL support],
Line 172  OL_ARG_ENABLE(slapd,[  --enable-slapd Line 184  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
 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_enable_multimaster=${ol_enable_multimaster-no}
 OL_ARG_ENABLE(rewrite,[    --enable-rewrite       enable DN rewriting in back-ldap and back-meta], no)dnl  OL_ARG_ENABLE(rewrite,[    --enable-rewrite       enable DN rewriting in back-ldap and the rwm overlay], auto)dnl
 OL_ARG_ENABLE(rlookups,[    --enable-rlookups     enable reverse lookups of client hostnames], no)dnl  OL_ARG_ENABLE(rlookups,[    --enable-rlookups     enable reverse lookups of client hostnames], no)dnl
 OL_ARG_ENABLE(slapi,[    --enable-slapi        enable installation of slapi library], no)dnl  OL_ARG_ENABLE(slapi,[    --enable-slapi        enable SLAPI support (experimental)], 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 ----------------------------------------------------------------
 dnl SLAPD Backend options  dnl SLAPD Backend Options
 OL_ARG_ENABLE(bdb,[    --enable-bdb       enable Berkeley DB backend], yes)dnl  Backends="bdb dnssrv hdb ldap ldbm meta monitor null \
 OL_ARG_WITH(bdb_module,[    --with-bdb-module     module type static|dynamic], static,          passwd perl shell sql"
         [static dynamic])  
 OL_ARG_ENABLE(dnssrv,[    --enable-dnssrv         enable dnssrv backend], no)dnl  AC_ARG_WITH(xxslapoverlays,[
 OL_ARG_WITH(dnssrv_module,[    --with-dnssrv-module  module type static|dynamic], static,  SLAPD Backend Options:])
         [static dynamic])  
 OL_ARG_ENABLE(hdb,[    --enable-hdb       enable Hierarchical DB backend], no)dnl  OL_ARG_ENABLE(bdb,[    --enable-bdb       enable Berkeley DB backend no|yes|mod], yes, [no yes mod])dnl
 OL_ARG_WITH(hdb_module,[    --with-hdb-module     module type static|dynamic], static,  OL_ARG_ENABLE(dnssrv,[    --enable-dnssrv         enable dnssrv backend no|yes|mod], no, [no yes mod])dnl
         [static dynamic])  OL_ARG_ENABLE(hdb,[    --enable-hdb       enable Hierarchical DB backend no|yes|mod], no, [no yes mod])dnl
 OL_ARG_ENABLE(ldap,[    --enable-ldap     enable ldap backend], no)dnl  OL_ARG_ENABLE(ldap,[    --enable-ldap     enable ldap backend no|yes|mod], no, [no yes mod])dnl
 OL_ARG_WITH(ldap_module,[    --with-ldap-module   module type static|dynamic], static,  OL_ARG_ENABLE(ldbm,[    --enable-ldbm     enable ldbm backend no|yes|mod], no, [no yes mod])dnl
         [static dynamic])  OL_ARG_WITH(ldbm_api,[      --with-ldbm-api     with LDBM API auto|berkeley|bcompat|mdbm|gdbm], auto,
 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,  
         [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_type,[      --with-ldbm-type     use LDBM type auto|btree|hash], auto,
         [static dynamic])  
 OL_ARG_WITH(ldbm_type,[    --with-ldbm-type       use LDBM type auto|btree|hash], 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|yes|mod], no, [no yes mod])dnl
 OL_ARG_WITH(meta_module,[    --with-meta-module   module type static|dynamic], static,  OL_ARG_ENABLE(monitor,[    --enable-monitor       enable monitor backend no|yes|mod], yes, [no yes mod])dnl
         [static dynamic])  OL_ARG_ENABLE(null,[    --enable-null     enable null backend no|yes|mod], no, [no yes mod])dnl
 OL_ARG_ENABLE(monitor,[    --enable-monitor       enable monitor backend], no)dnl  OL_ARG_ENABLE(passwd,[    --enable-passwd         enable passwd backend no|yes|mod], no, [no yes mod])dnl
 OL_ARG_WITH(monitor_module,[    --with-monitor-module module type static|dynamic], static,  OL_ARG_ENABLE(perl,[    --enable-perl     enable perl backend no|yes|mod], no, [no yes mod])dnl
         [static dynamic])  OL_ARG_ENABLE(shell,[    --enable-shell   enable shell backend no|yes|mod], no, [no yes mod])dnl
 OL_ARG_ENABLE(null,[    --enable-null     enable null backend], no)dnl  OL_ARG_ENABLE(sql,[    --enable-sql       enable sql backend no|yes|mod], no, [no yes mod])dnl
 OL_ARG_WITH(null_module,[    --with-null-module   module type static|dynamic], static,  
         [static dynamic])  dnl ----------------------------------------------------------------
 OL_ARG_ENABLE(passwd,[    --enable-passwd         enable passwd backend], no)dnl  dnl SLAPD Overlay Options
 OL_ARG_WITH(passwd_module,[    --with-passwd-module  module type static|dynamic], static,  Overlays="dyngroup proxycache"
         [static dynamic])  
 OL_ARG_ENABLE(perl,[    --enable-perl     enable perl backend], no)dnl  AC_ARG_WITH(xxslapoverlays,[
 OL_ARG_WITH(perl_module,[    --with-perl-module   module type static|dynamic], static,  SLAPD Overlay Options:])
         [static dynamic])  
 OL_ARG_ENABLE(shell,[    --enable-shell   enable shell backend], no)dnl  OL_ARG_ENABLE(dyngroup,[    --enable-dyngroup     Dynamic Group overlay no|yes|mod], no,
 OL_ARG_WITH(shell_module,[    --with-shell-module         module type static|dynamic], static,          [no yes mod])
         [static dynamic])  OL_ARG_ENABLE(proxycache,[    --enable-proxycache         Proxy Cache overlay no|yes|mod], no,
 OL_ARG_ENABLE(sql,[    --enable-sql       enable sql backend], no)dnl          [no yes mod])
 OL_ARG_WITH(sql_module,[    --with-sql-module     module type static|dynamic], 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|dynamic], static,  
         [static dynamic])  
   
 dnl ----------------------------------------------------------------  dnl ----------------------------------------------------------------
 dnl SLURPD OPTIONS  dnl SLURPD OPTIONS
Line 251  if test $ol_enable_slapd = no ; then Line 253  if test $ol_enable_slapd = no ; then
         if test $ol_enable_slapi = yes ; then          if test $ol_enable_slapi = yes ; then
                 AC_MSG_WARN([slapd disabled, ignoring --enable-slapi argument])                  AC_MSG_WARN([slapd disabled, ignoring --enable-slapi argument])
         fi          fi
         if test $ol_enable_bdb = yes ; then          for i in $Backends; do
                 AC_MSG_WARN([slapd disabled, ignoring --enable-bdb argument])                  eval "ol_tmp=\$ol_enable_$i"
         fi                  if test $ol_tmp != no ; then
         if test $ol_enable_dnssrv = yes ; then                          AC_MSG_WARN([slapd disabled, ignoring --enable-$i argument])
                 AC_MSG_WARN([slapd disabled, ignoring --enable-dnssrv argument])                          eval "ol_enable_$i=no"
         fi                  fi
         if test $ol_enable_hdb = yes ; then          done
                 AC_MSG_WARN([slapd disabled, ignoring --enable-hdb 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])  
         fi  
         if test $ol_enable_meta = yes ; then  
                 AC_MSG_WARN([slapd disabled, ignoring --enable-meta argument])  
         fi  
         if test $ol_enable_monitor = yes ; then  
                 AC_MSG_WARN([slapd disabled, ignoring --enable-monitor argument])  
         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  
                 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])  
         fi  
         if test $ol_enable_shell = yes ; then  
                 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])  
         fi  
         if test $ol_enable_sql = yes ; then  
                 AC_MSG_WARN([slapd disabled, ignoring --enable-sql argument])  
         fi  
         if test $ol_enable_modules = yes ; then          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
Line 311  if test $ol_enable_slapd = no ; then Line 281  if test $ol_enable_slapd = no ; then
         if test $ol_with_ldbm_type != auto ; then          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          fi
         if test $ol_with_bdb_module != static ; then  
                 AC_MSG_WARN([slapd disabled, ignoring --with-bdb-module 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_hdb_module != static ; then  
                 AC_MSG_WARN([slapd disabled, ignoring --with-hdb-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_meta_module != static ; then  
                 AC_MSG_WARN([slapd disabled, ignoring --with-meta-module argument])  
         fi  
         if test $ol_with_monitor_module != static ; then  
                 AC_MSG_WARN([slapd disabled, ignoring --with-monitor-module argument])  
         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  
                 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          if test $ol_enable_slurpd = yes ; then
                 AC_MSG_ERROR([slurpd requires slapd])                  AC_MSG_ERROR([slurpd requires slapd])
         fi          fi
         if test $ol_enable_rewrite = yes ; then          if test $ol_enable_rewrite = yes ; then
                 AC_MSG_WARN([slapd disabled, ignoring --enable-rewrite argument])                  AC_MSG_WARN([slapd disabled, ignoring --enable-rewrite argument])
         fi          fi
           dnl overlays
           for i in $Overlays; do
                   eval "ol_tmp=\$ol_enable_$i"
                   if test $ol_tmp != no ; then
                           AC_MSG_WARN([slapd disabled, ignoring --enable-$i argument])
                           eval "ol_enable_$i=no"
                   fi
           done
   
         # force settings to no          # force settings to no
         ol_enable_slapi=no          ol_enable_slapi=no
         ol_enable_bdb=no  
         ol_enable_dnssrv=no  
         ol_enable_hdb=no  
         ol_enable_ldap=no  
         ol_enable_ldbm=no  
         ol_enable_meta=no  
         ol_enable_monitor=no  
         ol_enable_null=no  
         ol_enable_passwd=no  
         ol_enable_perl=no  
         ol_enable_shell=no  
         ol_enable_tcl=no  
         ol_enable_sql=no  
   
         ol_enable_modules=no          ol_enable_modules=no
         ol_enable_multimaster=no          ol_enable_multimaster=no
         ol_enable_rlookups=no          ol_enable_rlookups=no
         ol_enable_aci=no          ol_enable_aci=no
         ol_enable_wrappers=no          ol_enable_wrappers=no
         ol_enable_dynamic=no  
   
         ol_with_ldbm_api=no          ol_with_ldbm_api=no
         ol_with_ldbm_type=no          ol_with_ldbm_type=no
   
         ol_with_bdb_module=static  
         ol_with_dnssrv_module=static  
         ol_with_hdb_module=static  
         ol_with_ldap_module=static  
         ol_with_ldbm_module=static  
         ol_with_meta_module=static  
         ol_with_monitor_module=static  
         ol_with_null_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          ol_enable_slurpd=no
   
         ol_enable_rewrite=no          ol_enable_rewrite=no
Line 412  elif test $ol_enable_ldbm = no ; then Line 323  elif test $ol_enable_ldbm = no ; then
                 AC_MSG_WARN([LDBM disabled, ignoring --with-ldbm-type argument])                  AC_MSG_WARN([LDBM disabled, ignoring --with-ldbm-type argument])
         fi          fi
   
         if test $ol_with_ldbm_module != static ; then  
                 AC_MSG_WARN([LDBM disabled, ignoring --with-ldbm-module argument])  
         fi  
   
         if test $ol_enable_modules != yes -a \          if test $ol_enable_modules != yes -a \
                 $ol_enable_bdb = no -a \                  $ol_enable_bdb = no -a \
                 $ol_enable_dnssrv = no -a \                  $ol_enable_dnssrv = no -a \
Line 427  elif test $ol_enable_ldbm = no ; then Line 334  elif test $ol_enable_ldbm = no ; then
                 $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 -a \                  $ol_enable_sql = no ; then
                 $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 440  elif test $ol_enable_ldbm = no ; then Line 346  elif test $ol_enable_ldbm = no ; then
   
         ol_with_ldbm_api=no          ol_with_ldbm_api=no
         ol_with_ldbm_type=no          ol_with_ldbm_type=no
         ol_with_ldbm_module=static  
   
         if test $ol_enable_bdb != no -o $ol_enable_hdb != no; then          if test $ol_enable_bdb != no -o $ol_enable_hdb != no; then
                 ol_with_ldbm_api=berkeley                  ol_with_ldbm_api=berkeley
Line 477  else Line 382  else
         fi          fi
 fi  fi
   
   if test $ol_enable_meta = yes -a $ol_enable_ldap = no ; then
           AC_MSG_ERROR([--enable-meta requires --enable-ldap])
   fi
   
 if test $ol_enable_slurpd = yes ; then  if test $ol_enable_slurpd = yes ; then
         dnl SLURPD was specifically enabled          dnl SLURPD was specifically enabled
         if test $ol_with_threads = no ; then          if test $ol_with_threads = no ; then
Line 490  if test $ol_enable_lmpasswd = yes ; then Line 399  if test $ol_enable_lmpasswd = yes ; then
         fi          fi
 fi  fi
   
 if test $ol_enable_kbind = yes -o $ol_enable_kpasswd = yes ; then  if test $ol_enable_kbind = yes ; then
         if test $ol_with_kerberos = no ; then          if test $ol_with_kerberos = no ; then
                 AC_MSG_ERROR([options require --with-kerberos])                  AC_MSG_ERROR([options require --with-kerberos])
         elif test $ol_with_kerberos = auto ; then          elif test $ol_with_kerberos = auto ; then
                 ol_with_kerberos=yes                  ol_with_kerberos=yes
         fi          fi
   
 elif test $ol_enable_kbind = no -o $ol_enable_kpasswd = no ; then  elif test $ol_enable_kbind = no ; then
         if test $ol_with_kerberos = auto ; then          if test $ol_with_kerberos = auto ; then
                 ol_with_kerberos=no                  ol_with_kerberos=no
         elif test $ol_with_kerberos != no ; then          elif test $ol_with_kerberos != no ; then
Line 518  AC_MSG_RESULT(done) Line 427  AC_MSG_RESULT(done)
 dnl ----------------------------------------------------------------  dnl ----------------------------------------------------------------
 dnl Initialize vars  dnl Initialize vars
 LDAP_LIBS=  LDAP_LIBS=
 LDIF_LIBS=  
 LDBM_LIBS=  LDBM_LIBS=
 LTHREAD_LIBS=  LTHREAD_LIBS=
 LUTIL_LIBS=  LUTIL_LIBS=
Line 546  BUILD_PASSWD=no Line 454  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_DYNGROUP=no
 BUILD_DNSSRV_DYNAMIC=static  BUILD_PROXYCACHE=no
 BUILD_HDB_DYNAMIC=static  
 BUILD_LDAP_DYNAMIC=static  SLAPD_DYNAMIC_OVERLAYS=
 BUILD_LDBM_DYNAMIC=static  
 BUILD_META_DYNAMIC=static  
 BUILD_MONITOR_DYNAMIC=static  
 BUILD_NULL_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_LDFLAGS=
 SLAPD_MODULES_CPPFLAGS=  SLAPD_MODULES_CPPFLAGS=
Line 576  SLAPD_SQL_LDFLAGS= Line 474  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=
 SASL_LIBS=  SASL_LIBS=
 TERMCAP_LIBS=  
 TLS_LIBS=  TLS_LIBS=
 MODULES_LIBS=  MODULES_LIBS=
 SLAPI_LIBS=  SLAPI_LIBS=
Line 679  if test $ol_enable_perl != no ; then Line 575  if test $ol_enable_perl != no ; then
   
         else          else
                 PERL_CPPFLAGS="`$PERLBIN -MExtUtils::Embed -e ccopts`"                  PERL_CPPFLAGS="`$PERLBIN -MExtUtils::Embed -e ccopts`"
                 if test x"$ol_with_perl_module" = "xstatic" ; then                  PERL_LDFLAGS="`$PERLBIN -MExtUtils::Embed -e ldopts|sed -e 's/ -lc / /' -e 's/ -lc$//'`"
                         SLAPD_PERL_LDFLAGS="`$PERLBIN -MExtUtils::Embed -e ldopts|sed -e s/-lc//`"  
                   if test x"$ol_enable_perl" = "xyes" ; then
                           SLAPD_PERL_LDFLAGS="$PERL_LDFLAGS"
                 else                  else
                         MOD_PERL_LDFLAGS="`$PERLBIN -MExtUtils::Embed -e ldopts|sed -e s/-lc//`"                          MOD_PERL_LDFLAGS="$PERL_LDFLAGS"
                 fi                  fi
                 dnl should check perl version                  dnl should check perl version
                 ol_link_perl=yes                  ol_link_perl=yes
Line 692  fi Line 590  fi
 AC_PROG_CPP  AC_PROG_CPP
   
 dnl ----------------------------------------------------------------  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.])  
   
 elif test $cross_compiling = no -a $ol_enable_x_compile = yes; then  
         AC_MSG_WARN([programs compiled here do run here...])  
         AC_MSG_ERROR([  if not cross compiling, use --disable-x-compile.])  
   
 elif test $cross_compiling = yes -a $ol_enable_x_compile = no; then  
         AC_MSG_WARN([programs compiled here do not run here...])  
         AC_MSG_ERROR([  if cross compiling,  add --enable-x-compile.])  
 fi  
   
 dnl ----------------------------------------------------------------  
 dnl Checks for UNIX Variants  dnl Checks for UNIX Variants
 dnl AC_AIX  dnl AC_AIX
 dnl AC_ISC_POSIX  dnl AC_ISC_POSIX
Line 774  if test $ol_enable_modules != no ; then Line 658  if test $ol_enable_modules != no ; then
                 AC_MSG_ERROR([could not locate libtool -lltdl])                  AC_MSG_ERROR([could not locate libtool -lltdl])
         fi          fi
         ol_link_modules=yes          ol_link_modules=yes
   
 else  else
         ol_with_bdb_module=static          for i in $Backends; do
         ol_with_dnssrv_module=static                  eval "ol_tmp=\$ol_enable_$i"
         ol_with_hdb_module=static                  if test $ol_tmp = mod ; then
         ol_with_ldap_module=static                          AC_MSG_WARN([building static $i backend])
         ol_with_ldbm_module=static                          eval "ol_enable_$i=yes"
         ol_with_meta_module=static                  fi
         ol_with_monitor_module=static          done
         ol_with_null_module=static          for i in $Overlays; do
         ol_with_passwd_module=static                  eval "ol_tmp=\$ol_enable_$i"
         ol_with_perl_module=static                  if test $ol_tmp = mod ; then
         ol_with_shell_module=static                          AC_MSG_WARN([building static $i overlay])
         ol_with_tcl_module=static                          eval "ol_enable_$i=yes"
         ol_with_sql_module=static                  fi
           done
 fi  fi
   
 dnl ----------------------------------------------------------------  dnl ----------------------------------------------------------------
Line 810  AC_CHECK_HEADERS( \ Line 696  AC_CHECK_HEADERS( \
         arpa/inet.h             \          arpa/inet.h             \
         arpa/nameser.h  \          arpa/nameser.h  \
         assert.h                \          assert.h                \
           bits/types.h    \
         conio.h                 \          conio.h                 \
         crypt.h                 \          crypt.h                 \
         direct.h                \          direct.h                \
Line 860  AC_CHECK_HEADERS( \ Line 747  AC_CHECK_HEADERS( \
 dnl ----------------------------------------------------------------  dnl ----------------------------------------------------------------
 dnl Checks for libraries  dnl Checks for libraries
   
 AC_CHECK_FUNC(dlopen, :, [AC_CHECK_LIB(dl, dlopen)])  
   
 dnl HP-UX requires -lV3  dnl HP-UX requires -lV3
 dnl this is not needed on newer versions of HP-UX  dnl this is not needed on newer versions of HP-UX
 AC_CHECK_LIB(V3, sigset)  AC_CHECK_LIB(V3, sigset)
Line 869  AC_CHECK_LIB(V3, sigset) Line 754  AC_CHECK_LIB(V3, sigset)
 dnl The following is INTENTIONALLY scripted out because shell does not  dnl The following is INTENTIONALLY scripted out because shell does not
 dnl support variable names with the '@' character, which is what  dnl support variable names with the '@' character, which is what
 dnl autoconf would try to generate if one merely used AC_SEARCH_LIBS  dnl autoconf would try to generate if one merely used AC_SEARCH_LIBS
 AC_MSG_CHECKING(for winsock)  if test "$ac_cv_header_winsock_h" = yes; then
   AC_CACHE_CHECK([for winsock], [ol_cv_winsock],
 save_LIBS="$LIBS"  save_LIBS="$LIBS"
 for curlib in ws2_32 wsock32; do  for curlib in ws2_32 wsock32; do
         LIBS="$LIBS -l$curlib"          LIBS="$LIBS -l$curlib"
         AC_TRY_LINK([          AC_TRY_LINK([#include <winsock.h>
                         char socket@12();  
                         char select@20();  
                         char closesocket@4();  
                         char gethostname@8();  
                         ],                          ],
                         [                          [
                         socket@12();                          socket(0,0,0);
                         select@20();                          select(0,NULL,NULL,NULL,NULL);
                         closesocket@4();                          closesocket(0);
                         gethostname@8();                          gethostname(NULL,0);
                         ],                          ],
                         have_winsock=yes, have_winsock=no)                          ol_cv_winsock=yes, ol_cv_winsock=no)
   
         if test $have_winsock = yes; then          if test $ol_cv_winsock = yes; then
                 AC_DEFINE(HAVE_WINSOCK, 1, [define if you have winsock])                  AC_DEFINE(HAVE_WINSOCK, 1, [define if you have winsock])
                 ac_cv_func_socket=yes                  ac_cv_func_socket=yes
                 ac_cv_func_select=yes                  ac_cv_func_select=yes
                 ac_cv_func_closesocket=yes                  ac_cv_func_closesocket=yes
                 ac_cv_func_gethostname=yes                  ac_cv_func_gethostname=yes
                 if test $curlib = ws2_32; then                  if test $curlib = ws2_32; then
                         have_winsock=winsock2                          ol_cv_winsock=winsock2
                         AC_DEFINE(HAVE_WINSOCK2, 1,                          AC_DEFINE(HAVE_WINSOCK2, 1,
                                   [define if you have winsock2])                                    [define if you have winsock2])
                 fi                  fi
                 break                  break
         fi          fi
         LIBS="$save_LIBS"          LIBS="$save_LIBS"
 done  done)
 AC_MSG_RESULT($have_winsock)  fi
   
 dnl Find socket()  dnl Find socket()
 dnl Likely combinations:  dnl Likely combinations:
Line 971  if test $have_uuid = no ; then Line 853  if test $have_uuid = no ; then
         save_LIBS="$LIBS"          save_LIBS="$LIBS"
         LIBS="$LIBS -lrpcrt4"          LIBS="$LIBS -lrpcrt4"
         AC_TRY_LINK([          AC_TRY_LINK([
                 char UuidCreate@4();                  int __stdcall UuidCreate(void *);
                 char UuidToStringA@8();                  int __stdcall UuidToStringA(void *,void **);
                 ],                  ],
                 [                  [
                 UuidCreate@4();                  UuidCreate(0);
                 UuidToStringA@8();                  UuidToStringA(0,0);
                 ],                  ],
                 need_rpcrt=yes, need_rpcrt=no)                  need_rpcrt=yes, need_rpcrt=no)
         if test $need_rpcrt = yes; then          if test $need_rpcrt = yes; then
Line 1017  if test $ac_cv_func_res_query = no ; the Line 899  if test $ac_cv_func_res_query = no ; the
         ac_cv_func_res_query=$ac_cv_lib_resolv___res_query          ac_cv_func_res_query=$ac_cv_lib_resolv___res_query
 fi  fi
   
   if test $ac_cv_func_res_query = no ; then 
           AC_CHECK_LIB(resolv, _res_9_query)
           ac_cv_func_res_query=$ac_cv_lib_resolv_res_9_query
   fi
   
 if test "$ac_cv_func_res_query" = yes ; then  if test "$ac_cv_func_res_query" = yes ; then
         AC_DEFINE(HAVE_RES_QUERY,1,          AC_DEFINE(HAVE_RES_QUERY,1,
                 [define if you have res_query()])                  [define if you have res_query()])
Line 1026  if test "$ac_cv_func_res_query" = yes ; Line 913  if test "$ac_cv_func_res_query" = yes ;
         fi          fi
 fi  fi
   
 if test "$ol_enable_dnssrv" = yes -a "$ol_link_dnssrv" = no ; then  if test "$ol_enable_dnssrv" != no -a "$ol_link_dnssrv" = no ; then
         AC_MSG_ERROR([DNSSRV requires res_query()])          AC_MSG_ERROR([DNSSRV requires res_query()])
 fi  fi
   
Line 1084  fi Line 971  fi
 dnl ----------------------------------------------------------------  dnl ----------------------------------------------------------------
 dnl Kerberos  dnl Kerberos
 ol_link_kbind=no  ol_link_kbind=no
 ol_link_kpasswd=no  
 ol_link_krb5=no  ol_link_krb5=no
 ol_link_krb4=no  ol_link_krb4=no
   
Line 1139  if test $ol_with_kerberos = yes -o $ol_w Line 1025  if test $ol_with_kerberos = yes -o $ol_w
                         AC_DEFINE(HAVE_KRB5, 1,                          AC_DEFINE(HAVE_KRB5, 1,
                                 [define if you have Kerberos V])                                  [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                          if test $ol_with_kerberos = k5only ; then
                                 ol_with_kerberos=found                                  ol_with_kerberos=found
                         fi                          fi
Line 1239  if test $ol_with_kerberos = yes -o $ol_w Line 1121  if test $ol_with_kerberos = yes -o $ol_w
         fi          fi
 fi  fi
   
 if test $ol_link_krb4 = yes -a $ol_enable_kpasswd != no ; then  
         ol_link_kpasswd=yes  
 fi  
   
 if test $ol_link_krb4 = yes -a $ol_enable_kbind != no ; then  if test $ol_link_krb4 = yes -a $ol_enable_kbind != no ; then
         ol_link_kbind=yes          ol_link_kbind=yes
   
Line 1307  else Line 1185  else
         AC_WARN([TLS data protection not supported!])          AC_WARN([TLS data protection not supported!])
 fi  fi
   
   WITH_TLS=no
 if test $ol_link_tls = yes ; then  if test $ol_link_tls = yes ; then
         AC_DEFINE(HAVE_TLS, 1, [define if you have TLS])          AC_DEFINE(HAVE_TLS, 1, [define if you have TLS])
           WITH_TLS=yes
   
 elif test $ol_with_tls = auto ; then  elif test $ol_with_tls = auto ; then
         AC_WARN([Could not locate TLS/SSL package])          AC_WARN([Could not locate TLS/SSL package])
Line 1967  elif test $ol_enable_bdb != no -a $ol_li Line 1847  elif test $ol_enable_bdb != no -a $ol_li
         if test $ol_cv_bdb_compat = yes ; then          if test $ol_cv_bdb_compat = yes ; then
                 ol_enable_bdb=yes                  ol_enable_bdb=yes
         elif test $ol_enable_bdb = yes ; then          elif test $ol_enable_bdb = yes ; then
                 AC_MSG_ERROR(BDB: BerkeleyDB version incompatible)                  AC_MSG_ERROR([BDB: BerkeleyDB version incompatible])
         else          else
                 ol_enable_bdb=no                  ol_enable_bdb=no
         fi          fi
 fi  fi
 if test $ol_enable_hdb = yes -a $ol_link_ldbm != berkeley ; then  if test $ol_enable_hdb = yes -a $ol_link_ldbm != berkeley ; then
         AC_MSG_ERROR(HDB: BerkeleyDB not available)          AC_MSG_ERROR([HDB: BerkeleyDB not available])
 fi  fi
   
 if test $ol_link_ldbm = no -a $ol_with_ldbm_type = btree ; then  if test $ol_link_ldbm = no -a $ol_with_ldbm_type = btree ; then
         AC_MSG_WARN(Could not find LDBM with BTREE support)          AC_MSG_WARN([Could not find LDBM with BTREE support])
         ol_with_ldbm_api=none          ol_with_ldbm_api=none
 fi  fi
   
Line 2020  if test $ol_with_ldbm_api = ndbm ; then Line 1900  if test $ol_with_ldbm_api = ndbm ; then
 fi  fi
   
 if test $ol_link_ldbm = no -a $ol_enable_ldbm != no ; then  if test $ol_link_ldbm = no -a $ol_enable_ldbm != no ; then
         AC_MSG_WARN(could not find suitable LDBM backend)          AC_MSG_WARN([could not find suitable LDBM backend])
         if test $ol_enable_ldbm = yes ; then          if test $ol_enable_ldbm = yes ; then
                 AC_MSG_ERROR(select appropriate LDBM options or disable)                  AC_MSG_ERROR([select appropriate LDBM options or disable])
         fi          fi
   
         AC_MSG_WARN(disabling LDBM)          AC_MSG_WARN(disabling LDBM)
Line 2080  hosts_access(req) Line 1960  hosts_access(req)
                 AC_DEFINE(HAVE_TCPD,1, [define if you have -lwrap])                  AC_DEFINE(HAVE_TCPD,1, [define if you have -lwrap])
                 WRAP_LIBS="-lwrap"                  WRAP_LIBS="-lwrap"
         elif test $ol_enable_wrappers = yes ; then          elif test $ol_enable_wrappers = yes ; then
                 AC_MSG_ERROR([could not find TCP wrappers, select apppropriate options ore disable])                  AC_MSG_ERROR([could not find TCP wrappers, select apppropriate options or disable])
         else          else
                 AC_MSG_WARN([could not find TCP wrappers, support disabled])                  AC_MSG_WARN([could not find TCP wrappers, support disabled])
                 WRAP_LIBS=""                  WRAP_LIBS=""
Line 2130  if test $ol_enable_sql != no ; then Line 2010  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)  
 ol_link_termcap=no  
 AC_CHECK_HEADERS(termcap.h ncurses.h)  
   
 if test $ol_link_termcap = no ; then  
         AC_CHECK_LIB(termcap, tputs, [have_termcap=yes], [have_termcap=no])  
         if test $have_termcap = yes ; then  
                 AC_DEFINE(HAVE_TERMCAP, 1, [define if you have -ltermcap])  
                 ol_link_termcap=yes  
                 TERMCAP_LIBS=-ltermcap  
         fi  
 fi  
   
 if test $ol_link_termcap = no ; then  
         AC_CHECK_LIB(ncurses, initscr, [have_ncurses=yes], [have_ncurses=no])  
         if test $have_ncurses = yes ; then  
                 AC_DEFINE(HAVE_NCURSES, 1, [define if you have -lncurses])  
                 ol_link_termcap=yes  
                 TERMCAP_LIBS=-lncurses  
         fi  
 fi  
   
 if test $ol_link_termcap = no ; then  
         AC_DEFINE(NO_TERMCAP,1, [define if you have no termcap support])  
         TERMCAP_LIBS=  
 fi  
   
 dnl ----------------------------------------------------------------  
 dnl  dnl
 dnl Check for Cyrus SASL  dnl Check for Cyrus SASL
 dnl  dnl
Line 2216  if test $ol_with_cyrus_sasl != no ; then Line 2039  if test $ol_with_cyrus_sasl != no ; then
                 OL_SASL_COMPAT                  OL_SASL_COMPAT
                 if test $ol_cv_sasl_compat = no ; then                  if test $ol_cv_sasl_compat = no ; then
                         ol_link_sasl=no                          ol_link_sasl=no
                         AC_MSG_ERROR([Cyrus SASL library located but incompatible])                          AC_MSG_ERROR([Cyrus SASL library located but is incompatible])
                 fi                  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])
Line 2270  if test $ol_with_fetch != no ; then Line 2093  if test $ol_with_fetch != no ; then
         OL_LIB_FETCH          OL_LIB_FETCH
   
         if test $ol_cv_lib_fetch != no ; then          if test $ol_cv_lib_fetch != no ; then
                 LDIF_LIBS="$LDIF_LIBS $ol_link_fetch"                  LUTIL_LIBS="$LUTIL_LIBS $ol_link_fetch"
                 ol_link_fetch=freebsd                  ol_link_fetch=freebsd
   
         elif test $ol_with_fetch != auto ; then          elif test $ol_with_fetch != auto ; then
Line 2294  if test $ol_enable_crypt != no ; then Line 2117  if test $ol_enable_crypt != no ; then
         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
                 AC_MSG_WARN(could not find crypt)                  AC_MSG_WARN([could not find crypt])
                 if test $ol_enable_crypt = yes ; then                  if test $ol_enable_crypt = yes ; then
                         AC_MSG_ERROR(could not find crypt, select appropriate options or disable)                          AC_MSG_ERROR([could not find crypt, select appropriate options or disable])
                 fi                  fi
   
                 AC_MSG_WARN(disabling crypt support)                  AC_MSG_WARN([disabling crypt support])
                 ol_enable_crypt=no                  ol_enable_crypt=no
         fi          fi
 fi  fi
Line 2340  fi Line 2163  fi
   
 dnl ----------------------------------------------------------------  dnl ----------------------------------------------------------------
 dnl Checks for typedefs, structures, and compiler characteristics.  dnl Checks for typedefs, structures, and compiler characteristics.
   
   dnl Checks for long long
   AC_CACHE_CHECK([long long], ol_cv_type_long_long, [
           AC_TRY_COMPILE([], [long long x;],
                   [ol_cv_type_long_long=yes],
                   [ol_cv_type_long_long=no])])
   if test $ol_cv_type_long_long = yes; then
           AC_DEFINE(HAVE_LONG_LONG, 1, [define if you have 'long long'])
   fi
   
 AC_TYPE_MODE_T  AC_TYPE_MODE_T
 AC_TYPE_OFF_T  AC_TYPE_OFF_T
 AC_TYPE_PID_T  AC_TYPE_PID_T
Line 2367  AC_C_CONST Line 2200  AC_C_CONST
 OL_C_VOLATILE  OL_C_VOLATILE
   
 if test $cross_compiling = yes ; then  if test $cross_compiling = yes ; then
           AC_MSG_WARN([Crossing compiling... all bets are off!])
         AC_DEFINE(CROSS_COMPILING, 1, [define if cross compiling])          AC_DEFINE(CROSS_COMPILING, 1, [define if cross compiling])
 else  else
         AC_C_BIGENDIAN          AC_C_BIGENDIAN
Line 2375  fi Line 2209  fi
 AC_COMPILE_CHECK_SIZEOF(short)   AC_COMPILE_CHECK_SIZEOF(short) 
 AC_COMPILE_CHECK_SIZEOF(int)   AC_COMPILE_CHECK_SIZEOF(int) 
 AC_COMPILE_CHECK_SIZEOF(long)  AC_COMPILE_CHECK_SIZEOF(long)
   AC_COMPILE_CHECK_SIZEOF(wchar_t)
   
 if test "$ac_cv_sizeof_int" -lt 4 ; then  if test "$ac_cv_sizeof_int" -lt 4 ; then
         AC_MSG_WARN([OpenLDAP requires 'int' to be 32 bits or greater.])          AC_MSG_WARN([OpenLDAP requires 'int' to be 32 bits or greater.])
Line 2460  AC_CHECK_FUNCS(  \ Line 2295  AC_CHECK_FUNCS(  \
         strstr                  \          strstr                  \
         strtol                  \          strtol                  \
         strtoul                 \          strtoul                 \
           strtoq                  \
           strtouq                 \
           strtoll                 \
         strspn                  \          strspn                  \
         sysconf                 \          sysconf                 \
         usleep                  \          usleep                  \
Line 2498  dnl ------------------------------------ Line 2336  dnl ------------------------------------
 dnl Sort out defines  dnl Sort out defines
   
 if test "$ol_enable_slapi" != no ; then  if test "$ol_enable_slapi" != no ; then
         dnl This check is donel also if --enable-modules is used;          dnl This check is done also if --enable-modules is used;
         dnl it is duplicated here, 'cause it'd be cached anyway          dnl it is duplicated here, 'cause it'd be cached anyway
         AC_CHECK_HEADERS(ltdl.h)          AC_CHECK_HEADERS(ltdl.h)
   
Line 2545  fi Line 2383  fi
 if test "$ol_enable_crypt" != no ; then  if test "$ol_enable_crypt" != no ; then
         AC_DEFINE(SLAPD_CRYPT,1,[define to support crypt(3) passwords])          AC_DEFINE(SLAPD_CRYPT,1,[define to support crypt(3) passwords])
 fi  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  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
Line 2567  if test "$ol_link_modules" != no ; then Line 2402  if test "$ol_link_modules" != no ; then
         SLAPD_MODULES_LDFLAGS="-dlopen self"          SLAPD_MODULES_LDFLAGS="-dlopen self"
 fi  fi
   
   AC_DEFINE(SLAPD_MOD_STATIC,1,[statically linked module])
   AC_DEFINE(SLAPD_MOD_DYNAMIC,2,[dynamically linked module])
   
 if test "$ol_enable_bdb" != no ; then  if test "$ol_enable_bdb" != no ; then
         AC_DEFINE(SLAPD_BDB,1,[define to support BDB backend])  
         BUILD_SLAPD=yes          BUILD_SLAPD=yes
         BUILD_BDB=yes          BUILD_BDB=$ol_enable_bdb
         if test "$ol_with_bdb_module" != static ; then          if test "$ol_enable_bdb" = mod ; then
                 AC_DEFINE(SLAPD_BDB_DYNAMIC,1,  
                         [define to support dynamic BDB backend])  
                 BUILD_BDB=mod  
                 BUILD_BDB_DYNAMIC=shared  
                 SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-bdb"                  SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-bdb"
                   MFLAG=SLAPD_MOD_DYNAMIC
         else          else
                 SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-bdb"                  SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-bdb"
                   MFLAG=SLAPD_MOD_STATIC
         fi          fi
           AC_DEFINE_UNQUOTED(SLAPD_BDB,$MFLAG,[define to support BDB backend])
 fi  fi
   
 if test "$ol_link_dnssrv" != no ; then  if test "$ol_enable_dnssrv" != no ; then
         AC_DEFINE(SLAPD_DNSSRV,1,[define to support DNS SRV backend])  
         BUILD_SLAPD=yes          BUILD_SLAPD=yes
         BUILD_DNSSRV=yes          BUILD_DNSSRV=$ol_enable_dnssrv
         if test "$ol_with_dnssrv_module" != static ; then          if test "$ol_enable_dnssrv" = mod ; then
                 AC_DEFINE(SLAPD_DNSSRV_DYNAMIC,1,  
                         [define to support dynamic DNS SRV backend])  
                 BUILD_DNSSRV=mod  
                 BUILD_DNSSRV_DYNAMIC=shared  
                 SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-dnssrv"                  SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-dnssrv"
                   MFLAG=SLAPD_MOD_DYNAMIC
         else          else
                 SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-dnssrv"                  SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-dnssrv"
                   MFLAG=SLAPD_MOD_STATIC
         fi          fi
           AC_DEFINE_UNQUOTED(SLAPD_DNSSRV,$MFLAG,[define to support DNS SRV backend])
 fi  fi
   
 if test "$ol_enable_hdb" != no ; then  if test "$ol_enable_hdb" != no ; then
         AC_DEFINE(SLAPD_HDB,1,[define to support HDB backend])  
         BUILD_SLAPD=yes          BUILD_SLAPD=yes
         BUILD_HDB=yes          BUILD_HDB=$ol_enable_hdb
         if test "$ol_with_hdb_module" != static ; then          if test "$ol_enable_hdb" = mod ; then
                 AC_DEFINE(SLAPD_HDB_DYNAMIC,1,  
                         [define to support dynamic HDB backend])  
                 BUILD_HDB=mod  
                 BUILD_HDB_DYNAMIC=shared  
                 SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-hdb"                  SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-hdb"
                   MFLAG=SLAPD_MOD_DYNAMIC
         else          else
                 SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-hdb"                  SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-hdb"
                   MFLAG=SLAPD_MOD_STATIC
         fi          fi
           AC_DEFINE_UNQUOTED(SLAPD_HDB,$MFLAG,[define to support HDB backend])
 fi  fi
   
 if test "$ol_enable_ldap" != no ; then  if test "$ol_enable_ldap" != no ; then
         AC_DEFINE(SLAPD_LDAP,1,[define to support LDAP backend])  
         BUILD_SLAPD=yes          BUILD_SLAPD=yes
         BUILD_LDAP=yes          BUILD_LDAP=$ol_enable_ldap
         if test "$ol_with_ldap_module" != static ; then          if test "$ol_enable_ldap" = mod ; then
                 AC_DEFINE(SLAPD_LDAP_DYNAMIC,1,  
                         [define to support dynamic LDAP backend])  
                 BUILD_LDAP=mod  
                 BUILD_LDAP_DYNAMIC=shared  
                 SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-ldap"                  SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-ldap"
                   MFLAG=SLAPD_MOD_DYNAMIC
         else          else
                 SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-ldap"                  SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-ldap"
                   MFLAG=SLAPD_MOD_STATIC
         fi          fi
           AC_DEFINE_UNQUOTED(SLAPD_LDAP,$MFLAG,[define to support LDAP backend])
 fi  fi
   
 if test "$ol_link_ldbm" != no -a $ol_enable_ldbm != no; then  if test "$ol_link_ldbm" != no -a $ol_enable_ldbm != no; then
         AC_DEFINE(SLAPD_LDBM,1,[define to support LDBM backend])  
         BUILD_SLAPD=yes          BUILD_SLAPD=yes
         BUILD_LDBM=yes          BUILD_LDBM=$ol_enable_ldbm
         if test "$ol_with_ldbm_module" != static ; then          if test "$ol_enable_ldbm" = mod ; then
                 AC_DEFINE(SLAPD_LDBM_DYNAMIC,1,  
                         [define to support dynamic LDBM backend])  
                 BUILD_LDBM=mod  
                 BUILD_LDBM_DYNAMIC=shared  
                 SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-ldbm"                  SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-ldbm"
                   MFLAG=SLAPD_MOD_DYNAMIC
         else          else
                 SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-ldbm"                  SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-ldbm"
                   MFLAG=SLAPD_MOD_STATIC
         fi          fi
           AC_DEFINE_UNQUOTED(SLAPD_LDBM,$MFLAG,[define to support LDBM backend])
 fi  fi
   
 if test "$ol_enable_meta" != no ; then  if test "$ol_enable_meta" != no ; then
         if test "$ol_enable_ldap" = no ; then  
                 AC_MSG_ERROR([need --enable-ldap to use --enable-meta])  
         fi  
         if test "$ol_enable_rewrite" = no ; then  
                 AC_MSG_ERROR([need --enable-rewrite to use --enable-meta])  
         fi  
         AC_DEFINE(SLAPD_META,1,[define to support LDAP Metadirectory backend])  
         BUILD_SLAPD=yes          BUILD_SLAPD=yes
         BUILD_META=yes          BUILD_META=$ol_enable_meta
         BUILD_LDAP=yes  
         BUILD_REWRITE=yes          BUILD_REWRITE=yes
         if test "$ol_with_meta_module" != static ; then          if test "$ol_enable_meta" = mod ; then
                 AC_DEFINE(SLAPD_META_DYNAMIC,1,  
                         [define to support dynamic LDAP Metadirectory backend])  
                 BUILD_META=mod  
                 BUILD_META_DYNAMIC=shared  
                 SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-meta"                  SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-meta"
                   MFLAG=SLAPD_MOD_DYNAMIC
         else          else
                 SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-meta"                  SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-meta"
                   MFLAG=SLAPD_MOD_STATIC
         fi          fi
           AC_DEFINE_UNQUOTED(SLAPD_META,$MFLAG,[define to support LDAP Metadirectory backend])
 fi  fi
   
 if test "$ol_enable_monitor" != no ; then  if test "$ol_enable_monitor" != no ; then
         AC_DEFINE(SLAPD_MONITOR,1,[define to support cn=Monitor backend])  
         BUILD_SLAPD=yes          BUILD_SLAPD=yes
         BUILD_MONITOR=yes          BUILD_MONITOR=$ol_enable_monitor
         if test "$ol_with_monitor_module" != static ; then          if test "$ol_enable_monitor" = mod ; then
                 AC_DEFINE(SLAPD_MONITOR_DYNAMIC,1,  
                         [define to support dynamic cn=Monitor backend])  
                 BUILD_MONITOR=mod  
                 BUILD_MONITOR_DYNAMIC=shared  
                 SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-monitor"                  SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-monitor"
                   MFLAG=SLAPD_MOD_DYNAMIC
         else          else
                 SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-monitor"                  SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-monitor"
                   MFLAG=SLAPD_MOD_STATIC
         fi          fi
           AC_DEFINE_UNQUOTED(SLAPD_MONITOR,$MFLAG,[define to support cn=Monitor backend])
 fi  fi
   
 if test "$ol_enable_null" != no ; then  if test "$ol_enable_null" != no ; then
         AC_DEFINE(SLAPD_NULL,1,[define to support NULL backend])  
         BUILD_SLAPD=yes          BUILD_SLAPD=yes
         BUILD_NULL=yes          BUILD_NULL=$ol_enable_null
         if test "$ol_with_null_module" != static ; then          if test "$ol_enable_null" = mod ; 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"                  SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-null"
                   MFLAG=SLAPD_MOD_DYNAMIC
         else          else
                 SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-null"                  SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-null"
                   MFLAG=SLAPD_MOD_STATIC
         fi          fi
           AC_DEFINE_UNQUOTED(SLAPD_NULL,$MFLAG,[define to support NULL backend])
 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])  
         BUILD_SLAPD=yes          BUILD_SLAPD=yes
         BUILD_PASSWD=yes          BUILD_PASSWD=$ol_enable_passwd
         if test "$ol_with_passwd_module" != static ; then          if test "$ol_enable_passwd" = mod ; then
                 AC_DEFINE(SLAPD_PASSWD_DYNAMIC,1,  
                         [define to support dynamic PASSWD backend])  
                 BUILD_PASSWD=mod  
                 BUILD_PASSWD_DYNAMIC=shared  
                 SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-passwd"                  SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-passwd"
                   MFLAG=SLAPD_MOD_DYNAMIC
         else          else
                 SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-passwd"                  SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-passwd"
                   MFLAG=SLAPD_MOD_STATIC
         fi          fi
           AC_DEFINE_UNQUOTED(SLAPD_PASSWD,$MFLAG,[define to support PASSWD backend])
 fi  fi
   
 if test "$ol_link_perl" != no ; then  if test "$ol_link_perl" != no ; then
         AC_DEFINE(SLAPD_PERL,1,[define to support PERL backend])  
         BUILD_SLAPD=yes          BUILD_SLAPD=yes
         BUILD_PERL=yes          BUILD_PERL=$ol_enable_perl
         if test "$ol_with_perl_module" != static ; then          if test "$ol_enable_perl" = mod ; then
                 AC_DEFINE(SLAPD_PERL_DYNAMIC,1,  
                         [define to support dynamic PERL backend])  
                 BUILD_PERL=mod  
                 BUILD_PERL_DYNAMIC=shared  
                 SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-perl"                  SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-perl"
                   MFLAG=SLAPD_MOD_DYNAMIC
         else          else
                 SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-perl"                  SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-perl"
                   MFLAG=SLAPD_MOD_STATIC
         fi          fi
           AC_DEFINE_UNQUOTED(SLAPD_PERL,$MFLAG,[define to support PERL backend])
 fi  fi
   
 if test "$ol_enable_shell" != no ; then  if test "$ol_enable_shell" != no ; then
         if test "$ol_link_thread" != no ; then          if test "$ol_link_thread" != no ; then
                 AC_MSG_WARN([Use of --without-threads is recommended with back-shell])                  AC_MSG_WARN([Use of --without-threads is recommended with back-shell])
         fi          fi
         AC_DEFINE(SLAPD_SHELL,1,[define to support SHELL backend])  
         BUILD_SLAPD=yes          BUILD_SLAPD=yes
         BUILD_SHELL=yes          BUILD_SHELL=$ol_enable_shell
         if test "$ol_with_shell_module" != static ; then          if test "$ol_enable_shell" = mod ; then
                 AC_DEFINE(SLAPD_SHELL_DYNAMIC,1,  
                         [define to support dynamic SHELL backend])  
                 BUILD_SHELL=mod  
                 BUILD_SHELL_DYNAMIC=shared  
                 SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-shell"                  SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-shell"
                   MFLAG=SLAPD_MOD_DYNAMIC
         else          else
                 SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-shell"                  SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-shell"
                   MFLAG=SLAPD_MOD_STATIC
         fi          fi
           AC_DEFINE_UNQUOTED(SLAPD_SHELL,$MFLAG,[define to support SHELL backend])
 fi  fi
   
 if test "$ol_enable_tcl" != no ; then  if test "$ol_link_sql" != no ; then
         AC_DEFINE(SLAPD_TCL,1,[define to support TCL backend])  
         BUILD_SLAPD=yes          BUILD_SLAPD=yes
         BUILD_TCL=yes          BUILD_SQL=$ol_enable_sql
         if test "$ol_with_tcl_module" != static; then          if test "$ol_enable_sql" = mod; then
                 AC_DEFINE(SLAPD_TCL_DYNAMIC,1,                  SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-sql"
                         [define to support dynamic TCL backend])                  MFLAG=SLAPD_MOD_DYNAMIC
                 BUILD_TCL=mod  
                 BUILD_TCL_DYNAMIC=shared  
                 SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-tcl"  
         else          else
                 SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-tcl"                  SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-sql"
                   MFLAG=SLAPD_MOD_STATIC
         fi          fi
           AC_DEFINE_UNQUOTED(SLAPD_SQL,$MFLAG,[define to support SQL backend])
 fi  fi
   
 if test "$ol_link_sql" != no ; then  if test "$ol_enable_dyngroup" != no ; then
         AC_DEFINE(SLAPD_SQL,1,[define to support SQL backend])          BUILD_DYNGROUP=$ol_enable_dyngroup
         BUILD_SLAPD=yes          if test "$ol_enable_dyngroup" = mod ; then
         BUILD_SQL=yes                  MFLAG=SLAPD_MOD_DYNAMIC
         if test "$ol_with_sql_module" != static; then                  SLAPD_DYNAMIC_OVERLAYS="$SLAPD_DYNAMIC_OVERLAYS dyngroup.la"
                 AC_DEFINE(SLAPD_SQL_DYNAMIC,1,  
                         [define to support dynamic SQL backend])  
                 BUILD_SQL=mod  
                 BUILD_SQL_DYNAMIC=shared  
                 SLAPD_DYNAMIC_BACKENDS="$SLAPD_DYNAMIC_BACKENDS back-sql"  
         else          else
                 SLAPD_STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS back-sql"                  MFLAG=SLAPD_MOD_STATIC
           fi
           AC_DEFINE_UNQUOTED(SLAPD_OVER_DYNGROUP,$MFLAG,[define for Dynamic Group overlay])
   fi
   
   if test "$ol_enable_proxycache" != no ; then
           BUILD_PROXYCACHE=$ol_enable_proxycache
           if test "$ol_enable_proxycache" = mod ; then
                   MFLAG=SLAPD_MOD_DYNAMIC
                   SLAPD_DYNAMIC_OVERLAYS="$SLAPD_DYNAMIC_OVERLAYS pcache.la"
           else
                   MFLAG=SLAPD_MOD_STATIC
         fi          fi
           AC_DEFINE_UNQUOTED(SLAPD_OVER_PROXYCACHE,$MFLAG,[define for Proxy Cache overlay])
 fi  fi
   
 if test "$ol_enable_slurpd" != no -a "$ol_link_threads" != no -a \  if test "$ol_enable_slurpd" != no -a "$ol_link_threads" != no -a \
Line 2811  fi Line 2625  fi
   
 AC_SUBST(LIBSRCS)  AC_SUBST(LIBSRCS)
 AC_SUBST(PLAT)  AC_SUBST(PLAT)
   AC_SUBST(WITH_TLS)
 AC_SUBST(BUILD_LIBS_DYNAMIC)  AC_SUBST(BUILD_LIBS_DYNAMIC)
   
 AC_SUBST(BUILD_SLAPD)  AC_SUBST(BUILD_SLAPD)
   dnl slapi
   AC_SUBST(BUILD_SLAPI)    AC_SUBST(BUILD_SLAPI)
   AC_SUBST(SLAPD_SLAPI_DEPEND)    AC_SUBST(SLAPD_SLAPI_DEPEND)
   dnl backends
   AC_SUBST(BUILD_BDB)    AC_SUBST(BUILD_BDB)
   AC_SUBST(BUILD_DNSSRV)    AC_SUBST(BUILD_DNSSRV)
   AC_SUBST(BUILD_HDB)    AC_SUBST(BUILD_HDB)
Line 2828  AC_SUBST(BUILD_SLAPD) Line 2645  AC_SUBST(BUILD_SLAPD)
   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)  dnl overlays
   AC_SUBST(BUILD_BDB_DYNAMIC)    AC_SUBST(BUILD_DYNGROUP)
   AC_SUBST(BUILD_DNSSRV_DYNAMIC)    AC_SUBST(BUILD_PROXYCACHE)
   AC_SUBST(BUILD_HDB_DYNAMIC)  
   AC_SUBST(BUILD_LDAP_DYNAMIC)  
   AC_SUBST(BUILD_LDBM_DYNAMIC)  
   AC_SUBST(BUILD_META_DYNAMIC)  
   AC_SUBST(BUILD_MONITOR_DYNAMIC)  
   AC_SUBST(BUILD_NULL_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(BUILD_SLURPD)
   
 AC_SUBST(LDAP_LIBS)  AC_SUBST(LDAP_LIBS)
 AC_SUBST(LDIF_LIBS)  
 AC_SUBST(SLAPD_LIBS)  AC_SUBST(SLAPD_LIBS)
 AC_SUBST(SLURPD_LIBS)  AC_SUBST(SLURPD_LIBS)
 AC_SUBST(LDBM_LIBS)  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)
Line 2860  AC_SUBST(SLAPD_MODULES_LDFLAGS) Line 2664  AC_SUBST(SLAPD_MODULES_LDFLAGS)
 AC_SUBST(SLAPD_NO_STATIC)  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)
   AC_SUBST(SLAPD_DYNAMIC_OVERLAYS)
   
 AC_SUBST(PERL_CPPFLAGS)  AC_SUBST(PERL_CPPFLAGS)
 AC_SUBST(SLAPD_PERL_LDFLAGS)  AC_SUBST(SLAPD_PERL_LDFLAGS)
Line 2868  AC_SUBST(MOD_PERL_LDFLAGS) Line 2673  AC_SUBST(MOD_PERL_LDFLAGS)
 AC_SUBST(KRB4_LIBS)  AC_SUBST(KRB4_LIBS)
 AC_SUBST(KRB5_LIBS)  AC_SUBST(KRB5_LIBS)
 AC_SUBST(SASL_LIBS)  AC_SUBST(SASL_LIBS)
 AC_SUBST(TERMCAP_LIBS)  
 AC_SUBST(TLS_LIBS)  AC_SUBST(TLS_LIBS)
 AC_SUBST(MODULES_LIBS)  AC_SUBST(MODULES_LIBS)
 AC_SUBST(SLAPI_LIBS)  AC_SUBST(SLAPI_LIBS)
Line 2903  clients/Makefile:build/top.mk:clients/Ma Line 2707  clients/Makefile:build/top.mk:clients/Ma
 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      \
 libraries/libavl/Makefile:build/top.mk:libraries/libavl/Makefile.in:build/lib.mk:build/lib-static.mk    \  
 libraries/liblber/Makefile:build/top.mk:libraries/liblber/Makefile.in:build/lib.mk:build/lib-shared.mk  \  libraries/liblber/Makefile:build/top.mk:libraries/liblber/Makefile.in:build/lib.mk:build/lib-shared.mk  \
 libraries/libldap/Makefile:build/top.mk:libraries/libldap/Makefile.in:build/lib.mk:build/lib-shared.mk  \  libraries/libldap/Makefile:build/top.mk:libraries/libldap/Makefile.in:build/lib.mk:build/lib-shared.mk  \
 libraries/libldap_r/Makefile:build/top.mk:libraries/libldap_r/Makefile.in:build/lib.mk:build/lib-shared.mk      \  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/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        \  libraries/liblutil/Makefile:build/top.mk:libraries/liblutil/Makefile.in:build/lib.mk:build/lib-static.mk        \
 libraries/librewrite/Makefile:build/top.mk:libraries/librewrite/Makefile.in:build/lib.mk:build/lib-static.mk \  libraries/librewrite/Makefile:build/top.mk:libraries/librewrite/Makefile.in:build/lib.mk:build/lib-static.mk \
Line 2926  servers/slapd/back-passwd/Makefile:build Line 2727  servers/slapd/back-passwd/Makefile:build
 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/slapi/Makefile:build/top.mk:servers/slapd/slapi/Makefile.in:build/lib.mk:build/lib-shared.mk  \  servers/slapd/slapi/Makefile:build/top.mk:servers/slapd/slapi/Makefile.in:build/lib.mk:build/lib-shared.mk  \
 servers/slapd/tools/Makefile:build/top.mk:servers/slapd/tools/Makefile.in \  servers/slapd/overlays/Makefile:build/top.mk:servers/slapd/overlays/Makefile.in:build/lib.mk \
 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 \
 tests/Makefile:build/top.mk:tests/Makefile.in:build/dir.mk \  tests/Makefile:build/top.mk:tests/Makefile.in:build/dir.mk \
   tests/run \
 tests/progs/Makefile:build/top.mk:tests/progs/Makefile.in:build/rules.mk \  tests/progs/Makefile:build/top.mk:tests/progs/Makefile.in:build/rules.mk \
 ,[  ,[
   chmod +x tests/run
 date > stamp-h  date > stamp-h
 echo Please run \"make depend\" to build dependencies  echo Please run \"make depend\" to build dependencies
 ])  ])

Removed from v.1.478  
changed lines
  Added in v.1.478.2.20


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