Commit b851a1a7 authored by Kurt Zeilenga's avatar Kurt Zeilenga
Browse files

More autoconf 2.57 changes (this is getting ugly)

parent 25093425
......@@ -19,9 +19,10 @@ 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,changequote(<,>)<$2 [>ifelse($3,,auto,$3)<]>changequote([,]),[
ol_arg=invalid
for ol_val in ifelse($4,,[auto yes no],[$4]) ; do
AC_ARG_ENABLE([$1], AC_HELP_STRING([--enable-$1],
[$2 <m4_ifval([$4],[$4],[auto yes no])> default=m4_ifval([$3],[$3],[auto])]),
[ ol_arg=invalid
for ol_val in m4_ifval([$4],[$4],[auto yes no]) ; do
if test "$enableval" = "$ol_val" ; then
ol_arg="$ol_val"
fi
......@@ -31,8 +32,7 @@ AC_DEFUN([OL_ARG_ENABLE], [# OpenLDAP --enable-$1
fi
ol_enable_$1="$ol_arg"
],
[ ol_enable_$1=ifelse($3,,"auto","$3")])dnl
dnl AC_VERBOSE(OpenLDAP -enable-$1 $ol_enable_$1)
[ ol_enable_$1=m4_ifval([$3],["$3"],["auto"])])dnl
# end --enable-$1
])dnl
dnl
......@@ -42,11 +42,12 @@ dnl
dnl $1 = option name
dnl $2 = help-string
dnl $3 = default value (no)
dnl $4 = allowed values (yes or no)
dnl $4 = allowed values (yes no)
AC_DEFUN([OL_ARG_WITH], [# OpenLDAP --with-$1
AC_ARG_WITH($1,changequote(<,>)<$2 [>ifelse($3,,yes,$3)<]>changequote([,]),[
ol_arg=invalid
for ol_val in ifelse($4,,[yes no],[$4]) ; do
AC_ARG_WITH([$1], AC_HELP_STRING([--with-$1],
[$2 <m4_ifval([$4],[$4],[auto yes no])> default=m4_ifval([$3],[$3],[auto])]),
[ ol_arg=invalid
for ol_val in m4_ifval([$4],[$4],[auto yes no]) ; do
if test "$withval" = "$ol_val" ; then
ol_arg="$ol_val"
fi
......@@ -56,8 +57,7 @@ AC_DEFUN([OL_ARG_WITH], [# OpenLDAP --with-$1
fi
ol_with_$1="$ol_arg"
],
[ ol_with_$1=ifelse($3,,"no","$3")])dnl
dnl AC_VERBOSE(OpenLDAP --with-$1 $ol_with_$1)
[ ol_with_$1=m4_ifval([$3],["$3"],["auto"])])dnl
# end --with-$1
])dnl
dnl
......
......@@ -1014,40 +1014,108 @@ if test -n "$ac_init_help"; then
Optional Features:
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--enable-debug enable debugging yes
--enable-dynamic enable linking built binaries with dynamic libs no
--enable-syslog enable syslog support auto
--enable-proctitle enable proctitle support yes
--enable-ipv6 enable IPv6 support auto
--enable-local enable AF_LOCAL (AF_UNIX) socket support auto
--enable-x-compile enable cross compiling no
--enable-slapd enable building slapd yes
--enable-aci enable per-object ACIs (experimental) no
--enable-cleartext enable cleartext passwords yes
--enable-crypt enable crypt(3) passwords no
--enable-kpasswd enable Kerberos password verification no
--enable-lmpasswd enable LAN Manager passwords no
--enable-spasswd enable (Cyrus) SASL password verification no
--enable-modules enable dynamic module support no
--enable-phonetic enable phonetic/soundex no
--enable-rewrite enable DN rewriting in back-ldap and back-meta no
--enable-rlookups enable reverse lookups of client hostnames no
--enable-slapi enable installation of slapi library no
--enable-slp enable SLPv2 support no
--enable-wrappers enable tcp wrapper support no
--enable-bdb enable Berkeley DB backend yes
--enable-dnssrv enable dnssrv backend no
--enable-ldap enable ldap backend no
--enable-ldbm enable ldbm backend no
--enable-meta enable metadirectory backend no
--enable-monitor enable monitor backend no
--enable-null enable null backend no
--enable-passwd enable passwd backend no
--enable-perl enable perl backend no
--enable-shell enable shell backend no
--enable-sql enable sql backend no
--enable-tcl enable tcl backend no
--enable-slurpd enable building slurpd auto
--enable-debug enable debugging
<auto>
default=yes
--enable-dynamic enable linking built binaries with dynamic libs
<auto>
default=no
--enable-syslog enable syslog support
<auto>
default=auto
--enable-proctitle enable proctitle support
<auto>
default=yes
--enable-ipv6 enable IPv6 support
<auto>
default=auto
--enable-local enable AF_LOCAL (AF_UNIX) socket support
<auto>
default=auto
--enable-x-compile enable cross compiling
<no>
default=no
--enable-slapd enable building slapd
<auto>
default=yes
--enable-aci enable per-object ACIs (experimental)
<auto>
default=no
--enable-cleartext enable cleartext passwords
<auto>
default=yes
--enable-crypt enable crypt(3) passwords
<auto>
default=no
--enable-kpasswd enable Kerberos password verification
<auto>
default=no
--enable-lmpasswd enable LAN Manager passwords
<auto>
default=no
--enable-spasswd enable (Cyrus) SASL password verification
<auto>
default=no
--enable-modules enable dynamic module support
<auto>
default=no
--enable-phonetic enable phonetic/soundex
<auto>
default=no
--enable-rewrite enable DN rewriting in back-ldap and back-meta
<auto>
default=no
--enable-rlookups enable reverse lookups of client hostnames
<auto>
default=no
--enable-slapi enable installation of slapi library
<auto>
default=no
--enable-slp enable SLPv2 support
<auto>
default=no
--enable-wrappers enable tcp wrapper support
<auto>
default=no
--enable-bdb enable Berkeley DB backend
<auto>
default=yes
--enable-dnssrv enable dnssrv backend
<auto>
default=no
--enable-ldap enable ldap backend
<auto>
default=no
--enable-ldbm enable ldbm backend
<auto>
default=no
--enable-meta enable metadirectory backend
<auto>
default=no
--enable-monitor enable monitor backend
<auto>
default=no
--enable-null enable null backend
<auto>
default=no
--enable-passwd enable passwd backend
<auto>
default=no
--enable-perl enable perl backend
<auto>
default=no
--enable-shell enable shell backend
<auto>
default=no
--enable-sql enable sql backend
<auto>
default=no
--enable-tcl enable tcl backend
<auto>
default=no
--enable-slurpd enable building slurpd
<auto>
default=auto
--enable-static=PKGS build static libraries default=yes
--enable-shared=PKGS build shared libraries default=yes
--enable-fast-install=PKGS optimize for fast installation default=yes
......@@ -1057,33 +1125,69 @@ Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-subdir=DIR change default subdirectory used for installs
--with-cyrus-sasl with Cyrus SASL support auto
--with-fetch with fetch(3) URL support auto
--with-kerberos with Kerberos support auto
--with-readline with readline support auto
--with-threads with threads auto
--with-tls with TLS/SSL support auto
--with-yielding-select with implicitly yielding select auto
SLAPD (Standalone LDAP Daemon) Options:
--with-bdb-module module type static|dynamic static
--with-dnssrv-module module type static|dynamic static
--with-ldap-module module type static|dynamic static
--with-ldbm-api with LDBM API auto|berkeley|bcompat|mdbm|gdbm auto
--with-ldbm-module module type static|dynamic static
--with-ldbm-type use LDBM type auto|btree|hash auto
--with-meta-module module type static|dynamic static
--with-monitor-module module type static|dynamic static
--with-null-module module type static|dynamic static
--with-passwd-module module type static|dynamic static
--with-perl-module module type static|dynamic static
--with-shell-module module type static|dynamic static
--with-sql-module module type static|dynamic static
--with-tcl-module module type static|dynamic static
SLURPD (Replication Daemon) Options:
Library Generation & Linking Options
--with-cyrus_sasl with Cyrus SASL support
<auto>
default=auto
--with-fetch with fetch(3) URL support
<auto>
default=auto
--with-kerberos with Kerberos support
<k5>
default=auto
--with-readline with readline support
<auto>
default=auto
--with-threads with threads
<nt>
default=auto
--with-tls with TLS/SSL support
<ssleay>
default=auto
--with-yielding_select with implicitly yielding select
<yes>
default=auto
--with-bdb-module module type
<dynamic>
default=static
--with-dnssrv-module module type
<dynamic>
default=static
--with-ldap-module module type
<dynamic>
default=static
--with-ldbm_api with LDBM API
<berkeley>
default=auto
--with-ldbm-module module type
<dynamic>
default=static
--with-ldbm-type use LDBM type
<btree>
default=auto
--with-meta-module module type
<dynamic>
default=static
--with-monitor-module module type
<dynamic>
default=static
--with-null-module module type
<dynamic>
default=static
--with-passwd-module module type
<dynamic>
default=static
--with-perl-module module type
<dynamic>
default=static
--with-shell-module module type
<dynamic>
default=static
--with-sql-module module type
<dynamic>
default=static
--with-tcl-module module type
<dynamic>
default=static
--with-gnu-ld assume the C compiler uses GNU ld default=no
--with-pic try to use only PIC/non-PIC objects default=use both
 
......@@ -1757,8 +1861,7 @@ fi;
# Check whether --enable-debug or --disable-debug was given.
if test "${enable_debug+set}" = set; then
enableval="$enable_debug"
ol_arg=invalid
ol_arg=invalid
for ol_val in auto yes no ; do
if test "$enableval" = "$ol_val" ; then
ol_arg="$ol_val"
......@@ -1778,8 +1881,7 @@ fi; # end --enable-debug
# Check whether --enable-dynamic or --disable-dynamic was given.
if test "${enable_dynamic+set}" = set; then
enableval="$enable_dynamic"
ol_arg=invalid
ol_arg=invalid
for ol_val in auto yes no ; do
if test "$enableval" = "$ol_val" ; then
ol_arg="$ol_val"
......@@ -1799,8 +1901,7 @@ fi; # end --enable-dynamic
# Check whether --enable-syslog or --disable-syslog was given.
if test "${enable_syslog+set}" = set; then
enableval="$enable_syslog"
ol_arg=invalid
ol_arg=invalid
for ol_val in auto yes no ; do
if test "$enableval" = "$ol_val" ; then
ol_arg="$ol_val"
......@@ -1820,8 +1921,7 @@ fi; # end --enable-syslog
# Check whether --enable-proctitle or --disable-proctitle was given.
if test "${enable_proctitle+set}" = set; then
enableval="$enable_proctitle"
ol_arg=invalid
ol_arg=invalid
for ol_val in auto yes no ; do
if test "$enableval" = "$ol_val" ; then
ol_arg="$ol_val"
......@@ -1843,8 +1943,7 @@ ol_enable_kbind=${ol_enable_kbind-no}
# Check whether --enable-ipv6 or --disable-ipv6 was given.
if test "${enable_ipv6+set}" = set; then
enableval="$enable_ipv6"
ol_arg=invalid
ol_arg=invalid
for ol_val in auto yes no ; do
if test "$enableval" = "$ol_val" ; then
ol_arg="$ol_val"
......@@ -1864,8 +1963,7 @@ fi; # end --enable-ipv6
# Check whether --enable-local or --disable-local was given.
if test "${enable_local+set}" = set; then
enableval="$enable_local"
ol_arg=invalid
ol_arg=invalid
for ol_val in auto yes no ; do
if test "$enableval" = "$ol_val" ; then
ol_arg="$ol_val"
......@@ -1881,37 +1979,34 @@ echo "$as_me: error: bad value $enableval for --enable-local" >&2;}
else
ol_enable_local="auto"
fi; # end --enable-local
# OpenLDAP --enable-x_compile
# Check whether --enable-x_compile or --disable-x_compile was given.
# OpenLDAP --enable-x-compile
# Check whether --enable-x-compile or --disable-x-compile was given.
if test "${enable_x_compile+set}" = set; then
enableval="$enable_x_compile"
ol_arg=invalid
ol_arg=invalid
for ol_val in yes no ; do
if test "$enableval" = "$ol_val" ; then
ol_arg="$ol_val"
fi
done
if test "$ol_arg" = "invalid" ; then
{ { echo "$as_me:$LINENO: error: bad value $enableval for --enable-x_compile" >&5
echo "$as_me: error: bad value $enableval for --enable-x_compile" >&2;}
{ { echo "$as_me:$LINENO: error: bad value $enableval for --enable-x-compile" >&5
echo "$as_me: error: bad value $enableval for --enable-x-compile" >&2;}
{ (exit 1); exit 1; }; }
fi
ol_enable_x_compile="$ol_arg"
ol_enable_x-compile="$ol_arg"
 
else
ol_enable_x_compile="no"
fi; # end --enable-x_compile
ol_enable_x-compile="no"
fi; # end --enable-x-compile
 
# OpenLDAP --with-cyrus_sasl
 
# Check whether --with-cyrus_sasl or --without-cyrus_sasl was given.
if test "${with_cyrus_sasl+set}" = set; then
withval="$with_cyrus_sasl"
ol_arg=invalid
for ol_val in auto yes no ; do
ol_arg=invalid
for ol_val in auto yes no ; do
if test "$withval" = "$ol_val" ; then
ol_arg="$ol_val"
fi
......@@ -1926,15 +2021,13 @@ echo "$as_me: error: bad value $withval for --with-cyrus_sasl" >&2;}
else
ol_with_cyrus_sasl="auto"
fi; # end --with-cyrus_sasl
# OpenLDAP --with-fetch
 
# Check whether --with-fetch or --without-fetch was given.
if test "${with_fetch+set}" = set; then
withval="$with_fetch"
ol_arg=invalid
for ol_val in auto yes no ; do
ol_arg=invalid
for ol_val in auto yes no ; do
if test "$withval" = "$ol_val" ; then
ol_arg="$ol_val"
fi
......@@ -1949,14 +2042,12 @@ echo "$as_me: error: bad value $withval for --with-fetch" >&2;}
else
ol_with_fetch="auto"
fi; # end --with-fetch
# OpenLDAP --with-kerberos
 
# Check whether --with-kerberos or --without-kerberos was given.
if test "${with_kerberos+set}" = set; then
withval="$with_kerberos"
ol_arg=invalid
ol_arg=invalid
for ol_val in auto k5 k5only k425 kth k4 afs yes no ; do
if test "$withval" = "$ol_val" ; then
ol_arg="$ol_val"
......@@ -1972,15 +2063,13 @@ echo "$as_me: error: bad value $withval for --with-kerberos" >&2;}
else
ol_with_kerberos="auto"
fi; # end --with-kerberos
# OpenLDAP --with-readline
 
