Trim options

This commit is contained in:
Kurt Zeilenga 2001-01-17 02:23:31 +00:00
parent 0016699040
commit dac6aa3312
4 changed files with 689 additions and 720 deletions

View File

@ -12,11 +12,11 @@ OpenLDAP 2.0.8 Release Engineering
Build Environment
Updated top.mk
Added MacOS support
Trim experimental options
Documentation
Updated ldapdelete(1)
Updated ldapsearch(1)
OpenLDAP 2.0.7 Release
Fixed -lldap TLS data ready bug (ITS#821)
Fixed -lldap abandon unsent op bug (ITS#837)

1389
configure vendored

File diff suppressed because it is too large Load Diff

View File

@ -143,9 +143,9 @@ OL_ARG_ENABLE(crypt,[ --enable-crypt enable crypt(3) passwords], auto)dnl
OL_ARG_ENABLE(kpasswd,[ --enable-kpasswd enable kerberos password verification], no)dnl
OL_ARG_ENABLE(spasswd,[ --enable-spasswd enable (Cyrus) SASL password verification], no)dnl
OL_ARG_ENABLE(modules,[ --enable-modules enable dynamic module support], no)dnl
OL_ARG_ENABLE(multimaster,[ --enable-multimaster enable multimaster replication], no)dnl
dnl OL_ARG_ENABLE(multimaster,[ --enable-multimaster enable multimaster replication], no)dnl
OL_ARG_ENABLE(phonetic,[ --enable-phonetic enable phonetic/soundex], no)dnl
OL_ARG_ENABLE(rlookups,[ --enable-rlookups enable reverse lookups], auto)dnl
OL_ARG_ENABLE(rlookups,[ --enable-rlookups enable reverse lookups], no)dnl
OL_ARG_ENABLE(aci,[ --enable-aci enable per-object ACIs], no)dnl
OL_ARG_ENABLE(wrappers,[ --enable-wrappers enable tcp wrapper support], no)dnl
OL_ARG_ENABLE(dynamic,[ --enable-dynamic enable linking built binaries with dynamic libs], no)dnl
@ -215,6 +215,9 @@ if test $ol_enable_slapd = no ; then
if test $ol_enable_multimaster = yes ; then
AC_MSG_WARN([slapd disabled, ignoring --enable-multimaster argument])
fi
dnl if test $ol_enable_multimaster = yes ; then
dnl AC_MSG_WARN([slapd disabled, ignoring --enable-multimaster argument])
dnl fi
if test $ol_enable_wrappers = yes ; then
AC_MSG_WARN([slapd disabled, ignoring --enable-wrappers argument])
fi
@ -264,7 +267,7 @@ if test $ol_enable_slapd = no ; then
ol_enable_sql=no
ol_enable_modules=no
ol_enable_multimaster=no
dnl ol_enable_multimaster=no
ol_enable_phonetic=no
ol_enable_rlookups=no
ol_enable_aci=no
@ -2118,9 +2121,9 @@ fi
if test "$ol_link_spasswd" != no ; then
AC_DEFINE(SLAPD_SPASSWD,1,[define to support SASL passwords])
fi
if test "$ol_enable_multimaster" != no ; then
AC_DEFINE(SLAPD_MULTIMASTER,1,[define to support multimaster replication])
fi
dnl if test "$ol_enable_multimaster" != no ; then
dnl AC_DEFINE(SLAPD_MULTIMASTER,1,[define to support multimaster replication])
dnl fi
if test "$ol_enable_phonetic" != no ; then
AC_DEFINE(SLAPD_PHONETIC,1,[define to support phonetic])
fi

View File

@ -864,9 +864,6 @@
/* define to support SASL passwords */
#undef SLAPD_SPASSWD
/* define to support multimaster replication */
#undef SLAPD_MULTIMASTER
/* define to support phonetic */
#undef SLAPD_PHONETIC