X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=configure.in;h=5bb273375cf646eaddfa45dbbcc703f4ca0f19e2;hb=340503583a766c3cc743d4d8b31cabe17956a0ea;hp=1755722d87e93ca2770a9f585d1f8031b1a5785c;hpb=465698ea536eb68a2d2db75f614e4ad8557b006a;p=openldap diff --git a/configure.in b/configure.in index 1755722d87..5bb273375c 100644 --- a/configure.in +++ b/configure.in @@ -193,7 +193,7 @@ OL_ARG_ENABLE(spasswd,[ --enable-spasswd enable (Cyrus) SASL password verif OL_ARG_ENABLE(modules,[ --enable-modules enable dynamic module support], no)dnl dnl OL_ARG_ENABLE(multimaster,[ --enable-multimaster enable multimaster replication], no)dnl ol_enable_multimaster=${ol_enable_multimaster-no} -OL_ARG_ENABLE(rewrite,[ --enable-rewrite enable DN rewriting in back-ldap and the rwm overlay], auto)dnl +OL_ARG_ENABLE(rewrite,[ --enable-rewrite enable DN rewriting in back-ldap and rwm overlay], auto)dnl OL_ARG_ENABLE(rlookups,[ --enable-rlookups enable reverse lookups of client hostnames], 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 @@ -208,74 +208,93 @@ AC_ARG_WITH(xxslapbackends,[ SLAPD Backend Options:]) OL_ARG_ENABLE(backends,[ --enable-backends enable all available backends no|yes|mod], - no, [no yes mod])dnl + --, [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], - yes, [no yes mod])dnl + ${ol_dflt_backends-yes}, [no yes mod])dnl OL_ARG_ENABLE(dnssrv,[ --enable-dnssrv enable dnssrv backend no|yes|mod], - no, [no yes mod])dnl + ${ol_dflt_backends-no}, [no yes mod])dnl OL_ARG_ENABLE(hdb,[ --enable-hdb enable Hierarchical DB backend no|yes|mod], - yes, [no yes mod])dnl + ${ol_dflt_backends-yes}, [no yes mod])dnl OL_ARG_ENABLE(ldap,[ --enable-ldap enable ldap backend no|yes|mod], - no, [no yes mod])dnl -OL_ARG_ENABLE(ldbm,[ --enable-ldbm enable ldbm backend no|yes|mod], no, - [no yes mod])dnl + ${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], auto, [auto berkeley bcompat mdbm gdbm]) OL_ARG_WITH(ldbm_type,[ --with-ldbm-type use LDBM type auto|btree|hash], auto, [auto btree hash]) OL_ARG_ENABLE(meta,[ --enable-meta enable metadirectory backend no|yes|mod], - no, [no yes mod])dnl + ${ol_dflt_backends-no}, [no yes mod])dnl OL_ARG_ENABLE(monitor,[ --enable-monitor enable monitor backend no|yes|mod], - yes, [no yes mod])dnl + ${ol_dflt_backends-yes}, [no yes mod])dnl OL_ARG_ENABLE(null,[ --enable-null enable null backend no|yes|mod], - no, [no yes mod])dnl + ${ol_dflt_backends-no}, [no yes mod])dnl OL_ARG_ENABLE(passwd,[ --enable-passwd enable passwd backend no|yes|mod], - no, [no yes mod])dnl + ${ol_dflt_backends-no}, [no yes mod])dnl OL_ARG_ENABLE(perl,[ --enable-perl enable perl backend no|yes|mod], - no, [no yes mod])dnl + ${ol_dflt_backends-no}, [no yes mod])dnl OL_ARG_ENABLE(relay,[ --enable-relay enable relay backend no|yes|mod], - yes, [no yes mod])dnl + ${ol_dflt_backends-yes}, [no yes mod])dnl OL_ARG_ENABLE(shell,[ --enable-shell enable shell backend no|yes|mod], - no, [no yes mod])dnl + ${ol_dflt_backends-no}, [no yes mod])dnl OL_ARG_ENABLE(sql,[ --enable-sql enable sql backend no|yes|mod], - no, [no yes mod])dnl + ${ol_dflt_backends-no}, [no yes mod])dnl dnl ---------------------------------------------------------------- dnl SLAPD Overlay Options -Overlays="accesslog denyop dyngroup dynlist glue lastmod ppolicy proxycache \ - refint rwm syncprov translucent unique" +Overlays="accesslog \ + denyop \ + dyngroup \ + dynlist \ + glue \ + lastmod \ + ppolicy \ + proxycache \ + refint \ + retcode \ + rwm \ + syncprov \ + translucent \ + unique \ + valsort" AC_ARG_WITH(xxslapoverlays,[ SLAPD Overlay Options:]) OL_ARG_ENABLE(overlays,[ --enable-overlays enable all available overlays no|yes|mod], - no, [no yes mod])dnl -OL_ARG_ENABLE(accesslog,[ --enable-accesslog In-Directory Access Logging overlay no|yes|mod], - no, [no yes mod]) + --, [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], - no, [no yes mod]) + ${ol_dflt_overlays-no}, [no yes mod]) OL_ARG_ENABLE(dyngroup,[ --enable-dyngroup Dynamic Group overlay no|yes|mod], - no, [no yes mod]) + ${ol_dflt_overlays-no}, [no yes mod]) OL_ARG_ENABLE(dynlist,[ --enable-dynlist Dynamic List overlay no|yes|mod], - no, [no yes mod]) + ${ol_dflt_overlays-no}, [no yes mod]) OL_ARG_ENABLE(glue,[ --enable-glue Backend Glue overlay no|yes|mod], - yes, [no yes mod]) + ${ol_dflt_overlays-yes}, [no yes mod]) OL_ARG_ENABLE(lastmod,[ --enable-lastmod Last Modification overlay no|yes|mod], - no, [no yes mod]) + ${ol_dflt_overlays-no}, [no yes mod]) OL_ARG_ENABLE(ppolicy,[ --enable-ppolicy Password Policy overlay no|yes|mod], - no, [no yes mod]) + ${ol_dflt_overlays-no}, [no yes mod]) OL_ARG_ENABLE(proxycache,[ --enable-proxycache Proxy Cache overlay no|yes|mod], - no, [no yes mod]) + ${ol_dflt_overlays-no}, [no yes mod]) OL_ARG_ENABLE(refint,[ --enable-refint Referential Integrity overlay no|yes|mod], - no, [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], - no, [no yes mod]) + ${ol_dflt_overlays-no}, [no yes mod]) OL_ARG_ENABLE(syncprov,[ --enable-syncprov Syncrepl Provider overlay no|yes|mod], - yes, [no yes mod]) + ${ol_dflt_overlays-yes}, [no yes mod]) OL_ARG_ENABLE(translucent,[ --enable-translucent Translucent Proxy overlay no|yes|mod], - no, [no yes mod]) + ${ol_dflt_overlays-no}, [no yes mod]) OL_ARG_ENABLE(unique,[ --enable-unique Attribute Uniqueness overlay no|yes|mod], - no, [no yes mod]) + ${ol_dflt_overlays-no}, [no yes mod]) +OL_ARG_ENABLE(valsort,[ --enable-valsort Value Sorting overlay no|yes|mod], + ${ol_dflt_overlays-no}, [no yes mod]) dnl ---------------------------------------------------------------- @@ -292,36 +311,15 @@ AC_ENABLE_SHARED dnl ---------------------------------------------------------------- -dnl General "enable" options -# Activate any backends that were not explicitly enabled. -# Note that back_bdb defaults to "yes" so this loop won't touch it. -if test $ol_enable_backends != no ; then - for i in $Backends; do - eval "ol_tmp=\$ol_enable_$i" - if test $ol_tmp = no ; then - eval "ol_enable_$i=$ol_enable_backends" - fi - done -fi -# Activate the overlays -if test $ol_enable_overlays != no ; then - for i in $Overlays; do - eval "ol_tmp=\$ol_enable_$i" - if test $ol_tmp = no ; then - eval "ol_enable_$i=$ol_enable_overlays" - fi - done -fi - # validate options if test $ol_enable_slapd = no ; then dnl SLAPD was specificallly disabled if test $ol_enable_slapi = yes ; then AC_MSG_WARN([slapd disabled, ignoring --enable-slapi argument]) fi - if test $ol_enable_backends != no ; then + case "$ol_enable_backends" in yes | mod) AC_MSG_WARN([slapd disabled, ignoring --enable-backends argument]) - fi + esac for i in $Backends; do eval "ol_tmp=\$ol_enable_$i" if test $ol_tmp != no ; then @@ -357,9 +355,9 @@ if test $ol_enable_slapd = no ; then AC_MSG_WARN([slapd disabled, ignoring --enable-rewrite argument]) fi dnl overlays - if test $ol_enable_overlays != no ; then + case "$ol_enable_overlays" in yes | mod) AC_MSG_WARN([slapd disabled, ignoring --enable-overlays argument]) - fi + esac for i in $Overlays; do eval "ol_tmp=\$ol_enable_$i" if test $ol_tmp != no ; then @@ -371,8 +369,8 @@ if test $ol_enable_slapd = no ; then # force settings to no ol_enable_slapi=no - ol_enable_backends=no - ol_enable_overlays=no + ol_enable_backends= + ol_enable_overlays= ol_enable_modules=no ol_enable_multimaster=no ol_enable_rlookups=no @@ -533,10 +531,12 @@ BUILD_LASTMOD=no BUILD_PPOLICY=no BUILD_PROXYCACHE=no BUILD_REFINT=no +BUILD_RETCODE=no BUILD_RWM=no BUILD_SYNCPROV=no BUILD_TRANSLUCENT=no BUILD_UNIQUE=no +BUILD_VALSORT=no SLAPD_STATIC_OVERLAYS= SLAPD_DYNAMIC_OVERLAYS= @@ -771,11 +771,11 @@ if test $am_cv_sys_posix_termios = yes ; then [define if you have POSIX termios]) fi -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 \ @@ -788,7 +788,7 @@ AC_CHECK_HEADERS( \ libutil.h \ limits.h \ locale.h \ - netinet/tcp.h \ + netinet/tcp.h \ malloc.h \ memory.h \ psap.h \ @@ -806,11 +806,11 @@ 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 \ @@ -818,6 +818,7 @@ AC_CHECK_HEADERS( \ syslog.h \ termios.h \ unistd.h \ + utime.h \ winsock.h \ winsock2.h \ ) @@ -2741,7 +2742,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 @@ -2877,6 +2878,18 @@ if test "$ol_enable_refint" != no ; then AC_DEFINE_UNQUOTED(SLAPD_OVER_REFINT,$MFLAG,[define for Referential Integrity overlay]) fi +if test "$ol_enable_retcode" != no ; then + BUILD_RETCODE=$ol_enable_retcode + if test "$ol_enable_retcode" = mod ; then + MFLAG=SLAPD_MOD_DYNAMIC + SLAPD_DYNAMIC_OVERLAYS="$SLAPD_DYNAMIC_OVERLAYS retcode.la" + else + MFLAG=SLAPD_MOD_STATIC + SLAPD_STATIC_OVERLAYS="$SLAPD_STATIC_OVERLAYS retcode.o" + fi + AC_DEFINE_UNQUOTED(SLAPD_OVER_RETCODE,$MFLAG,[define for Referential Integrity overlay]) +fi + if test "$ol_enable_rwm" != no ; then BUILD_REWRITE=yes BUILD_RWM=$ol_enable_rwm @@ -2926,6 +2939,18 @@ if test "$ol_enable_unique" != no ; then AC_DEFINE_UNQUOTED(SLAPD_OVER_UNIQUE,$MFLAG,[define for Attribute Uniqueness overlay]) fi +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 -a "$ol_link_threads" != no -a \ $BUILD_SLAPD = yes ; then BUILD_SLURPD=yes @@ -2991,10 +3016,12 @@ dnl overlays AC_SUBST(BUILD_PPOLICY) AC_SUBST(BUILD_PROXYCACHE) AC_SUBST(BUILD_REFINT) + AC_SUBST(BUILD_RETCODE) AC_SUBST(BUILD_RWM) AC_SUBST(BUILD_SYNCPROV) AC_SUBST(BUILD_TRANSLUCENT) AC_SUBST(BUILD_UNIQUE) + AC_SUBST(BUILD_VALSORT) AC_SUBST(BUILD_SLURPD) AC_SUBST(LDAP_LIBS)