# Check whether --with-readline or --without-readline was given.
if test "${with_readline+set}" = set; then
withval="$with_readline"
ol_arg=invalid
for ol_val in auto yes no ; do
ol_arg=invalid
for ol_val in auto yes no ; do
if test "$withval" = "$ol_val" ; then
ol_arg="$ol_val"
fi
......@@ -1995,15 +2084,13 @@ echo "$as_me: error: bad value $withval for --with-readline" >&2;}
else
ol_with_readline="auto"
fi; # end --with-readline
# OpenLDAP --with-threads
 
# Check whether --with-threads or --without-threads was given.
if test "${with_threads+set}" = set; then
withval="$with_threads"
ol_arg=invalid
for ol_val in auto nt posix mach pth lwp yes no manual ; do
ol_arg=invalid
for ol_val in auto nt posix mach pth lwp yes no manual ; do
if test "$withval" = "$ol_val" ; then
ol_arg="$ol_val"
fi
......@@ -2018,15 +2105,13 @@ echo "$as_me: error: bad value $withval for --with-threads" >&2;}
else
ol_with_threads="auto"
fi; # end --with-threads
# OpenLDAP --with-tls
 
# Check whether --with-tls or --without-tls was given.
if test "${with_tls+set}" = set; then
withval="$with_tls"
ol_arg=invalid
for ol_val in auto ssleay openssl yes no ; do
ol_arg=invalid
for ol_val in auto ssleay openssl yes no ; do
if test "$withval" = "$ol_val" ; then
ol_arg="$ol_val"
fi
......@@ -2041,15 +2126,13 @@ echo "$as_me: error: bad value $withval for --with-tls" >&2;}
else
ol_with_tls="auto"
fi; # end --with-tls
# OpenLDAP --with-yielding_select
 
