mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-01-18 11:05:48 +08:00
Change some defaults
Label some options as experimental Change how configure prints defaults
This commit is contained in:
Kurt Zeilenga
parent
a93a15d9fc
commit
bf53620d64
40
aclocal.m4
vendored
40
aclocal.m4
vendored
@ -485,35 +485,31 @@ esac
|
||||
])
|
||||
|
||||
# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
|
||||
# the libltdl convenience library and INCLTDL to the include flags for
|
||||
# the libltdl header and adds --enable-ltdl-convenience to the
|
||||
# configure arguments. Note that LIBLTDL and INCLTDL are not
|
||||
# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If DIR is not
|
||||
# provided, it is assumed to be `libltdl'. LIBLTDL will be prefixed
|
||||
# with '${top_builddir}/' and INCLTDL will be prefixed with
|
||||
# '${top_srcdir}/' (note the single quotes!). If your package is not
|
||||
# flat and you're not using automake, define top_builddir and
|
||||
# top_srcdir appropriately in the Makefiles.
|
||||
# the libltdl convenience library, adds --enable-ltdl-convenience to
|
||||
# the configure arguments. Note that LIBLTDL is not AC_SUBSTed, nor
|
||||
# is AC_CONFIG_SUBDIRS called. If DIR is not provided, it is assumed
|
||||
# to be `${top_builddir}/libltdl'. Make sure you start DIR with
|
||||
# '${top_builddir}/' (note the single quotes!) if your package is not
|
||||
# flat, and, if you're not using automake, define top_builddir as
|
||||
# appropriate in the Makefiles.
|
||||
AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
|
||||
case "$enable_ltdl_convenience" in
|
||||
no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
|
||||
"") enable_ltdl_convenience=yes
|
||||
ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
|
||||
esac
|
||||
LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
|
||||
INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
|
||||
LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la
|
||||
INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
|
||||
])
|
||||
|
||||
# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
|
||||
# the libltdl installable library and INCLTDL to the include flags for
|
||||
# the libltdl header and adds --enable-ltdl-install to the configure
|
||||
# arguments. Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is
|
||||
# AC_CONFIG_SUBDIRS called. If DIR is not provided and an installed
|
||||
# libltdl is not found, it is assumed to be `libltdl'. LIBLTDL will
|
||||
# be prefixed with '${top_builddir}/' and INCLTDL will be prefixed
|
||||
# with '${top_srcdir}/' (note the single quotes!). If your package is
|
||||
# not flat and you're not using automake, define top_builddir and
|
||||
# top_srcdir appropriately in the Makefiles.
|
||||
# the libltdl installable library, and adds --enable-ltdl-install to
|
||||
# the configure arguments. Note that LIBLTDL is not AC_SUBSTed, nor
|
||||
# is AC_CONFIG_SUBDIRS called. If DIR is not provided, it is assumed
|
||||
# to be `${top_builddir}/libltdl'. Make sure you start DIR with
|
||||
# '${top_builddir}/' (note the single quotes!) if your package is not
|
||||
# flat, and, if you're not using automake, define top_builddir as
|
||||
# appropriate in the Makefiles.
|
||||
# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
|
||||
AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
|
||||
AC_CHECK_LIB(ltdl, main,
|
||||
@ -526,8 +522,8 @@ AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
|
||||
])
|
||||
if test x"$enable_ltdl_install" = x"yes"; then
|
||||
ac_configure_args="$ac_configure_args --enable-ltdl-install"
|
||||
LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
|
||||
INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
|
||||
LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la
|
||||
INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
|
||||
else
|
||||
ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
|
||||
LIBLTDL="-lltdl"
|
||||
|
||||
@ -13,7 +13,7 @@ dnl $2 = help-string
|
||||
dnl $3 = default value (auto)
|
||||
dnl $4 = allowed values (auto yes no)
|
||||
AC_DEFUN([OL_ARG_ENABLE], [# OpenLDAP --enable-$1
|
||||
AC_ARG_ENABLE($1,[$2 (]ifelse($3,,auto,$3)[)],[
|
||||
AC_ARG_ENABLE($1,changequote(<,>)<$2 [>ifelse($3,,auto,$3)<]>changequote([,]),[
|
||||
ol_arg=invalid
|
||||
for ol_val in ifelse($4,,[auto yes no],[$4]) ; do
|
||||
if test "$enableval" = "$ol_val" ; then
|
||||
@ -38,7 +38,7 @@ dnl $2 = help-string
|
||||
dnl $3 = default value (no)
|
||||
dnl $4 = allowed values (yes or no)
|
||||
AC_DEFUN([OL_ARG_WITH], [# OpenLDAP --with-$1
|
||||
AC_ARG_WITH($1,[$2 (]ifelse($3,,yes,$3)[)],[
|
||||
AC_ARG_WITH($1,changequote(<,>)<$2 [>ifelse($3,,yes,$3)<]>changequote([,]),[
|
||||
ol_arg=invalid
|
||||
for ol_val in ifelse($4,,[yes no],[$4]) ; do
|
||||
if test "$withval" = "$ol_val" ; then
|
||||
|
||||
106
configure
vendored
106
configure
vendored
@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
# $OpenLDAP$
|
||||
# from OpenLDAP: pkg/ldap/configure.in,v 1.348 2001/01/18 17:40:26 kurt Exp
|
||||
# from OpenLDAP: pkg/ldap/configure.in,v 1.349 2001/01/18 21:18:14 kurt Exp
|
||||
|
||||
# Copyright 1998-2000 The OpenLDAP Foundation. All Rights Reserved.
|
||||
#
|
||||
@ -27,109 +27,109 @@ ac_default_prefix=/usr/local
|
||||
ac_help="$ac_help
|
||||
--with-subdir=DIR change default subdirectory used for installs"
|
||||
ac_help="$ac_help
|
||||
--enable-debug enable debugging (yes)"
|
||||
--enable-debug enable debugging [yes]"
|
||||
ac_help="$ac_help
|
||||
--enable-syslog enable syslog support (auto)"
|
||||
--enable-syslog enable syslog support [auto]"
|
||||
ac_help="$ac_help
|
||||
--enable-proctitle enable proctitle support (yes)"
|
||||
--enable-proctitle enable proctitle support [yes]"
|
||||
ac_help="$ac_help
|
||||
--enable-cache enable caching (yes)"
|
||||
--enable-cache enable caching (experimental) [no]"
|
||||
ac_help="$ac_help
|
||||
--enable-referrals enable V2 Referrals extension (yes)"
|
||||
--enable-referrals enable V2 Referrals (experimental) [no]"
|
||||
ac_help="$ac_help
|
||||
--enable-kbind enable V2 Kerberos IV bind (no)"
|
||||
--enable-kbind enable V2 Kerberos IV bind (deprecated) [no]"
|
||||
ac_help="$ac_help
|
||||
--enable-ipv6 enable IPv6 support (auto)"
|
||||
--enable-ipv6 enable IPv6 support [auto]"
|
||||
ac_help="$ac_help
|
||||
--enable-local enable AF_LOCAL (AF_UNIX) socket support (auto)"
|
||||
--enable-local enable AF_LOCAL (AF_UNIX) socket support [auto]"
|
||||
ac_help="$ac_help
|
||||
--enable-x-compile enable cross compiling (no)"
|
||||
--enable-x-compile enable cross compiling [no]"
|
||||
ac_help="$ac_help
|
||||
--with-cyrus-sasl with Cyrus SASL support (auto)"
|
||||
--with-cyrus-sasl with Cyrus SASL support [auto]"
|
||||
ac_help="$ac_help
|
||||
--with-fetch with fetch URL support (auto)"
|
||||
--with-fetch with fetch URL support [auto]"
|
||||
ac_help="$ac_help
|
||||
--with-kerberos with support (auto)"
|
||||
--with-kerberos with support [auto]"
|
||||
ac_help="$ac_help
|
||||
--with-readline with readline support (auto)"
|
||||
--with-readline with readline support [auto]"
|
||||
ac_help="$ac_help
|
||||
--with-threads with threads (auto)"
|
||||
--with-threads with threads [auto]"
|
||||
ac_help="$ac_help
|
||||
--with-tls with TLS/SSL support (auto)"
|
||||
--with-tls with TLS/SSL support [auto]"
|
||||
ac_help="$ac_help
|
||||
--with-yielding-select with implicitly yielding select (auto)"
|
||||
--with-yielding-select with implicitly yielding select [auto]"
|
||||
ac_help="$ac_help
|
||||
SLAPD (Standalone LDAP Daemon) Options:"
|
||||
ac_help="$ac_help
|
||||
--enable-slapd enable building slapd (yes)"
|
||||
--enable-slapd enable building slapd [yes]"
|
||||
ac_help="$ac_help
|
||||
--enable-aci enable per-object ACIs (no)"
|
||||
--enable-aci enable per-object ACIs (experimental) [no]"
|
||||
ac_help="$ac_help
|
||||
--enable-cleartext enable cleartext passwords (yes)"
|
||||
--enable-cleartext enable cleartext passwords [yes]"
|
||||
ac_help="$ac_help
|
||||
--enable-crypt enable crypt(3) passwords (no)"
|
||||
--enable-crypt enable crypt(3) passwords [no]"
|
||||
ac_help="$ac_help
|
||||
--enable-dynamic enable linking built binaries with dynamic libs (no)"
|
||||
--enable-dynamic enable linking built binaries with dynamic libs [no]"
|
||||
ac_help="$ac_help
|
||||
--enable-kpasswd enable Kerberos password verification (no)"
|
||||
--enable-kpasswd enable Kerberos password verification [no]"
|
||||
ac_help="$ac_help
|
||||
--enable-lmpasswd enable LAN Manager passwords (no)"
|
||||
--enable-lmpasswd enable LAN Manager passwords [no]"
|
||||
ac_help="$ac_help
|
||||
--enable-spasswd enable (Cyrus) SASL password verification (no)"
|
||||
--enable-spasswd enable (Cyrus) SASL password verification [no]"
|
||||
ac_help="$ac_help
|
||||
--enable-modules enable dynamic module support (no)"
|
||||
--enable-modules enable dynamic module support [no]"
|
||||
ac_help="$ac_help
|
||||
--enable-phonetic enable phonetic/soundex (no)"
|
||||
--enable-phonetic enable phonetic/soundex [no]"
|
||||
ac_help="$ac_help
|
||||
--enable-rlookups enable reverse lookups (no)"
|
||||
--enable-rlookups enable reverse lookups [no]"
|
||||
ac_help="$ac_help
|
||||
--enable-slp enable SLPv2 support (no)"
|
||||
--enable-slp enable SLPv2 support [no]"
|
||||
ac_help="$ac_help
|
||||
--enable-wrappers enable tcp wrapper support (no)"
|
||||
--enable-wrappers enable tcp wrapper support [no]"
|
||||
ac_help="$ac_help
|
||||
--enable-bdb enable Berkeley DB backend (no)"
|
||||
--enable-bdb enable Berkeley DB backend [no]"
|
||||
ac_help="$ac_help
|
||||
--with-bdb-module module type (static)"
|
||||
--with-bdb-module module type [static]"
|
||||
ac_help="$ac_help
|
||||
--enable-dnssrv enable dnssrv backend (no)"
|
||||
--enable-dnssrv enable dnssrv backend [no]"
|
||||
ac_help="$ac_help
|
||||
--with-dnssrv-module module type (static)"
|
||||
--with-dnssrv-module module type [static]"
|
||||
ac_help="$ac_help
|
||||
--enable-ldap enable ldap backend (no)"
|
||||
--enable-ldap enable ldap backend [no]"
|
||||
ac_help="$ac_help
|
||||
--with-ldap-module module type (static)"
|
||||
--with-ldap-module module type [static]"
|
||||
ac_help="$ac_help
|
||||
--enable-ldbm enable ldbm backend (yes)"
|
||||
--enable-ldbm enable ldbm backend [yes]"
|
||||
ac_help="$ac_help
|
||||
--with-ldbm-api with LDBM API (auto)"
|
||||
--with-ldbm-api with LDBM API [auto]"
|
||||
ac_help="$ac_help
|
||||
--with-ldbm-module module type (static)"
|
||||
--with-ldbm-module module type [static]"
|
||||
ac_help="$ac_help
|
||||
--with-ldbm-type use LDBM type (auto)"
|
||||
--with-ldbm-type use LDBM type [auto]"
|
||||
ac_help="$ac_help
|
||||
--enable-passwd enable passwd backend (no)"
|
||||
--enable-passwd enable passwd backend [no]"
|
||||
ac_help="$ac_help
|
||||
--with-passwd-module module type (static)"
|
||||
--with-passwd-module module type [static]"
|
||||
ac_help="$ac_help
|
||||
--enable-perl enable perl backend (no)"
|
||||
--enable-perl enable perl backend [no]"
|
||||
ac_help="$ac_help
|
||||
--with-perl-module module type (static)"
|
||||
--with-perl-module module type [static]"
|
||||
ac_help="$ac_help
|
||||
--enable-shell enable shell backend (no)"
|
||||
--enable-shell enable shell backend [no]"
|
||||
ac_help="$ac_help
|
||||
--with-shell-module module type (static)"
|
||||
--with-shell-module module type [static]"
|
||||
ac_help="$ac_help
|
||||
--enable-sql enable sql backend (no)"
|
||||
--enable-sql enable sql backend [no]"
|
||||
ac_help="$ac_help
|
||||
--with-sql-module module type (static)"
|
||||
--with-sql-module module type [static]"
|
||||
ac_help="$ac_help
|
||||
--enable-tcl enable tcl backend (no)"
|
||||
--enable-tcl enable tcl backend [no]"
|
||||
ac_help="$ac_help
|
||||
--with-tcl-module module type (static)"
|
||||
--with-tcl-module module type [static]"
|
||||
ac_help="$ac_help
|
||||
SLURPD (Replication Daemon) Options:"
|
||||
ac_help="$ac_help
|
||||
--enable-slurpd enable building slurpd (auto)"
|
||||
--enable-slurpd enable building slurpd [auto]"
|
||||
ac_help="$ac_help
|
||||
Library Generation & Linking Options"
|
||||
ac_help="$ac_help
|
||||
@ -1275,7 +1275,7 @@ if test "${enable_cache+set}" = set; then
|
||||
ol_enable_cache="$ol_arg"
|
||||
|
||||
else
|
||||
ol_enable_cache="yes"
|
||||
ol_enable_cache="no"
|
||||
fi
|
||||
# end --enable-cache
|
||||
# OpenLDAP --enable-referrals
|
||||
@ -1295,7 +1295,7 @@ if test "${enable_referrals+set}" = set; then
|
||||
ol_enable_referrals="$ol_arg"
|
||||
|
||||
else
|
||||
ol_enable_referrals="yes"
|
||||
ol_enable_referrals="no"
|
||||
fi
|
||||
# end --enable-referrals
|
||||
# OpenLDAP --enable-kbind
|
||||
|
||||
@ -111,9 +111,9 @@ dnl General "enable" options
|
||||
OL_ARG_ENABLE(debug,[ --enable-debug enable debugging], yes)dnl
|
||||
OL_ARG_ENABLE(syslog,[ --enable-syslog enable syslog support], auto)dnl
|
||||
OL_ARG_ENABLE(proctitle,[ --enable-proctitle enable proctitle support], yes)dnl
|
||||
OL_ARG_ENABLE(cache,[ --enable-cache enable caching], yes)dnl
|
||||
OL_ARG_ENABLE(referrals,[ --enable-referrals enable V2 Referrals extension], yes)dnl
|
||||
OL_ARG_ENABLE(kbind,[ --enable-kbind enable V2 Kerberos IV bind], no)dnl
|
||||
OL_ARG_ENABLE(cache,[ --enable-cache enable caching (experimental)], no)dnl
|
||||
OL_ARG_ENABLE(referrals,[ --enable-referrals enable V2 Referrals (experimental)], no)dnl
|
||||
OL_ARG_ENABLE(kbind,[ --enable-kbind enable V2 Kerberos IV bind (deprecated)], no)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(x_compile,[ --enable-x-compile enable cross compiling],
|
||||
@ -146,7 +146,7 @@ dnl ----------------------------------------------------------------
|
||||
dnl SLAPD OPTIONS
|
||||
AC_ARG_WITH(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], 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(crypt,[ --enable-crypt enable crypt(3) passwords], no)dnl
|
||||
OL_ARG_ENABLE(dynamic,[ --enable-dynamic enable linking built binaries with dynamic libs], no)dnl
|
||||
|
||||
Loading…
Reference in New Issue
Block a user