X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=configure.in;h=bb251f4345e8f3a2be2c7b4587f031ad490dba6d;hb=f96e6378d6cd06c744a47af5e5e551cbb494826a;hp=61876214d785dfe0a9e28fb49e579576fe89a58c;hpb=c3962c1620d49b3cdf5984703c1d68ce1f8a833b;p=openldap diff --git a/configure.in b/configure.in index 61876214d7..bb251f4345 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,7 @@ dnl $OpenLDAP$ dnl This work is part of OpenLDAP Software . dnl -dnl Copyright 1998-2005 The OpenLDAP Foundation. +dnl Copyright 1998-2006 The OpenLDAP Foundation. dnl All rights reserved. dnl dnl Redistribution and use in source and binary forms, with or without @@ -12,65 +12,27 @@ 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 . dnl -dnl ---------------------------------------------------------------- -dnl -dnl Redefine AC_INIT_BINSH to provide RCS IDs and copyright notice -dnl at top of generated configure script. Prints simple copyright. -define([AC_INIT_BINSH], -[[#! /bin/sh -# $]OpenLDAP[$ -# from] translit([$OpenLDAP$], $")] [ - -# This work is part of OpenLDAP Software . -# -# Copyright 1998-2005 The OpenLDAP Foundation. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted only as authorized by the OpenLDAP -# Public License. -# -# A copy of this license is available in the file LICENSE in the -# top-level directory of the distribution or, alternatively, at -# . - -echo "Copyright 1998-2005 The OpenLDAP Foundation. All rights reserved." -echo " Restrictions apply, see COPYRIGHT and LICENSE files." -])dnl -dnl ---------------------------------------------------------------- -dnl OpenLDAP Autoconf Macros -dnl $OpenLDAP$ -dnl This work is part of OpenLDAP Software . -dnl -dnl Copyright 1998-2005 The OpenLDAP Foundation. -dnl All rights reserved. -dnl -dnl Redistribution and use in source and binary forms, with or without -dnl modification, are permitted only as authorized by the OpenLDAP -dnl Public License. -dnl -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 . -builtin(include, build/openldap.m4)dnl - dnl ---------------------------------------------------------------- dnl Disable config.cache! define([AC_CACHE_LOAD], )dnl define([AC_CACHE_SAVE], )dnl +dnl ---------------------------------------------------------------- +dnl Disable libtool 1.5 support for languages we don't use +define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl +define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl +define([AC_LIBTOOL_LANG_GCJ_CONFIG], [:])dnl dnl ================================================================ dnl Configure.in for OpenLDAP -AC_INIT -AC_CONFIG_SRCDIR([build/version.sh])dnl - -# set unset (borrowed from autoconf 2.49c) -if (OL_FOO=OL_FOO; unset OL_FOO) >/dev/null 2>&1; then - ol_unset=unset -else - ol_unset=false -fi -# unset CDPATH -$ol_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; } +AC_COPYRIGHT([[Copyright 1998-2006 The OpenLDAP Foundation. All rights reserved. +Restrictions apply, see COPYRIGHT and LICENSE files.]]) +AC_REVISION([$OpenLDAP$]) +AC_INIT([OpenLDAP],,[http://www.openldap.org/its/]) +m4_define([AC_PACKAGE_BUGREPORT],[]) +AC_CONFIG_SRCDIR(build/version.sh)dnl +dnl ---------------------------------------------------------------- +dnl OpenLDAP Autoconf Macros +builtin(include, build/openldap.m4)dnl +dnl ================================================================ AC_CONFIG_AUX_DIR(build)dnl @@ -79,7 +41,7 @@ if test -z "$OL_STRING"; then AC_MSG_ERROR([could not determine version]) fi -if test -f "$ac_aux_dir/shtool" -a ! -d $ac_aux_dir/shtool; then +if test -f "$ac_aux_dir/shtool" && test ! -d $ac_aux_dir/shtool; then ac_cv_shtool="$ac_aux_dir/shtool" else AC_MSG_ERROR([no shtool found in $ac_aux_dir]) @@ -122,12 +84,112 @@ 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. Later versions like won't work. -dnl aclocal.m4 should be built using aclocal from automake 1.4 -dnl libtool 1.4.3 should be installed. +dnl We use autoconf features new to 2.59. Later versions like won't work. +dnl aclocal.m4 should be built using aclocal from automake 1.5 +dnl libtool 1.5 should be installed. AC_PREREQ(2.59)dnl Required Autoconf version -AC_CONFIG_HEADER(include/portable.h include/ldap_features.h include/lber_types.h)dnl +AH_TOP([ +/* begin of portable.h.pre */ +/* This work is part of OpenLDAP Software . + * + * Copyright 1998-2006 The OpenLDAP Foundation + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted only as authorized by the OpenLDAP + * Public License. + * + * A copy of this license is available in the file LICENSE in the + * top-level directory of the distribution or, alternatively, at + * . + */ + +#ifndef _LDAP_PORTABLE_H +#define _LDAP_PORTABLE_H + +/* define this if needed to get reentrant functions */ +#ifndef REENTRANT +#undef REENTRANT +#endif +#ifndef _REENTRANT +#undef _REENTRANT +#endif + +/* define this if needed to get threadsafe functions */ +#ifndef THREADSAFE +#undef THREADSAFE +#endif +#ifndef _THREADSAFE +#undef _THREADSAFE +#endif +#ifndef THREAD_SAFE +#undef THREAD_SAFE +#endif +#ifndef _THREAD_SAFE +#undef _THREAD_SAFE +#endif + +#ifndef _SGI_MP_SOURCE +#undef _SGI_MP_SOURCE +#endif + +/* end of portable.h.pre */ +]) +AH_BOTTOM([ +/* begin of portable.h.post */ + +#ifdef _WIN32 + /* don't suck in all of the win32 api */ +# define WIN32_LEAN_AND_MEAN 1 +#endif + +#ifndef LDAP_NEEDS_PROTOTYPES +/* force LDAP_P to always include prototypes */ +#define LDAP_NEEDS_PROTOTYPES 1 +#endif + +#ifndef LDAP_REL_ENG +#if (LDAP_VENDOR_VERSION == 000000) && !defined(LDAP_DEVEL) +#define LDAP_DEVEL +#endif +#if defined(LDAP_DEVEL) && !defined(LDAP_TEST) +#define LDAP_TEST +#endif +#endif + +#ifdef HAVE_STDDEF_H +# include +#endif + +#ifdef HAVE_EBCDIC +/* ASCII/EBCDIC converting replacements for stdio funcs + * vsnprintf and snprintf are used too, but they are already + * checked by the configure script + */ +#define fputs ber_pvt_fputs +#define fgets ber_pvt_fgets +#define printf ber_pvt_printf +#define fprintf ber_pvt_fprintf +#define vfprintf ber_pvt_vfprintf +#define vsprintf ber_pvt_vsprintf +#endif + +#include "ac/fdset.h" + +#include "ldap_cdefs.h" +#include "ldap_features.h" + +#include "ac/assert.h" +#include "ac/localize.h" + +#endif /* _LDAP_PORTABLE_H */ +/* end of portable.h.post */ +]) + +AC_CONFIG_HEADERS([include/portable.h:include/portable.hin]) +AC_CONFIG_HEADERS([include/ldap_features.h:include/ldap_features.hin]) +AC_CONFIG_HEADERS([include/lber_types.h:include/lber_types.hin]) dnl ================================================================ dnl Start Args @@ -161,7 +223,8 @@ AC_SUBST(ldap_subdir)dnl dnl ---------------------------------------------------------------- dnl General "enable" options -OL_ARG_ENABLE(debug,[ --enable-debug enable debugging], yes)dnl +dnl set default to traditional to enable the original debug style +OL_ARG_ENABLE(debug,[ --enable-debug enable debugging], yes, [no yes traditional])dnl OL_ARG_ENABLE(dynamic,[ --enable-dynamic enable linking built binaries with dynamic libs], no)dnl OL_ARG_ENABLE(syslog,[ --enable-syslog enable syslog support], auto)dnl OL_ARG_ENABLE(proctitle,[ --enable-proctitle enable proctitle support], yes)dnl @@ -174,8 +237,6 @@ OL_ARG_ENABLE(local,[ --enable-local enable AF_LOCAL (AF_UNIX) socket support dnl ---------------------------------------------------------------- dnl General "with" options -dnl OL_ARG_ENABLE(dmalloc,[ --enable-dmalloc enable debug malloc support], no)dnl - OL_ARG_WITH(cyrus_sasl,[ --with-cyrus-sasl with Cyrus SASL support], auto, [auto yes no] ) OL_ARG_WITH(fetch,[ --with-fetch with fetch(3) URL support], @@ -186,7 +247,7 @@ ol_with_kerberos=${ol_with_kerberos-auto} OL_ARG_WITH(threads,[ --with-threads with threads], auto, [auto nt posix mach pth lwp yes no manual] ) OL_ARG_WITH(tls,[ --with-tls with TLS/SSL support], - auto, [auto ssleay openssl yes no] ) + auto, [auto openssl yes no] ) OL_ARG_WITH(yielding_select,[ --with-yielding-select with implicitly yielding select], auto, [auto yes no manual] ) OL_ARG_WITH(multiple_precision,[ --with-multiple-precision @@ -200,10 +261,11 @@ dnl ---------------------------------------------------------------- dnl ---------------------------------------------------------------- dnl SLAPD OPTIONS -AC_ARG_WITH(xxslapdoptions,[ +AC_ARG_ENABLE(xxslapdoptions,[ SLAPD (Standalone LDAP Daemon) Options:]) OL_ARG_ENABLE(slapd,[ --enable-slapd enable building slapd], yes)dnl -OL_ARG_ENABLE(aci,[ --enable-aci enable per-object ACIs (experimental)], no)dnl +OL_ARG_ENABLE(dynacl,[ --enable-dynacl enable run-time loadable ACL support (experimental)], no)dnl +OL_ARG_ENABLE(aci,[ --enable-aci enable per-object ACIs (experimental)], no, [no yes mod])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(lmpasswd,[ --enable-lmpasswd enable LAN Manager passwords], no)dnl @@ -219,95 +281,124 @@ OL_ARG_ENABLE(wrappers,[ --enable-wrappers enable tcp wrapper support], no) dnl ---------------------------------------------------------------- dnl SLAPD Backend Options -Backends="bdb dnssrv hdb ldap ldbm meta monitor null \ - passwd perl relay shell sql" - -AC_ARG_WITH(xxslapbackends,[ +Backends="bdb \ + dnssrv \ + hdb \ + ldap \ + ldbm \ + meta \ + monitor \ + null \ + passwd \ + perl \ + relay \ + shell \ + sql" + +AC_ARG_ENABLE(xxslapbackends,[ SLAPD Backend Options:]) -OL_ARG_ENABLE(backends,[ --enable-backends enable all available backends no|yes|mod], +OL_ARG_ENABLE(backends,[ --enable-backends enable all available backends], --, [no yes mod])dnl -test -n "$ol_enable_backends" && ol_dflt_backends="$ol_enable_backends" -OL_ARG_ENABLE(bdb,[ --enable-bdb enable Berkeley DB backend no|yes|mod], - ${ol_dflt_backends-yes}, [no yes mod])dnl -OL_ARG_ENABLE(dnssrv,[ --enable-dnssrv enable dnssrv backend no|yes|mod], - ${ol_dflt_backends-no}, [no yes mod])dnl -OL_ARG_ENABLE(hdb,[ --enable-hdb enable Hierarchical DB backend no|yes|mod], - ${ol_dflt_backends-yes}, [no yes mod])dnl -OL_ARG_ENABLE(ldap,[ --enable-ldap enable ldap backend no|yes|mod], - ${ol_dflt_backends-no}, [no yes mod])dnl -OL_ARG_ENABLE(ldbm,[ --enable-ldbm enable ldbm backend no|yes|mod], - ${ol_dflt_backends-no}, [no yes mod])dnl -OL_ARG_WITH(ldbm_api,[ --with-ldbm-api with LDBM API auto|berkeley|bcompat|mdbm|gdbm], +OL_ARG_ENABLE(bdb,[ --enable-bdb enable Berkeley DB backend], + yes, [no yes mod], ol_enable_backends)dnl +OL_ARG_ENABLE(dnssrv,[ --enable-dnssrv enable dnssrv backend], + no, [no yes mod], ol_enable_backends)dnl +OL_ARG_ENABLE(hdb,[ --enable-hdb enable Hierarchical DB backend], + yes, [no yes mod], ol_enable_backends)dnl +OL_ARG_ENABLE(ldap,[ --enable-ldap enable ldap backend], + no, [no yes mod], ol_enable_backends)dnl +OL_ARG_ENABLE(ldbm,[ --enable-ldbm enable ldbm backend], + no, [no yes mod], ol_enable_backends)dnl +AC_ARG_WITH(ldbm_api,,[ + AC_MSG_WARN([Please use --enable-ldbm-api instead of --with-ldbm-api]) + enable_ldbm_api="$with_ldbm_api"]) +OL_ARG_ENABLE(ldbm_api,[ --enable-ldbm-api use LDBM API], auto, [auto berkeley bcompat mdbm gdbm]) -OL_ARG_WITH(ldbm_type,[ --with-ldbm-type use LDBM type auto|btree|hash], +AC_ARG_WITH(ldbm_type,,[ + AC_MSG_WARN([Please use --enable-ldbm-type instead of --with-ldbm-type]) + enable_ldbm_type="$with_ldbm_type"]) +OL_ARG_ENABLE(ldbm_type,[ --enable-ldbm-type use LDBM type], auto, [auto btree hash]) -OL_ARG_ENABLE(meta,[ --enable-meta enable metadirectory backend no|yes|mod], - ${ol_dflt_backends-no}, [no yes mod])dnl -OL_ARG_ENABLE(monitor,[ --enable-monitor enable monitor backend no|yes|mod], - ${ol_dflt_backends-yes}, [no yes mod])dnl -OL_ARG_ENABLE(null,[ --enable-null enable null backend no|yes|mod], - ${ol_dflt_backends-no}, [no yes mod])dnl -OL_ARG_ENABLE(passwd,[ --enable-passwd enable passwd backend no|yes|mod], - ${ol_dflt_backends-no}, [no yes mod])dnl -OL_ARG_ENABLE(perl,[ --enable-perl enable perl backend no|yes|mod], - ${ol_dflt_backends-no}, [no yes mod])dnl -OL_ARG_ENABLE(relay,[ --enable-relay enable relay backend no|yes|mod], - ${ol_dflt_backends-yes}, [no yes mod])dnl -OL_ARG_ENABLE(shell,[ --enable-shell enable shell backend no|yes|mod], - ${ol_dflt_backends-no}, [no yes mod])dnl -OL_ARG_ENABLE(sql,[ --enable-sql enable sql backend no|yes|mod], - ${ol_dflt_backends-no}, [no yes mod])dnl +OL_ARG_ENABLE(meta,[ --enable-meta enable metadirectory backend], + no, [no yes mod], ol_enable_backends)dnl +OL_ARG_ENABLE(monitor,[ --enable-monitor enable monitor backend], + yes, [no yes mod], ol_enable_backends)dnl +OL_ARG_ENABLE(null,[ --enable-null enable null backend], + no, [no yes mod], ol_enable_backends)dnl +OL_ARG_ENABLE(passwd,[ --enable-passwd enable passwd backend], + no, [no yes mod], ol_enable_backends)dnl +OL_ARG_ENABLE(perl,[ --enable-perl enable perl backend], + no, [no yes mod], ol_enable_backends)dnl +OL_ARG_ENABLE(relay,[ --enable-relay enable relay backend], + yes, [no yes mod], ol_enable_backends)dnl +OL_ARG_ENABLE(shell,[ --enable-shell enable shell backend], + no, [no yes mod], ol_enable_backends)dnl +OL_ARG_ENABLE(sql,[ --enable-sql enable sql backend], + no, [no yes mod], ol_enable_backends)dnl dnl ---------------------------------------------------------------- dnl SLAPD Overlay Options -Overlays="accesslog denyop dyngroup dynlist glue lastmod ppolicy proxycache \ - refint retcode rwm syncprov translucent unique" - -AC_ARG_WITH(xxslapoverlays,[ +Overlays="accesslog \ + dds \ + denyop \ + dyngroup \ + dynlist \ + lastmod \ + ppolicy \ + proxycache \ + refint \ + retcode \ + rwm \ + syncprov \ + translucent \ + unique \ + valsort" + +AC_ARG_ENABLE(xxslapoverlays,[ SLAPD Overlay Options:]) -OL_ARG_ENABLE(overlays,[ --enable-overlays enable all available overlays no|yes|mod], +OL_ARG_ENABLE(overlays,[ --enable-overlays enable all available overlays], --, [no yes mod])dnl -test -n "$ol_enable_overlays" && ol_dflt_overlays="$ol_enable_overlays" -OL_ARG_ENABLE(accesslog,[ --enable-accesslog In-Directory Access Logging overlay no|yes|mod], - ${ol_dflt_overlays-no}, [no yes mod]) -OL_ARG_ENABLE(denyop,[ --enable-denyop Deny Operation overlay no|yes|mod], - ${ol_dflt_overlays-no}, [no yes mod]) -OL_ARG_ENABLE(dyngroup,[ --enable-dyngroup Dynamic Group overlay no|yes|mod], - ${ol_dflt_overlays-no}, [no yes mod]) -OL_ARG_ENABLE(dynlist,[ --enable-dynlist Dynamic List overlay no|yes|mod], - ${ol_dflt_overlays-no}, [no yes mod]) -OL_ARG_ENABLE(glue,[ --enable-glue Backend Glue overlay no|yes|mod], - ${ol_dflt_overlays-yes}, [no yes mod]) -OL_ARG_ENABLE(lastmod,[ --enable-lastmod Last Modification overlay no|yes|mod], - ${ol_dflt_overlays-no}, [no yes mod]) -OL_ARG_ENABLE(ppolicy,[ --enable-ppolicy Password Policy overlay no|yes|mod], - ${ol_dflt_overlays-no}, [no yes mod]) -OL_ARG_ENABLE(proxycache,[ --enable-proxycache Proxy Cache overlay no|yes|mod], - ${ol_dflt_overlays-no}, [no yes mod]) -OL_ARG_ENABLE(refint,[ --enable-refint Referential Integrity overlay no|yes|mod], - ${ol_dflt_overlays-no}, [no yes mod]) -OL_ARG_ENABLE(retcode,[ --enable-retcode Return Code testing overlay no|yes|mod], - ${ol_dflt_overlays-no}, [no yes mod]) -OL_ARG_ENABLE(rwm,[ --enable-rwm Rewrite/Remap overlay no|yes|mod], - ${ol_dflt_overlays-no}, [no yes mod]) -OL_ARG_ENABLE(syncprov,[ --enable-syncprov Syncrepl Provider overlay no|yes|mod], - ${ol_dflt_overlays-yes}, [no yes mod]) -OL_ARG_ENABLE(translucent,[ --enable-translucent Translucent Proxy overlay no|yes|mod], - ${ol_dflt_overlays-no}, [no yes mod]) -OL_ARG_ENABLE(unique,[ --enable-unique Attribute Uniqueness overlay no|yes|mod], - ${ol_dflt_overlays-no}, [no yes mod]) - +OL_ARG_ENABLE(accesslog,[ --enable-accesslog In-Directory Access Logging overlay], + no, [no yes mod], ol_enable_overlays) +OL_ARG_ENABLE(dds,[ --enable-dds Dynamic Directory Services overlay], + no, [no yes mod], ol_enable_overlays) +OL_ARG_ENABLE(denyop,[ --enable-denyop Deny Operation overlay], + no, [no yes mod], ol_enable_overlays) +OL_ARG_ENABLE(dyngroup,[ --enable-dyngroup Dynamic Group overlay], + no, [no yes mod], ol_enable_overlays) +OL_ARG_ENABLE(dynlist,[ --enable-dynlist Dynamic List overlay], + no, [no yes mod], ol_enable_overlays) +OL_ARG_ENABLE(lastmod,[ --enable-lastmod Last Modification overlay], + no, [no yes mod], ol_enable_overlays) +OL_ARG_ENABLE(ppolicy,[ --enable-ppolicy Password Policy overlay], + no, [no yes mod], ol_enable_overlays) +OL_ARG_ENABLE(proxycache,[ --enable-proxycache Proxy Cache overlay], + no, [no yes mod], ol_enable_overlays) +OL_ARG_ENABLE(refint,[ --enable-refint Referential Integrity overlay], + no, [no yes mod], ol_enable_overlays) +OL_ARG_ENABLE(retcode,[ --enable-retcode Return Code testing overlay], + no, [no yes mod], ol_enable_overlays) +OL_ARG_ENABLE(rwm,[ --enable-rwm Rewrite/Remap overlay], + no, [no yes mod], ol_enable_overlays) +OL_ARG_ENABLE(syncprov,[ --enable-syncprov Syncrepl Provider overlay], + yes, [no yes mod], ol_enable_overlays) +OL_ARG_ENABLE(translucent,[ --enable-translucent Translucent Proxy overlay], + no, [no yes mod], ol_enable_overlays) +OL_ARG_ENABLE(unique,[ --enable-unique Attribute Uniqueness overlay], + no, [no yes mod], ol_enable_overlays) +OL_ARG_ENABLE(valsort,[ --enable-valsort Value Sorting overlay], + no, [no yes mod], ol_enable_overlays) dnl ---------------------------------------------------------------- dnl SLURPD OPTIONS -AC_ARG_WITH(xxslurpdoptions,[ +AC_ARG_ENABLE(xxslurpdoptions,[ SLURPD (Replication Daemon) Options:]) OL_ARG_ENABLE(slurpd,[ --enable-slurpd enable building slurpd], auto)dnl dnl ---------------------------------------------------------------- -AC_ARG_WITH(xxliboptions,[ +AC_ARG_ENABLE(xxliboptions,[ Library Generation & Linking Options]) AC_ENABLE_STATIC AC_ENABLE_SHARED @@ -342,14 +433,17 @@ if test $ol_enable_slapd = no ; then if test $ol_enable_rlookups = yes ; then AC_MSG_WARN([slapd disabled, ignoring --enable-rlookups argument]) fi - if test $ol_enable_aci = yes ; then + if test $ol_enable_dynacl = yes ; then + AC_MSG_WARN([slapd disabled, ignoring --enable-dynacl argument]) + fi + if test $ol_enable_aci != no ; then AC_MSG_WARN([slapd disabled, ignoring --enable-aci argument]) fi - if test $ol_with_ldbm_api != auto ; then - AC_MSG_WARN([slapd disabled, ignoring --with-ldbm-api argument]) + if test $ol_enable_ldbm_api != auto ; then + AC_MSG_WARN([slapd disabled, ignoring --enable-ldbm-api argument]) fi - if test $ol_with_ldbm_type != auto ; then - AC_MSG_WARN([slapd disabled, ignoring --with-ldbm-type argument]) + if test $ol_enable_ldbm_type != auto ; then + AC_MSG_WARN([slapd disabled, ignoring --enable-ldbm-type argument]) fi if test $ol_enable_slurpd = yes ; then AC_MSG_ERROR([slurpd requires slapd]) @@ -377,11 +471,12 @@ if test $ol_enable_slapd = no ; then ol_enable_modules=no ol_enable_multimaster=no ol_enable_rlookups=no + ol_enable_dynacl=no ol_enable_aci=no ol_enable_wrappers=no - ol_with_ldbm_api=no - ol_with_ldbm_type=no + ol_enable_ldbm_api=no + ol_enable_ldbm_type=no ol_enable_slurpd=no @@ -390,27 +485,27 @@ if test $ol_enable_slapd = no ; then elif test $ol_enable_ldbm = no ; then dnl SLAPD without LDBM - if test $ol_with_ldbm_api != auto ; then - AC_MSG_WARN([LDBM disabled, ignoring --with-ldbm-api argument]) + if test $ol_enable_ldbm_api != auto ; then + AC_MSG_WARN([LDBM disabled, ignoring --enable-ldbm-api argument]) fi - if test $ol_with_ldbm_type != auto ; then - AC_MSG_WARN([LDBM disabled, ignoring --with-ldbm-type argument]) + if test $ol_enable_ldbm_type != auto ; then + AC_MSG_WARN([LDBM disabled, ignoring --enable-ldbm-type argument]) fi - if test $ol_enable_modules != yes -a \ - $ol_enable_bdb = no -a \ - $ol_enable_dnssrv = no -a \ - $ol_enable_hdb = no -a \ - $ol_enable_ldap = no -a \ - $ol_enable_meta = no -a \ - $ol_enable_monitor = no -a \ - $ol_enable_null = no -a \ - $ol_enable_passwd = no -a \ - $ol_enable_perl = no -a \ - $ol_enable_relay = no -a \ - $ol_enable_shell = no -a \ - $ol_enable_sql = no ; then + if test $ol_enable_modules != yes && + test $ol_enable_bdb = no && + test $ol_enable_dnssrv = no && + test $ol_enable_hdb = no && + test $ol_enable_ldap = no && + test $ol_enable_meta = no && + test $ol_enable_monitor = no && + test $ol_enable_null = no && + test $ol_enable_passwd = no && + test $ol_enable_perl = no && + test $ol_enable_relay = no && + test $ol_enable_shell = no && + test $ol_enable_sql = no ; then if test $ol_enable_slapd = yes ; then AC_MSG_ERROR([slapd requires a backend]) @@ -420,38 +515,38 @@ elif test $ol_enable_ldbm = no ; then fi fi - ol_with_ldbm_api=no - ol_with_ldbm_type=no + ol_enable_ldbm_api=no + ol_enable_ldbm_type=no - if test $ol_enable_bdb != no -o $ol_enable_hdb != no; then - ol_with_ldbm_api=berkeley + if test $ol_enable_bdb/$ol_enable_hdb != no/no; then + ol_enable_ldbm_api=berkeley fi else dnl SLAPD with LDBM - if test $ol_with_ldbm_api = gdbm -a \ - $ol_with_ldbm_type = btree ; then + if test $ol_enable_ldbm_api = gdbm && + test $ol_enable_ldbm_type = btree ; then AC_MSG_ERROR([GDBM only supports LDBM type hash]) fi - if test $ol_with_ldbm_api = mdbm -a \ - $ol_with_ldbm_type = btree ; then + if test $ol_enable_ldbm_api = mdbm && + test $ol_enable_ldbm_type = btree ; then AC_MSG_ERROR([MDBM only supports LDBM type hash]) fi - if test $ol_with_ldbm_api = ndbm -a \ - $ol_with_ldbm_type = btree ; then + if test $ol_enable_ldbm_api = ndbm && + test $ol_enable_ldbm_type = btree ; then AC_MSG_ERROR([NDBM only supports LDBM type hash]) fi - if test $ol_enable_bdb != no -o $ol_enable_hdb != no ; then - if test $ol_with_ldbm_api = auto ; then - ol_with_ldbm_api=berkeley - elif test $ol_with_ldbm_api != berkeley ; then + if test $ol_enable_bdb/$ol_enable_hdb != no/no ; then + if test $ol_enable_ldbm_api = auto ; then + ol_enable_ldbm_api=berkeley + elif test $ol_enable_ldbm_api != berkeley ; then AC_MSG_ERROR([LDBM API not compatible with BDB/HDB]) fi fi fi -if test $ol_enable_meta = yes -a $ol_enable_ldap = no ; then +if test $ol_enable_meta/$ol_enable_ldap = yes/no ; then AC_MSG_ERROR([--enable-meta requires --enable-ldap]) fi @@ -526,10 +621,10 @@ BUILD_SHELL=no BUILD_SQL=no BUILD_ACCESSLOG=no +BUILD_DDS=no BUILD_DENYOP=no BUILD_DYNGROUP=no BUILD_DYNLIST=no -BUILD_GLUE=no BUILD_LASTMOD=no BUILD_PPOLICY=no BUILD_PROXYCACHE=no @@ -539,6 +634,7 @@ BUILD_RWM=no BUILD_SYNCPROV=no BUILD_TRANSLUCENT=no BUILD_UNIQUE=no +BUILD_VALSORT=no SLAPD_STATIC_OVERLAYS= SLAPD_DYNAMIC_OVERLAYS= @@ -566,6 +662,7 @@ SLAPI_LIBS= LIBSLAPI= LIBSLAPITOOLS= AUTH_LIBS= +ICU_LIBS= SLAPD_SLP_LIBS= SLAPD_GMP_LIBS= @@ -615,10 +712,11 @@ if test $ol_aix_threads = yes ; then fi fi - if test "${CC}" = "cc_r" -o "${CC}" = "xlc_r" ; then + case ${CC} in cc_r | xlc_r) ol_with_threads=posix ol_cv_pthread_create=yes - fi + ;; + esac fi if test -z "${CC}"; then @@ -669,28 +767,16 @@ fi AC_PROG_CPP dnl ---------------------------------------------------------------- -dnl Checks for UNIX Variants -dnl AC_AIX -dnl AC_ISC_POSIX -dnl AC_MINIX - -dnl ---------------------------------------------------------------- -dnl Checks for system services -AC_CANONICAL_HOST() -AC_DIAGNOSE([obsolete],[AC_CYGWIN is obsolete: use AC_CANONICAL_HOST and $host_os])case $host_os in - *cygwin* ) CYGWIN=yes;; - * ) CYGWIN=no;; -esac - -AC_CANONICAL_HOST() -AC_DIAGNOSE([obsolete],[AC_MINGW32 is obsolete: use AC_CANONICAL_HOST and $host_os])case $host_os in - *mingw32* ) MINGW32=yes;; - * ) MINGW32=no;; +dnl Checks for Windows NT +case $host_os in + *mingw32* ) ac_cv_mingw32=yes ;; + *cygwin* ) ac_cv_cygwin=yes ;; esac +dnl ---------------------------------------------------------------- +dnl Checks for file extensions AC_EXEEXT AC_OBJEXT - AC_DEFINE_UNQUOTED(EXEEXT, "${EXEEXT}", [defined to be the EXE extension]) dnl ---------------------------------------------------------------- @@ -699,15 +785,8 @@ AC_CHECK_LIB(be, be_app, [LIBS="$LIBS -lbe -lroot -lnet"], :, [-lroot -lnet]) dnl ---------------------------------------------------------------- dnl OpenLDAP requires STDC features -AC_PROG_CC() -AC_DIAGNOSE([obsolete],[AM_PROG_CC_STDC: - your code should no longer depend upon `am_cv_prog_cc_stdc', but upon - `ac_cv_prog_cc_stdc'. Remove this warning and the assignment when - you adjust the code. You can also remove the above call to - AC_PROG_CC if you already called it elsewhere.]) -am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc - -if test "X${am_cv_prog_cc_stdc}" = "Xno" ; then +AC_PROG_CC +if test "X${ac_cv_prog_cc_stdc}" = "Xno" ; then AC_MSG_ERROR([OpenLDAP requires compiler to support STDC constructs.]) fi @@ -786,11 +865,11 @@ AC_HEADER_DIRENT AC_HEADER_SYS_WAIT AC_HEADER_TIOCGWINSZ -AC_CHECK_HEADERS( \ +AC_CHECK_HEADERS( \ arpa/inet.h \ - arpa/nameser.h \ + arpa/nameser.h \ assert.h \ - bits/types.h \ + bits/types.h \ conio.h \ crypt.h \ direct.h \ @@ -803,13 +882,11 @@ AC_CHECK_HEADERS( \ libutil.h \ limits.h \ locale.h \ - netinet/tcp.h \ malloc.h \ memory.h \ psap.h \ pwd.h \ process.h \ - resolv.h \ sgtty.h \ shadow.h \ stddef.h \ @@ -821,14 +898,13 @@ AC_CHECK_HEADERS( \ sys/errno.h \ sys/ioctl.h \ sys/param.h \ - sys/resource.h \ - sys/select.h \ - sys/socket.h \ + sys/resource.h \ + sys/select.h \ + sys/socket.h \ sys/stat.h \ - sys/syslog.h \ + sys/syslog.h \ sys/time.h \ sys/types.h \ - sys/ucred.h \ sys/uio.h \ syslog.h \ termios.h \ @@ -838,6 +914,23 @@ AC_CHECK_HEADERS( \ winsock2.h \ ) +AC_CHECK_HEADERS( resolv.h, [], [], +[$ac_includes_default +#include +]) + +AC_CHECK_HEADERS( netinet/tcp.h, [], [], +[$ac_includes_default +#include +]) + +AC_CHECK_HEADERS( sys/ucred.h, [], [], +[$ac_includes_default +#ifdef HAVE_SYS_PARAM_H +#include +#endif +]) + dnl ---------------------------------------------------------------- dnl Checks for libraries @@ -1002,7 +1095,7 @@ if test "$ol_cv_lib_resolver" != no ; then fi fi -if test "$ol_enable_dnssrv" = yes -o "$ol_enable_dnssrv" = mod ; then +if test "$ol_enable_dnssrv" = yes || test "$ol_enable_dnssrv" = mod ; then if test "$ol_link_dnssrv" = no ; then AC_MSG_ERROR([DNSSRV requires res_query()]) fi @@ -1018,7 +1111,7 @@ dnl PF_LOCAL may use getaddrinfo in available AC_CHECK_FUNCS( getaddrinfo getnameinfo gai_strerror inet_ntop ) 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 || test $ac_cv_func_inet_ntop = no ; then if test $ol_enable_ipv6 = yes ; then AC_MSG_ERROR([IPv6 support requires getaddrinfo() and inet_ntop()]) fi @@ -1040,14 +1133,14 @@ elif test $ol_enable_ipv6 != no ; then 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 + if test $ol_cv_inet6_addrstrlen = yes && + test $ol_cv_struct_sockaddr_storage = yes ; then ol_link_ipv6=yes - elif test $ol_enable_ipv6 = yes \ - -a $ol_cv_inet6_addrstrlen = no ; then + elif test $ol_enable_ipv6 = yes && + test $ol_cv_inet6_addrstrlen = no ; then AC_MSG_ERROR([IPv6 support requires INET6_ADDRSTRLEN]) - elif test $ol_enable_ipv6 = yes \ - -a $ol_cv_struct_sockaddr_storage = no ; then + elif test $ol_enable_ipv6 = yes && + test $ol_cv_struct_sockaddr_storage = no ; then AC_MSG_ERROR([IPv6 support requires struct sockaddr_storage]) fi fi @@ -1068,9 +1161,7 @@ ol_link_kbind=no ol_link_krb5=no ol_link_krb4=no -if test $ol_with_kerberos = yes -o $ol_with_kerberos = auto \ - -o $ol_with_kerberos = k5 -o $ol_with_kerberos = k5only \ - -o $ol_with_kerberos = k425 ; then +case $ol_with_kerberos in yes | auto | k5 | k5only | k425) AC_CHECK_HEADERS(krb5.h) @@ -1128,10 +1219,13 @@ if test $ol_with_kerberos = yes -o $ol_with_kerberos = auto \ fi fi -fi + ;; +esac -if test $ol_link_krb5 = yes -a \( $ol_with_kerberos = yes -o \ - $ol_with_kerberos = auto -o $ol_with_kerberos = k425 \) ; then +if test $ol_link_krb5 = yes && + { test $ol_with_kerberos = yes || + test $ol_with_kerberos = auto || + test $ol_with_kerberos = k425; }; then AC_CHECK_HEADERS(kerberosIV/krb.h kerberosIV/des.h) @@ -1190,8 +1284,7 @@ if test $ol_link_krb5 = yes ; then ol_with_kerberos=found fi -if test $ol_with_kerberos = yes -o $ol_with_kerberos = auto \ - -o $ol_with_kerberos = k4 -o $ol_with_kerberos = kth ; then +case $ol_with_kerberos in yes | auto | k4 | kth) AC_CHECK_HEADERS(krb.h des.h krb-archaeology.h ) @@ -1213,19 +1306,20 @@ if test $ol_with_kerberos = yes -o $ol_with_kerberos = auto \ fi fi fi -fi + ;; +esac -if test $ol_link_krb4 = yes -a $ol_enable_kbind != no ; then +if test $ol_link_krb4 = yes && test $ol_enable_kbind != no ; then ol_link_kbind=yes elif test $ol_enable_kbind = yes ; then AC_MSG_ERROR([Kerberos IV detection failed]) fi -if test $ol_link_krb4 = yes -o $ol_link_krb5 = yes ; then +if test $ol_link_krb4 = yes || test $ol_link_krb5 = yes ; then AC_DEFINE(HAVE_KERBEROS, 1, [define if you have Kerberos]) -elif test $ol_with_kerberos != auto -a $ol_with_kerberos != no ; then +elif test $ol_with_kerberos != auto && test $ol_with_kerberos != no ; then AC_MSG_ERROR([Kerberos detection failed]) fi @@ -1234,40 +1328,31 @@ dnl TLS/SSL ol_link_tls=no if test $ol_with_tls != no ; then - AC_CHECK_HEADERS(openssl/ssl.h ssl.h) - - if test $ac_cv_header_openssl_ssl_h = yes \ - -o $ac_cv_header_ssl_h = yes ; then - AC_CHECK_LIB(ssl, SSLeay_add_ssl_algorithms, - [have_ssleay=yes - need_rsaref=no], - [have_ssleay=no], + AC_CHECK_HEADERS(openssl/ssl.h) + + if test $ac_cv_header_openssl_ssl_h = yes ; then + AC_CHECK_LIB(ssl, SSL_library_init, + [have_openssl=yes + need_rsaref=no], [have_openssl=no], [-lcrypto]) - - if test $have_ssleay = no ; then - AC_CHECK_LIB(ssl, SSL_library_init, - [have_ssleay=yes - need_rsaref=no], [have_ssleay=no], - [-lcrypto]) - fi - if test $have_ssleay = no ; then + if test $have_openssl = no ; then AC_CHECK_LIB(ssl, ssl3_accept, - [have_ssleay=yes - need_rsaref=yes], [have_ssleay=no], + [have_openssl=yes + need_rsaref=yes], [have_openssl=no], [-lcrypto -lRSAglue -lrsaref]) fi - if test $have_ssleay = yes ; then + if test $have_openssl = yes ; then ol_with_tls=found ol_link_tls=yes - AC_DEFINE(HAVE_SSLEAY, 1, - [define if you have SSLeay or OpenSSL]) + AC_DEFINE(HAVE_OPENSSL, 1, + [define if you have OpenSSL]) if test $need_rsaref = yes; then AC_DEFINE(HAVE_RSAREF, 1, - [define if you have RSAref]) + [define if OpenSSL needs RSAref]) TLS_LIBS="-lssl -lcrypto -lRSAglue -lrsaref" else @@ -1314,8 +1399,7 @@ dnl ---------------------------------------------------------------- dnl Threads? ol_link_threads=no -if test $ol_with_threads = auto -o $ol_with_threads = yes \ - -o $ol_with_threads = nt ; then +case $ol_with_threads in auto | yes | nt) OL_NT_THREADS @@ -1331,10 +1415,10 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \ if test $ol_with_threads = nt ; then AC_MSG_ERROR([could not locate NT Threads]) fi -fi + ;; +esac -if test $ol_with_threads = auto -o $ol_with_threads = yes \ - -o $ol_with_threads = posix ; then +case $ol_with_threads in auto | yes | posix) AC_CHECK_HEADERS(pthread.h) @@ -1394,9 +1478,12 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \ dnl pthread_create in $LIBS AC_CACHE_CHECK([for pthread_create in default libraries], ol_cv_pthread_create,[ - AC_RUN_IFELSE([AC_LANG_SOURCE([[OL_PTHREAD_TEST_PROGRAM]])],[ol_cv_pthread_create=yes],[ol_cv_pthread_create=no],[_au_changequote([,])AC_TRY_LINK(OL_PTHREAD_TEST_INCLUDES,OL_PTHREAD_TEST_FUNCTION, + AC_RUN_IFELSE([OL_PTHREAD_TEST_PROGRAM], [ol_cv_pthread_create=yes], - [ol_cv_pthread_create=no])])]) + [ol_cv_pthread_create=no], + [AC_TRY_LINK(OL_PTHREAD_TEST_INCLUDES,OL_PTHREAD_TEST_FUNCTION, + [ol_cv_pthread_create=yes], + [ol_cv_pthread_create=no])])]) if test $ol_cv_pthread_create != no ; then ol_link_threads=posix @@ -1447,9 +1534,9 @@ dnl [ol_cv_pthread_lpthread_lexc]) dnl check for both, and thr_yield for Solaris AC_CHECK_FUNCS(sched_yield pthread_yield thr_yield) - if test $ac_cv_func_sched_yield = no -a \ - $ac_cv_func_pthread_yield = no -a \ - $ac_cv_func_thr_yield = no ; then + if test $ac_cv_func_sched_yield = no && + test $ac_cv_func_pthread_yield = no && + test $ac_cv_func_thr_yield = no ; then dnl Digital UNIX has sched_yield() in -lrt AC_CHECK_LIB(rt, sched_yield, [LTHREAD_LIBS="$LTHREAD_LIBS -lrt" @@ -1458,9 +1545,9 @@ dnl [ol_cv_pthread_lpthread_lexc]) ac_cv_func_sched_yield=yes], [ac_cv_func_sched_yield=no]) fi - if test $ac_cv_func_sched_yield = no -a \ - $ac_cv_func_pthread_yield = no -a \ - "$ac_cv_func_thr_yield" = no ; then + if test $ac_cv_func_sched_yield = no && + test $ac_cv_func_pthread_yield = no && + test "$ac_cv_func_thr_yield" = no ; then AC_MSG_WARN([could not locate sched_yield() or pthread_yield()]) fi @@ -1504,13 +1591,29 @@ dnl [ol_cv_pthread_lpthread_lexc]) AC_CACHE_CHECK([if pthread_create() works], ol_cv_pthread_create_works,[ - AC_RUN_IFELSE([AC_LANG_SOURCE([[OL_PTHREAD_TEST_PROGRAM]])],[ol_cv_pthread_create_works=yes],[ol_cv_pthread_create_works=no],[dnl assume yes + AC_RUN_IFELSE([OL_PTHREAD_TEST_PROGRAM], + [ol_cv_pthread_create_works=yes], + [ol_cv_pthread_create_works=no], + [dnl assume yes ol_cv_pthread_create_works=yes])]) if test $ol_cv_pthread_create_works = no ; then AC_MSG_ERROR([pthread_create is not usable, check environment settings]) fi + ol_replace_broken_yield=no +dnl case "$target" in +dnl *-*-linux*) +dnl AC_CHECK_FUNCS(nanosleep) +dnl ol_replace_broken_yield=yes +dnl ;; +dnl esac + + if test $ol_replace_broken_yield = yes ; then + AC_DEFINE([REPLACE_BROKEN_YIELD],1, + [define if sched_yield yields the entire process]) + fi + dnl Check if select causes an yield if test $ol_with_yielding_select = auto ; then AC_CACHE_CHECK([if select yields when using pthreads], @@ -1610,10 +1713,10 @@ int main(argc, argv) if test $ol_with_threads = posix ; then AC_MSG_ERROR([could not locate POSIX Threads]) fi -fi + ;; +esac -if test $ol_with_threads = auto -o $ol_with_threads = yes \ - -o $ol_with_threads = mach ; then +case $ol_with_threads in auto | yes | mach) dnl check for Mach CThreads AC_CHECK_HEADERS(mach/cthreads.h cthreads.h) @@ -1675,10 +1778,10 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \ elif test $ol_with_threads = found ; then AC_MSG_ERROR([could not link with Mach CThreads]) fi -fi + ;; +esac -if test $ol_with_threads = auto -o $ol_with_threads = yes \ - -o $ol_with_threads = pth ; then +case $ol_with_threads in auto | yes | pth) AC_CHECK_HEADERS(pth.h) @@ -1696,14 +1799,15 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \ fi fi fi -fi + ;; +esac -if test $ol_with_threads = auto -o $ol_with_threads = yes \ - -o $ol_with_threads = lwp ; then +case $ol_with_threads in auto | yes | lwp) dnl check for SunOS5 LWP AC_CHECK_HEADERS(thread.h synch.h) - if test $ac_cv_header_thread_h = yes -a $ac_cv_header_synch_h = yes ; then + if test $ac_cv_header_thread_h = yes && + test $ac_cv_header_synch_h = yes ; then AC_CHECK_LIB(thread, thr_create, [have_thr=yes], [have_thr=no]) if test $have_thr = yes ; then @@ -1740,7 +1844,8 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \ fi fi fi -fi + ;; +esac if test $ol_with_yielding_select = yes ; then AC_DEFINE(HAVE_YIELDING_SELECT,1, @@ -1762,7 +1867,7 @@ if test $ol_with_threads = manual ; then AC_CHECK_HEADERS(thread.h synch.h) fi -if test $ol_link_threads != no -a $ol_link_threads != nt ; then +if test $ol_link_threads != no && test $ol_link_threads != nt ; then dnl needed to get reentrant/threadsafe versions dnl AC_DEFINE(REENTRANT,1) @@ -1787,8 +1892,8 @@ if test $ol_link_threads != no -a $ol_link_threads != nt ; then AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[h_errno = 0;]])],[ol_cv_h_errno_thread_specific=yes],[ol_cv_h_errno_thread_specific=no]) ]) - if test $ol_cv_errno_thread_specific != yes \ - -o $ol_cv_h_errno_thread_specific != yes ; then + if test $ol_cv_errno_thread_specific != yes || + test $ol_cv_h_errno_thread_specific != yes ; then LIBS="$LTHREAD_LIBS $LIBS" LTHREAD_LIBS="" fi @@ -1857,10 +1962,14 @@ if test $ol_link_threads = no ; then AC_DEFINE(NO_THREADS,1, [define if you have (or want) no threads]) LTHREAD_LIBS="" + BUILD_THREAD=no +else + BUILD_THREAD=yes fi if test $ol_link_threads != no ; then - AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE,1) + AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE,1, + [define to 1 if library is thread safe]) fi dnl ---------------------------------------------------------------- @@ -1892,11 +2001,9 @@ fi dnl ---------------------------------------------------------------- ol_link_ldbm=no -if test $ol_with_ldbm_api = auto \ - -o $ol_with_ldbm_api = berkeley \ - -o $ol_with_ldbm_api = bcompat ; then +case $ol_enable_ldbm_api in auto | berkeley | bcompat) - if test $ol_with_ldbm_api = bcompat; then \ + if test $ol_enable_ldbm_api = bcompat; then \ OL_BERKELEY_COMPAT_DB else OL_BERKELEY_DB @@ -1907,9 +2014,9 @@ if test $ol_with_ldbm_api = auto \ [define this if Berkeley DB is available]) ol_link_ldbm=berkeley - ol_with_ldbm_api=berkeley + ol_enable_ldbm_api=berkeley - if test $ol_with_ldbm_type = hash ; then + if test $ol_enable_ldbm_type = hash ; then AC_DEFINE(LDBM_USE_DBHASH,1, [define this to use DBHASH w/ LDBM backend]) else @@ -1923,9 +2030,10 @@ if test $ol_with_ldbm_api = auto \ LDBM_LIBS="$LDBM_LIBS $ol_cv_lib_db" fi fi -fi + ;; +esac -if test $ol_enable_bdb != no -o $ol_enable_hdb != no; then +if test $ol_enable_bdb/$ol_enable_hdb != no/no; then if test $ol_link_ldbm != berkeley ; then AC_MSG_ERROR(BDB/HDB: BerkeleyDB not available) else @@ -1937,29 +2045,29 @@ if test $ol_enable_bdb != no -o $ol_enable_hdb != no; then fi fi -if test $ol_link_ldbm = no -a $ol_with_ldbm_type = btree ; then +if test $ol_link_ldbm = no && test $ol_enable_ldbm_type = btree ; then AC_MSG_WARN([Could not find LDBM with BTREE support]) - ol_with_ldbm_api=none + ol_enable_ldbm_api=none fi -if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = mdbm ; then +if test $ol_enable_ldbm_api = auto || test $ol_enable_ldbm_api = mdbm ; then OL_MDBM if test $ol_cv_mdbm = yes ; then ol_link_ldbm=mdbm - ol_with_ldbm_api=mdbm + ol_enable_ldbm_api=mdbm if test $ol_cv_lib_mdbm != yes ; then LDBM_LIBS="$LDBM_LIBS $ol_cv_lib_mdbm" fi fi fi -if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = gdbm ; then +if test $ol_enable_ldbm_api = auto || test $ol_enable_ldbm_api = gdbm ; then OL_GDBM if test $ol_cv_gdbm = yes ; then ol_link_ldbm=gdbm - ol_with_ldbm_api=gdbm + ol_enable_ldbm_api=gdbm if test $ol_cv_lib_gdbm != yes ; then LDBM_LIBS="$LDBM_LIBS $ol_cv_lib_gdbm" @@ -1967,12 +2075,12 @@ if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = gdbm ; then fi fi -if test $ol_with_ldbm_api = ndbm ; then +if test $ol_enable_ldbm_api = ndbm ; then OL_NDBM if test $ol_cv_ndbm = yes ; then ol_link_ldbm=ndbm - ol_with_ldbm_api=ndbm + ol_enable_ldbm_api=ndbm if test $ol_cv_lib_ndbm != yes ; then LDBM_LIBS="$LDBM_LIBS $ol_cv_lib_ndbm" @@ -1980,19 +2088,19 @@ 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 && test $ol_enable_ldbm != no ; then AC_MSG_ERROR([could not find suitable LDBM backend]) fi -if test $ol_enable_bdb = yes -o \ - $ol_enable_hdb = yes -o \ - $ol_enable_ldbm = yes ; then +if test $ol_enable_bdb = yes || + test $ol_enable_hdb = yes || + test $ol_enable_ldbm = yes ; then SLAPD_LIBS="$SLAPD_LIBS \$(LDBM_LIBS)" fi dnl ---------------------------------------------------------------- -if test $ol_enable_dynamic = yes -a $enable_shared = yes ; then +if test $ol_enable_dynamic = yes && test $enable_shared = yes ; then BUILD_LIBS_DYNAMIC=shared AC_DEFINE(LDAP_LIBS_DYNAMIC, 1, [define if LDAP libs are dynamic]) LTSTATIC="" @@ -2021,7 +2129,7 @@ hosts_access(req) LIBS="$save_LIBS"],[ dnl try with -lnsl LIBS="$LIBS -lnsl" - _au_changequote([,])AC_TRY_LINK([ + AC_TRY_LINK([ #include int allow_severity = 0; int deny_severity = 0; @@ -2050,19 +2158,12 @@ fi dnl ---------------------------------------------------------------- if test $ol_enable_syslog != no ; then AC_CHECK_FUNC(openlog) - if test $ac_cv_func_openlog = no -a $ol_enable_syslog = yes; then + if test $ac_cv_func_openlog = no && test $ol_enable_syslog = yes; then AC_MSG_ERROR(could not find syslog, select appropriate options or disable) fi ol_enable_syslog=$ac_cv_func_openlog fi -dnl ---------------------------------------------------------------- -dnl dmalloc support (deprecated in favor of -DCSRIMALLOC support) -dnl if test $ol_enable_dmalloc != no ; then -dnl AC_CHECK_HEADERS(dmalloc.h) -dnl AC_CHECK_LIB(dmalloc, dmalloc_shutdown) -dnl fi - dnl ---------------------------------------------------------------- dnl SQL ol_link_sql=no @@ -2094,6 +2195,14 @@ if test $ol_enable_sql != no ; then fi fi +dnl ---------------------------------------------------------------- +dnl International Components for Unicode +OL_ICU +if test "$ol_icu" = no ; then + AC_MSG_WARN([ICU not available]) +else + ICU_LIBS="$ol_icu" +fi dnl ---------------------------------------------------------------- dnl dnl Check for Cyrus SASL @@ -2104,7 +2213,8 @@ ol_link_spasswd=no if test $ol_with_cyrus_sasl != no ; then AC_CHECK_HEADERS(sasl/sasl.h sasl.h) - if test $ac_cv_header_sasl_sasl_h = yes -o $ac_cv_header_sasl_h = yes; then + if test $ac_cv_header_sasl_sasl_h = yes || + test $ac_cv_header_sasl_h = yes; then AC_CHECK_LIB(sasl2, sasl_client_init, [ol_link_sasl="-lsasl2"], [AC_CHECK_LIB(sasl, sasl_client_init, @@ -2152,7 +2262,7 @@ fi dnl ---------------------------------------------------------------- dnl Check for entropy sources -if test $cross_compiling != yes -a "$ac_cv_mingw32" != yes ; then +if test $cross_compiling != yes && test "$ac_cv_mingw32" != yes ; then dev=no if test -r /dev/urandom ; then dev="/dev/urandom"; @@ -2263,18 +2373,18 @@ if test "$ol_with_multiple_precision" != "no" ; then ol_have_bn_h=no ol_have_crypto_h=no - if test "$ac_cv_header_openssl_bn_h" = "yes" \ - -o "$ac_cv_header_bn_h" = "yes" ; then + if test "$ac_cv_header_openssl_bn_h" = "yes" || + test "$ac_cv_header_bn_h" = "yes" ; then ol_have_bn_h=yes fi - if test "$ac_cv_header_openssl_crypto_h" = "yes" \ - -o "$ac_cv_header_crypto_h" = "yes" ; then + if test "$ac_cv_header_openssl_crypto_h" = "yes" || + test "$ac_cv_header_crypto_h" = "yes" ; then ol_have_crypto_h=yes fi - if test "$ol_have_bn_h" = "yes" \ - -a "$ol_have_crypto_h" = "yes" ; then + if test "$ol_have_bn_h" = "yes" && + test "$ol_have_crypto_h" = "yes" ; then ol_have_bignum=yes fi fi @@ -2329,7 +2439,7 @@ if test "$ol_with_multiple_precision" != "no" ; then case "$ol_mp_support" in bignum) AC_DEFINE(HAVE_BIGNUM, 1, - [define if you have SSLeay or OpenSSL's BIGNUM]) + [define if you have OpenSSL's BIGNUM]) ;; gmp) AC_DEFINE(HAVE_GMP, 1, [define if you have -lgmp]) @@ -2345,42 +2455,43 @@ fi dnl ---------------------------------------------------------------- dnl Checks for typedefs, structures, and compiler characteristics. -dnl Checks for long long -AC_CACHE_CHECK([long long], ol_cv_type_long_long, [ - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[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_CHECK_TYPE(mode_t, int) +AC_CHECK_TYPE(off_t, long) +AC_CHECK_TYPE(pid_t, int) +AC_CHECK_TYPE(ssize_t, [signed int]) +AC_CHECK_TYPE(caddr_t, [char *]) +AC_CHECK_TYPE(size_t, unsigned) -AC_TYPE_MODE_T -AC_TYPE_OFF_T -AC_TYPE_PID_T +AC_CHECK_TYPES([long long]) AC_CHECK_TYPES([ptrdiff_t]) + +AC_CHECK_TYPE([socklen_t],, + [AC_DEFINE_UNQUOTED([socklen_t], [int], + [Define to `int' if does not define.])], + [$ac_includes_default +#ifdef HAVE_SYS_SOCKET_H +#include +#endif + ]) + AC_TYPE_SIGNAL -AC_TYPE_SIZE_T -AC_CHECK_TYPE(ssize_t, [signed int]) -AC_CHECK_TYPE(caddr_t, [char *]) +AC_CHECK_TYPE([sig_atomic_t],, + [AC_DEFINE_UNQUOTED([sig_atomic_t], [int], + [Define to `int' if does not define.])], + [$ac_includes_default +#include + ]) -OL_TYPE_SOCKLEN_T -AC_DIAGNOSE([obsolete],[AC_STRUCT_ST_BLKSIZE: - your code should no longer depend upon `HAVE_ST_BLKSIZE', but - `HAVE_STRUCT_STAT_ST_BLKSIZE'. Remove this warning and - the `AC_DEFINE' when you adjust the code.]) -AC_CHECK_MEMBERS([struct stat.st_blksize],[AC_DEFINE(HAVE_ST_BLKSIZE, 1, - [Define to 1 if your `struct stat' has - `st_blksize'. Deprecated, use - `HAVE_STRUCT_STAT_ST_BLKSIZE' instead.])]) +AC_TYPE_UID_T AC_HEADER_TIME AC_STRUCT_TM -AC_TYPE_UID_T -OL_TYPE_SIG_ATOMIC_T - -dnl AC_TYPE_GETGROUPS - -OL_STRUCT_PASSWD_PW_GECOS -OL_STRUCT_PASSWD_PW_PASSWD +AC_CHECK_MEMBERS([struct stat.st_blksize]) +AC_CHECK_MEMBERS([struct passwd.pw_gecos],,,[$ac_includes_default +#include ]) +AC_CHECK_MEMBERS([struct passwd.pw_passwd],,,[$ac_includes_default +#include ]) OL_C_UPPER_LOWER AC_C_CONST @@ -2393,22 +2504,22 @@ else AC_C_BIGENDIAN fi -AC_COMPILE_CHECK_SIZEOF(short) -AC_COMPILE_CHECK_SIZEOF(int) -AC_COMPILE_CHECK_SIZEOF(long) -AC_COMPILE_CHECK_SIZEOF(wchar_t) +AC_CHECK_SIZEOF(short) +AC_CHECK_SIZEOF(int) +AC_CHECK_SIZEOF(long) +AC_CHECK_SIZEOF(wchar_t) if test "$ac_cv_sizeof_int" -lt 4 ; then AC_MSG_WARN([OpenLDAP requires 'int' to be 32 bits or greater.]) - AC_DEFINE(LBER_INT_T,long) + AC_DEFINE(LBER_INT_T,long,[define to 32-bit or greater integer type]) else - AC_DEFINE(LBER_INT_T,int) + AC_DEFINE(LBER_INT_T,int,[define to 32-bit or greater integer type]) fi -AC_DEFINE(LBER_LEN_T,long) -AC_DEFINE(LBER_SOCKET_T,int) -AC_DEFINE(LBER_TAG_T,long) +AC_DEFINE(LBER_LEN_T,long,[define to large integer type]) +AC_DEFINE(LBER_SOCKET_T,int,[define to socket descriptor type]) +AC_DEFINE(LBER_TAG_T,long,[define to large integer type]) dnl ---------------------------------------------------------------- dnl Checks for library functions. @@ -2419,9 +2530,7 @@ if test $ac_cv_func_memcmp_working = no ; then [define if memcmp is not 8-bit clean or is otherwise broken]) fi -dnl AC_FUNC_MKTIME([]) dnl checks for sys/time.h and unistd.h AC_FUNC_STRFTIME -dnl AC_FUNC_STRTOD([]) OL_FUNC_INET_ATON @@ -2462,9 +2571,11 @@ AC_CHECK_FUNCS( \ getspnam \ gettimeofday \ initgroups \ + inet_ntoa_b \ lockf \ memcpy \ memmove \ + memrchr \ mkstemp \ mktemp \ pipe \ @@ -2490,7 +2601,6 @@ AC_CHECK_FUNCS( \ strtoll \ strspn \ sysconf \ - usleep \ waitpid \ wait4 \ write \ @@ -2505,14 +2615,28 @@ AC_REPLACE_FUNCS(getopt getpeereid) if test "$ac_cv_func_getopt" != yes; then LIBSRCS="$LIBSRCS getopt.c" fi + if test "$ac_cv_func_getpeereid" != yes; then - OL_MSGHDR_MSG_ACCRIGHTS - if test "$ac_cv_func_getpeereid" != yes; then - OL_MSGHDR_MSG_CONTROL + AC_CHECK_FUNCS( getpeerucred ) + if test "$ac_cv_func_getpeerucred" != yes ; then + AC_CHECK_MEMBERS([struct msghdr.msg_accrightslen],,, + [$ac_includes_default +#ifdef HAVE_SYS_SOCKET_H +#include +#endif]) + if test "$ac_cv_member_struct_msghdr_msg_accrightslen" != yes; then + AC_CHECK_MEMBERS([struct msghdr.msg_control],,, + [$ac_includes_default +#ifdef HAVE_SYS_SOCKET_H +#include +#endif]) + fi fi 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 || + test "$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 @@ -2543,6 +2667,10 @@ if test "$ol_enable_slapi" != no ; then fi if test "$ol_enable_debug" != no ; then + if test "$ol_enable_debug" = traditional; then + AC_DEFINE(OLD_DEBUG,1, + [define to use the original debug style]) + fi AC_DEFINE(LDAP_DEBUG,1, [define this to add debugging code]) fi @@ -2551,14 +2679,16 @@ if test "$ol_enable_syslog" = yes ; then [define this to add syslog code]) fi 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, + [define to LDAP VENDOR VERSION]) fi if test "$ol_enable_proctitle" != no ; then AC_DEFINE(LDAP_PROCTITLE,1, [define this for LDAP process title support]) fi if test "$ol_enable_referrals" != no ; then - AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS,LDAP_VENDOR_VERSION) + AC_DEFINE(LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS,LDAP_VENDOR_VERSION, + [define to LDAP VENDOR VERSION]) fi if test "$ol_enable_local" != no; then AC_DEFINE(LDAP_PF_LOCAL,1,[define to support PF_LOCAL]) @@ -2582,7 +2712,24 @@ if test "$ol_enable_rlookups" != no ; then AC_DEFINE(SLAPD_RLOOKUPS,1,[define to support reverse lookups]) fi if test "$ol_enable_aci" != no ; then - AC_DEFINE(SLAPD_ACI_ENABLED,1,[define to support per-object ACIs]) + if test $ol_enable_dynacl = no ; then + ol_enable_dynacl=yes + AC_MSG_WARN([ACIs need dynacl]) + fi + if test "$ol_enable_aci" = mod ; then + MFLAG=SLAPD_MOD_DYNAMIC + dnl remove this after moving servers/slapd/aci.c in contrib/slapd-modules/acl + AC_MSG_ERROR([ACI build as dynamic module not supported (yet)]) + else + MFLAG=SLAPD_MOD_STATIC + fi + WITH_ACI_ENABLED=$ol_enable_aci + AC_DEFINE_UNQUOTED(SLAPD_ACI_ENABLED,$MFLAG,[define to support per-object ACIs]) +else + WITH_ACI_ENABLED=no +fi +if test "$ol_enable_dynacl" != no ; then + AC_DEFINE(SLAP_DYNACL,1,[define to support run-time loadable ACL]) fi if test "$ol_link_modules" != no ; then @@ -2646,7 +2793,7 @@ if test "$ol_enable_ldap" != no ; then AC_DEFINE_UNQUOTED(SLAPD_LDAP,$MFLAG,[define to support LDAP backend]) fi -if test "$ol_link_ldbm" != no -a $ol_enable_ldbm != no; then +if test "$ol_link_ldbm" != no && test $ol_enable_ldbm != no; then BUILD_SLAPD=yes BUILD_LDBM=$ol_enable_ldbm if test "$ol_enable_ldbm" = mod ; then @@ -2739,7 +2886,7 @@ if test "$ol_enable_relay" != no ; then fi if test "$ol_enable_shell" != no ; then - if test "$ol_link_thread" != no ; then + if test "$ol_link_threads" != no ; then AC_MSG_WARN([Use of --without-threads is recommended with back-shell]) fi BUILD_SLAPD=yes @@ -2779,6 +2926,18 @@ if test "$ol_enable_accesslog" != no ; then AC_DEFINE_UNQUOTED(SLAPD_OVER_ACCESSLOG,$MFLAG,[define for In-Directory Access Logging overlay]) fi +if test "$ol_enable_dds" != no ; then + BUILD_DDS=$ol_enable_dds + if test "$ol_enable_dds" = mod ; then + MFLAG=SLAPD_MOD_DYNAMIC + SLAPD_DYNAMIC_OVERLAYS="$SLAPD_DYNAMIC_OVERLAYS dds.la" + else + MFLAG=SLAPD_MOD_STATIC + SLAPD_STATIC_OVERLAYS="$SLAPD_STATIC_OVERLAYS dds.o" + fi + AC_DEFINE_UNQUOTED(SLAPD_OVER_DDS,$MFLAG,[define for Dynamic Directory Services overlay]) +fi + if test "$ol_enable_denyop" != no ; then BUILD_DENYOP=$ol_enable_denyop if test "$ol_enable_denyop" = mod ; then @@ -2788,7 +2947,7 @@ if test "$ol_enable_denyop" != no ; then MFLAG=SLAPD_MOD_STATIC SLAPD_STATIC_OVERLAYS="$SLAPD_STATIC_OVERLAYS denyop.o" fi - AC_DEFINE_UNQUOTED(SLAPD_OVER_DENYOP,$MFLAG,[define for Dynamic Group overlay]) + AC_DEFINE_UNQUOTED(SLAPD_OVER_DENYOP,$MFLAG,[define for Deny Operation overlay]) fi if test "$ol_enable_dyngroup" != no ; then @@ -2815,18 +2974,6 @@ if test "$ol_enable_dynlist" != no ; then AC_DEFINE_UNQUOTED(SLAPD_OVER_DYNLIST,$MFLAG,[define for Dynamic List overlay]) fi -if test "$ol_enable_glue" != no ; then - BUILD_GLUE=$ol_enable_glue - if test "$ol_enable_glue" = mod ; then - MFLAG=SLAPD_MOD_DYNAMIC - SLAPD_DYNAMIC_OVERLAYS="$SLAPD_DYNAMIC_OVERLAYS glue.la" - else - MFLAG=SLAPD_MOD_STATIC - SLAPD_STATIC_OVERLAYS="$SLAPD_STATIC_OVERLAYS glue.o" - fi - AC_DEFINE_UNQUOTED(SLAPD_OVER_GLUE,$MFLAG,[define for Backend Glue overlay]) -fi - if test "$ol_enable_lastmod" != no ; then BUILD_LASTMOD=$ol_enable_lastmod if test "$ol_enable_lastmod" = mod ; then @@ -2936,8 +3083,21 @@ if test "$ol_enable_unique" != no ; then AC_DEFINE_UNQUOTED(SLAPD_OVER_UNIQUE,$MFLAG,[define for Attribute Uniqueness overlay]) fi -if test "$ol_enable_slurpd" != no -a "$ol_link_threads" != no -a \ - $BUILD_SLAPD = yes ; then +if test "$ol_enable_valsort" != no ; then + BUILD_VALSORT=$ol_enable_valsort + if test "$ol_enable_valsort" = mod ; then + MFLAG=SLAPD_MOD_DYNAMIC + SLAPD_DYNAMIC_OVERLAYS="$SLAPD_DYNAMIC_OVERLAYS valsort.la" + else + MFLAG=SLAPD_MOD_STATIC + SLAPD_STATIC_OVERLAYS="$SLAPD_STATIC_OVERLAYS valsort.o" + fi + AC_DEFINE_UNQUOTED(SLAPD_OVER_VALSORT,$MFLAG,[define for Value Sorting overlay]) +fi + +if test "$ol_enable_slurpd" != no && + test "$ol_link_threads" != no && + test $BUILD_SLAPD = yes ; then BUILD_SLURPD=yes fi @@ -2971,6 +3131,8 @@ AC_SUBST(PLAT) AC_SUBST(WITH_SASL) AC_SUBST(WITH_TLS) AC_SUBST(WITH_MODULES_ENABLED) +AC_SUBST(WITH_ACI_ENABLED) +AC_SUBST(BUILD_THREAD) AC_SUBST(BUILD_LIBS_DYNAMIC) AC_SUBST(BUILD_SLAPD) @@ -2993,10 +3155,10 @@ dnl backends AC_SUBST(BUILD_SQL) dnl overlays AC_SUBST(BUILD_ACCESSLOG) + AC_SUBST(BUILD_DDS) AC_SUBST(BUILD_DENYOP) AC_SUBST(BUILD_DYNGROUP) AC_SUBST(BUILD_DYNLIST) - AC_SUBST(BUILD_GLUE) AC_SUBST(BUILD_LASTMOD) AC_SUBST(BUILD_PPOLICY) AC_SUBST(BUILD_PROXYCACHE) @@ -3006,6 +3168,7 @@ dnl overlays AC_SUBST(BUILD_SYNCPROV) AC_SUBST(BUILD_TRANSLUCENT) AC_SUBST(BUILD_UNIQUE) + AC_SUBST(BUILD_VALSORT) AC_SUBST(BUILD_SLURPD) AC_SUBST(LDAP_LIBS) @@ -3038,6 +3201,7 @@ AC_SUBST(SLAPI_LIBS) AC_SUBST(LIBSLAPI) AC_SUBST(LIBSLAPITOOLS) AC_SUBST(AUTH_LIBS) +AC_SUBST(ICU_LIBS) AC_SUBST(SLAPD_SLP_LIBS) AC_SUBST(SLAPD_GMP_LIBS) @@ -3055,48 +3219,47 @@ dnl ---------------------------------------------------------------- dnl final output dnl -AC_CONFIG_FILES([\ -Makefile:build/top.mk:Makefile.in:build/dir.mk \ -doc/Makefile:build/top.mk:doc/Makefile.in:build/dir.mk \ -doc/man/Makefile:build/top.mk:doc/man/Makefile.in:build/dir.mk \ -doc/man/man1/Makefile:build/top.mk:doc/man/man1/Makefile.in:build/man.mk \ -doc/man/man3/Makefile:build/top.mk:doc/man/man3/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 \ -clients/Makefile:build/top.mk:clients/Makefile.in:build/dir.mk \ -clients/tools/Makefile:build/top.mk:clients/tools/Makefile.in:build/rules.mk \ -include/Makefile:build/top.mk:include/Makefile.in \ -libraries/Makefile:build/top.mk:libraries/Makefile.in:build/dir.mk \ -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_r/Makefile:build/top.mk:libraries/libldap_r/Makefile.in:build/lib.mk:build/lib-shared.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/librewrite/Makefile:build/top.mk:libraries/librewrite/Makefile.in:build/lib.mk:build/lib-shared.mk \ -servers/Makefile:build/top.mk:servers/Makefile.in:build/dir.mk \ -servers/slapd/Makefile:build/top.mk:servers/slapd/Makefile.in:build/srv.mk \ -servers/slapd/back-bdb/Makefile:build/top.mk:servers/slapd/back-bdb/Makefile.in:build/mod.mk \ -servers/slapd/back-dnssrv/Makefile:build/top.mk:servers/slapd/back-dnssrv/Makefile.in:build/mod.mk \ -servers/slapd/back-hdb/Makefile:build/top.mk:servers/slapd/back-hdb/Makefile.in:build/mod.mk \ -servers/slapd/back-ldap/Makefile:build/top.mk:servers/slapd/back-ldap/Makefile.in:build/mod.mk \ -servers/slapd/back-ldbm/Makefile:build/top.mk:servers/slapd/back-ldbm/Makefile.in:build/mod.mk \ -servers/slapd/back-ldif/Makefile:build/top.mk:servers/slapd/back-ldif/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-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-perl/Makefile:build/top.mk:servers/slapd/back-perl/Makefile.in:build/mod.mk \ -servers/slapd/back-relay/Makefile:build/top.mk:servers/slapd/back-relay/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/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/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 \ -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 \ -]) +AC_CONFIG_FILES([Makefile:build/top.mk:Makefile.in:build/dir.mk] +[doc/Makefile:build/top.mk:doc/Makefile.in:build/dir.mk] +[doc/man/Makefile:build/top.mk:doc/man/Makefile.in:build/dir.mk] +[doc/man/man1/Makefile:build/top.mk:doc/man/man1/Makefile.in:build/man.mk] +[doc/man/man3/Makefile:build/top.mk:doc/man/man3/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] +[clients/Makefile:build/top.mk:clients/Makefile.in:build/dir.mk] +[clients/tools/Makefile:build/top.mk:clients/tools/Makefile.in:build/rules.mk] +[include/Makefile:build/top.mk:include/Makefile.in] +[libraries/Makefile:build/top.mk:libraries/Makefile.in:build/dir.mk] +[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_r/Makefile:build/top.mk:libraries/libldap_r/Makefile.in:build/lib.mk:build/lib-shared.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/librewrite/Makefile:build/top.mk:libraries/librewrite/Makefile.in:build/lib.mk:build/lib-static.mk] +[servers/Makefile:build/top.mk:servers/Makefile.in:build/dir.mk] +[servers/slapd/Makefile:build/top.mk:servers/slapd/Makefile.in:build/srv.mk] +[servers/slapd/back-bdb/Makefile:build/top.mk:servers/slapd/back-bdb/Makefile.in:build/mod.mk] +[servers/slapd/back-dnssrv/Makefile:build/top.mk:servers/slapd/back-dnssrv/Makefile.in:build/mod.mk] +[servers/slapd/back-hdb/Makefile:build/top.mk:servers/slapd/back-hdb/Makefile.in:build/mod.mk] +[servers/slapd/back-ldap/Makefile:build/top.mk:servers/slapd/back-ldap/Makefile.in:build/mod.mk] +[servers/slapd/back-ldbm/Makefile:build/top.mk:servers/slapd/back-ldbm/Makefile.in:build/mod.mk] +[servers/slapd/back-ldif/Makefile:build/top.mk:servers/slapd/back-ldif/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-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-perl/Makefile:build/top.mk:servers/slapd/back-perl/Makefile.in:build/mod.mk] +[servers/slapd/back-relay/Makefile:build/top.mk:servers/slapd/back-relay/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/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/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] +[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]) + AC_CONFIG_COMMANDS([default],[[ chmod +x tests/run date > stamp-h @@ -3106,7 +3269,7 @@ rm -f $BACKENDSC cat > $BACKENDSC << ENDX /* This work is part of OpenLDAP Software . * - * Copyright 1998-2005 The OpenLDAP Foundation. + * Copyright 1998-2006 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -3133,7 +3296,7 @@ ENDX cat >> $BACKENDSC << ENDX -BackendInfo slap_binfo[[]] = { +BackendInfo slap_binfo[] = { ENDX for b in config ${STATIC_BACKENDS}; do @@ -3151,7 +3314,63 @@ ENDX /* end of generated file */ ENDX fi +OVERLAYSC="servers/slapd/overlays/statover.c" +echo "Making $OVERLAYSC" +rm -f $OVERLAYSC +cat > $OVERLAYSC << ENDX +/* This work is part of OpenLDAP Software . + * + * Copyright 1998-2006 The OpenLDAP Foundation. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted only as authorized by the OpenLDAP + * Public License. + * + * A copy of this license is available in the file LICENSE in the + * top-level directory of the distribution or, alternatively, at + * . + */ +/* This file is automatically generated by configure; please do not edit. */ + +#include "portable.h" +#include "slap.h" + +ENDX +if test "${STATIC_OVERLAYS}"; then + for o in ${STATIC_OVERLAYS}; do + oo=`echo "${o}" | sed -e 's/.o$//' -e 's/_x$//'` + cat >> $OVERLAYSC << ENDX +extern OV_init ${oo}_initialize; +ENDX + done +fi + +cat >> $OVERLAYSC << ENDX + +OverlayInit slap_oinfo[] = { +ENDX + +if test "${STATIC_OVERLAYS}"; then + for o in ${STATIC_OVERLAYS}; do + oo=`echo "${o}" | sed -e 's/.o$//' -e 's/_x$//'` + echo " Add ${oo} ..." + cat >> $OVERLAYSC << ENDX + { "${oo}", ${oo}_initialize }, +ENDX + done +fi + + cat >> $OVERLAYSC << ENDX + { NULL, NULL }, +}; + +/* end of generated file */ +ENDX echo Please run \"make depend\" to build dependencies -]],[[STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS"]]) +]],[[ +STATIC_BACKENDS="$SLAPD_STATIC_BACKENDS" +STATIC_OVERLAYS="$SLAPD_STATIC_OVERLAYS" +]]) AC_OUTPUT