# Check whether --with-yielding_select or --without-yielding_select was given.
if test "${with_yielding_select+set}" = set; then
withval="$with_yielding_select"
ol_arg=invalid
for ol_val in auto yes no manual ; do
ol_arg=invalid
for ol_val in auto yes no manual ; do
if test "$withval" = "$ol_val" ; then
ol_arg="$ol_val"
fi
......@@ -2065,20 +2148,11 @@ else
ol_with_yielding_select="auto"
fi; # end --with-yielding_select
 
# Check whether --with-xxslapdoptions or --without-xxslapdoptions was given.
if test "${with_xxslapdoptions+set}" = set; then
withval="$with_xxslapdoptions"
fi;
# OpenLDAP --enable-slapd
# Check whether --enable-slapd or --disable-slapd was given.
if test "${enable_slapd+set}" = set; then
enableval="$enable_slapd"
ol_arg=invalid
ol_arg=invalid
for ol_val in auto yes no ; do
if test "$enableval" = "$ol_val" ; then
ol_arg="$ol_val"
......@@ -2098,8 +2172,7 @@ fi; # end --enable-slapd
# Check whether --enable-aci or --disable-aci was given.
if test "${enable_aci+set}" = set; then
enableval="$enable_aci"
ol_arg=invalid
ol_arg=invalid
for ol_val in auto yes no ; do
if test "$enableval" = "$ol_val" ; then
ol_arg="$ol_val"
......@@ -2119,8 +2192,7 @@ fi; # end --enable-aci
# Check whether --enable-cleartext or --disable-cleartext was given.
if test "${enable_cleartext+set}" = set; then
enableval="$enable_cleartext"
ol_arg=invalid
ol_arg=invalid
for ol_val in auto yes no ; do
if test "$enableval" = "$ol_val" ; then
ol_arg="$ol_val"
......@@ -2140,8 +2212,7 @@ fi; # end --enable-cleartext
# Check whether --enable-crypt or --disable-crypt was given.
if test "${enable_crypt+set}" = set; then
enableval="$enable_crypt"
ol_arg=invalid
ol_arg=invalid
for ol_val in auto yes no ; do
if test "$enableval" = "$ol_val" ; then
ol_arg="$ol_val"
......@@ -2161,8 +2232,7 @@ fi; # end --enable-crypt
# Check whether --enable-kpasswd or --disable-kpasswd was given.
if test "${enable_kpasswd+set}" = set; then
enableval="$enable_kpasswd"
ol_arg=invalid
ol_arg=invalid
for ol_val in auto yes no ; do
if test "$enableval" = "$ol_val" ; then
ol_arg="$ol_val"
......@@ -2182,8 +2252,7 @@ fi; # end --enable-kpasswd
# Check whether --enable-lmpasswd or --disable-lmpasswd was given.
if test "${enable_lmpasswd+set}" = set; then
enableval="$enable_lmpasswd"
ol_arg=invalid
ol_arg=invalid
for ol_val in auto yes no ; do
if test "$enableval" = "$ol_val" ; then
ol_arg="$ol_val"
......@@ -2203,8 +2272,7 @@ fi; # end --enable-lmpasswd
# Check whether --enable-spasswd or --disable-spasswd was given.
if test "${enable_spasswd+set}" = set; then
enableval="$enable_spasswd"
ol_arg=invalid
ol_arg=invalid
for ol_val in auto yes no ; do
if test "$enableval" = "$ol_val" ; then
ol_arg="$ol_val"
......@@ -2224,8 +2292,7 @@ fi; # end --enable-spasswd
# Check whether --enable-modules or --disable-modules was given.
if test "${enable_modules+set}" = set; then
enableval="$enable_modules"
ol_arg=invalid
ol_arg=invalid
for ol_val in auto yes no ; do
if test "$enableval" = "$ol_val" ; then
ol_arg="$ol_val"
......@@ -2246,8 +2313,7 @@ ol_enable_multimaster=${ol_enable_multimaster-no}
# Check whether --enable-phonetic or --disable-phonetic was given.
if test "${enable_phonetic+set}" = set; then
enableval="$enable_phonetic"
ol_arg=invalid
ol_arg=invalid
for ol_val in auto yes no ; do
if test "$enableval" = "$ol_val" ; then
ol_arg="$ol_val"
......@@ -2267,8 +2333,7 @@ fi; # end --enable-phonetic
# Check whether --enable-rewrite or --disable-rewrite was given.
if test "${enable_rewrite+set}" = set; then
enableval="$enable_rewrite"
ol_arg=invalid
ol_arg=invalid
for ol_val in auto yes no ; do
if test "$enableval" = "$ol_val" ; then
ol_arg="$ol_val"
......@@ -2288,8 +2353,7 @@ fi; # end --enable-rewrite
# Check whether --enable-rlookups or --disable-rlookups was given.
if test "${enable_rlookups+set}" = set; then
enableval="$enable_rlookups"
ol_arg=invalid
ol_arg=invalid
for ol_val in auto yes no ; do
if test "$enableval" = "$ol_val" ; then
ol_arg="$ol_val"
......@@ -2309,8 +2373,7 @@ fi; # end --enable-rlookups
# Check whether --enable-slapi or --disable-slapi was given.
if test "${enable_slapi+set}" = set; then
enableval="$enable_slapi"
ol_arg=invalid
ol_arg=invalid
for ol_val in auto yes no ; do
if test "$enableval" = "$ol_val" ; then
ol_arg="$ol_val"
......@@ -2330,8 +2393,7 @@ fi; # end --enable-slapi
# Check whether --enable-slp or --disable-slp was given.
if test "${enable_slp+set}" = set; then
enableval="$enable_slp"
ol_arg=invalid
ol_arg=invalid
for ol_val in auto yes no ; do
if test "$enableval" = "$ol_val" ; then
ol_arg="$ol_val"
......@@ -2351,8 +2413,7 @@ fi; # end --enable-slp
# Check whether --enable-wrappers or --disable-wrappers was given.
if test "${enable_wrappers+set}" = set; then
enableval="$enable_wrappers"
ol_arg=invalid
ol_arg=invalid
for ol_val in auto yes no ; do
if test "$enableval" = "$ol_val" ; then
ol_arg="$ol_val"
......@@ -2369,13 +2430,11 @@ else
ol_enable_wrappers="no"
fi; # end --enable-wrappers
 
# OpenLDAP --enable-bdb
# Check whether --enable-bdb or --disable-bdb was given.
if test "${enable_bdb+set}" = set; then
enableval="$enable_bdb"
ol_arg=invalid
ol_arg=invalid
for ol_val in auto yes no ; do
if test "$enableval" = "$ol_val" ; then
ol_arg="$ol_val"
......@@ -2391,35 +2450,32 @@ echo "$as_me: error: bad value $enableval for --enable-bdb" >&2;}
else
ol_enable_bdb="yes"
fi; # end --enable-bdb
# OpenLDAP --with-bdb_module
# OpenLDAP --with-bdb-module
 
# Check whether --with-bdb_module or --without-bdb_module was given.
# Check whether --with-bdb-module or --without-bdb-module was given.
if test "${with_bdb_module+set}" = set; then
withval="$with_bdb_module"
ol_arg=invalid
ol_arg=invalid
for ol_val in static dynamic ; do
if test "$withval" = "$ol_val" ; then
ol_arg="$ol_val"
fi
done
if test "$ol_arg" = "invalid" ; then
{ { echo "$as_me:$LINENO: error: bad value $withval for --with-bdb_module" >&5
echo "$as_me: error: bad value $withval for --with-bdb_module" >&2;}
{ { echo "$as_me:$LINENO: error: bad value $withval for --with-bdb-module" >&5