Skip to content
Snippets Groups Projects
Commit b851a1a7 authored by Kurt Zeilenga's avatar Kurt Zeilenga
Browse files

More autoconf 2.57 changes (this is getting ugly)

parent 25093425
No related branches found
Tags OPENLDAP_REL_ENG_2_1_8
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
build/openldap.m4
+ 11
− 11
View file @ b851a1a7
......@@ -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
......
configure
+ 328
− 321
View file @ b851a1a7
This diff is collapsed.
configure.in
+ 63
− 91
View file @ b851a1a7
......@@ -105,115 +105,87 @@ AC_SUBST(ldap_subdir)dnl
dnl ----------------------------------------------------------------
dnl General "enable" options
OL_ARG_ENABLE(debug,[ --enable-debug enable debugging], yes)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
dnl OL_ARG_ENABLE(referrals,[ --enable-referrals enable LDAPv2+ Referrals (experimental)], no)dnl
OL_ARG_ENABLE(debug,[enable debugging], yes)dnl
OL_ARG_ENABLE(dynamic,[enable linking built binaries with dynamic libs], no)dnl
OL_ARG_ENABLE(syslog,[enable syslog support], auto)dnl
OL_ARG_ENABLE(proctitle,[enable proctitle support], yes)dnl
dnl OL_ARG_ENABLE(referrals,[enable LDAPv2+ Referrals (experimental)], no)dnl
ol_enable_referrals=${ol_enable_referrals-no}
dnl OL_ARG_ENABLE(kbind,[ --enable-kbind enable LDAPv2+ Kerberos IV bind (deprecated)], no)dnl
dnl OL_ARG_ENABLE(kbind,[enable LDAPv2+ Kerberos IV bind (deprecated)], no)dnl
ol_enable_kbind=${ol_enable_kbind-no}
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],
no, [yes no])dnl
OL_ARG_ENABLE(ipv6,[enable IPv6 support], auto)dnl
OL_ARG_ENABLE(local,[enable AF_LOCAL (AF_UNIX) socket support], auto)dnl
OL_ARG_ENABLE(x-compile,[enable cross compiling], no, [yes no])dnl
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],
auto, [auto yes no] )
OL_ARG_WITH(kerberos,[ --with-kerberos with Kerberos support],
auto, [auto k5 k5only k425 kth k4 afs yes no])
OL_ARG_WITH(readline,[ --with-readline with readline support],
auto, [auto yes no] )
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] )
OL_ARG_WITH(yielding_select,[ --with-yielding-select with implicitly yielding select],
auto, [auto yes no manual] )
OL_ARG_WITH(cyrus_sasl,[with Cyrus SASL support], auto)dnl
OL_ARG_WITH(fetch,[with fetch(3) URL support], auto)dnl
OL_ARG_WITH(kerberos,[with Kerberos support], auto,
[auto k5 k5only k425 kth k4 afs yes no])dnl
OL_ARG_WITH(readline,[with readline support], auto)dnl
OL_ARG_WITH(threads,[with threads], auto,
[auto nt posix mach pth lwp yes no manual])dnl
OL_ARG_WITH(tls,[with TLS/SSL support], auto,
[auto ssleay openssl yes no])dnl
OL_ARG_WITH(yielding_select,[with implicitly yielding select], auto,
[auto yes no manual])dnl
dnl ----------------------------------------------------------------
dnl Server options
dnl ----------------------------------------------------------------
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 (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(kpasswd,[ --enable-kpasswd enable Kerberos password verification], no)dnl
OL_ARG_ENABLE(lmpasswd,[ --enable-lmpasswd enable LAN Manager passwords], 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
dnl OL_ARG_ENABLE(multimaster,[ --enable-multimaster enable multimaster replication], no)dnl
OL_ARG_ENABLE(slapd,[enable building slapd], yes)dnl
OL_ARG_ENABLE(aci,[enable per-object ACIs (experimental)], no)dnl
OL_ARG_ENABLE(cleartext,[enable cleartext passwords], yes)dnl
OL_ARG_ENABLE(crypt,[enable crypt(3) passwords], no)dnl
OL_ARG_ENABLE(kpasswd,[enable Kerberos password verification], no)dnl
OL_ARG_ENABLE(lmpasswd,[enable LAN Manager passwords], no)dnl
OL_ARG_ENABLE(spasswd,[enable (Cyrus) SASL password verification], no)dnl
OL_ARG_ENABLE(modules,[enable dynamic module support], no)dnl
dnl OL_ARG_ENABLE(multimaster,[enable multimaster replication], no)dnl
ol_enable_multimaster=${ol_enable_multimaster-no}
OL_ARG_ENABLE(phonetic,[ --enable-phonetic enable phonetic/soundex], no)dnl
OL_ARG_ENABLE(rewrite,[ --enable-rewrite enable DN rewriting in back-ldap and back-meta], no)dnl
OL_ARG_ENABLE(rlookups,[ --enable-rlookups enable reverse lookups of client hostnames], no)dnl
OL_ARG_ENABLE(slapi,[ --enable-slapi enable installation of slapi library], no)dnl
OL_ARG_ENABLE(slp,[ --enable-slp enable SLPv2 support], no)dnl
OL_ARG_ENABLE(wrappers,[ --enable-wrappers enable tcp wrapper support], no)dnl
OL_ARG_ENABLE(phonetic,[enable phonetic/soundex], no)dnl
OL_ARG_ENABLE(rewrite,[enable DN rewriting in back-ldap and back-meta], no)dnl
OL_ARG_ENABLE(rlookups,[enable reverse lookups of client hostnames], no)dnl
OL_ARG_ENABLE(slapi,[enable installation of slapi library], no)dnl
OL_ARG_ENABLE(slp,[enable SLPv2 support], no)dnl
OL_ARG_ENABLE(wrappers,[enable tcp wrapper support], no)dnl
dnl SLAPD Backend options
OL_ARG_ENABLE(bdb,[ --enable-bdb enable Berkeley DB backend], yes)dnl
OL_ARG_WITH(bdb_module,[ --with-bdb-module module type static|dynamic], static,
[static dynamic])
OL_ARG_ENABLE(dnssrv,[ --enable-dnssrv enable dnssrv backend], no)dnl
OL_ARG_WITH(dnssrv_module,[ --with-dnssrv-module module type static|dynamic], static,
[static dynamic])
OL_ARG_ENABLE(ldap,[ --enable-ldap enable ldap backend], no)dnl
OL_ARG_WITH(ldap_module,[ --with-ldap-module module type static|dynamic], static,
[static dynamic])
OL_ARG_ENABLE(ldbm,[ --enable-ldbm enable ldbm backend], no)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_module,[ --with-ldbm-module module type static|dynamic], static,
[static dynamic])
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)dnl
OL_ARG_WITH(meta_module,[ --with-meta-module module type static|dynamic], static,
[static dynamic])
OL_ARG_ENABLE(monitor,[ --enable-monitor enable monitor backend], no)dnl
OL_ARG_WITH(monitor_module,[ --with-monitor-module module type static|dynamic], static,
[static dynamic])
OL_ARG_ENABLE(null,[ --enable-null enable null backend], no)dnl
OL_ARG_WITH(null_module,[ --with-null-module module type static|dynamic], static,
[static dynamic])
OL_ARG_ENABLE(passwd,[ --enable-passwd enable passwd backend], no)dnl
OL_ARG_WITH(passwd_module,[ --with-passwd-module module type static|dynamic], static,
[static dynamic])
OL_ARG_ENABLE(perl,[ --enable-perl enable perl backend], no)dnl
OL_ARG_WITH(perl_module,[ --with-perl-module module type static|dynamic], static,
[static dynamic])
OL_ARG_ENABLE(shell,[ --enable-shell enable shell backend], no)dnl
OL_ARG_WITH(shell_module,[ --with-shell-module module type static|dynamic], static,
[static dynamic])
OL_ARG_ENABLE(sql,[ --enable-sql enable sql backend], no)dnl
OL_ARG_WITH(sql_module,[ --with-sql-module module type static|dynamic], static,
[static dynamic])
OL_ARG_ENABLE(tcl,[ --enable-tcl enable tcl backend], no)dnl
OL_ARG_WITH(tcl_module,[ --with-tcl-module module type static|dynamic], static,
[static dynamic])
OL_ARG_ENABLE(bdb,[enable Berkeley DB backend], yes)dnl
OL_ARG_WITH(bdb-module,[module type], static, [static dynamic])dnl
OL_ARG_ENABLE(dnssrv,[enable dnssrv backend], no)dnl
OL_ARG_WITH(dnssrv-module,[module type], static, [static dynamic])dnl
OL_ARG_ENABLE(ldap,[enable ldap backend], no)dnl
OL_ARG_WITH(ldap-module,[module type], static, [static dynamic])dnl
OL_ARG_ENABLE(ldbm,[enable ldbm backend], no)dnl
OL_ARG_WITH(ldbm_api,[with LDBM API], auto, [auto berkeley bcompat mdbm gdbm])dnl
OL_ARG_WITH(ldbm-module,[module type], static, [static dynamic])dnl
OL_ARG_WITH(ldbm-type,[use LDBM type], auto, [auto btree hash])dnl
OL_ARG_ENABLE(meta,[enable metadirectory backend], no)dnl
OL_ARG_WITH(meta-module,[module type], static, [static dynamic])dnl
OL_ARG_ENABLE(monitor,[enable monitor backend], no)dnl
OL_ARG_WITH(monitor-module,[module type], static, [static dynamic])dnl
OL_ARG_ENABLE(null,[enable null backend], no)dnl
OL_ARG_WITH(null-module,[module type], static, [static dynamic])dnl
OL_ARG_ENABLE(passwd,[enable passwd backend], no)dnl
OL_ARG_WITH(passwd-module,[module type], static, [static dynamic])dnl
OL_ARG_ENABLE(perl,[enable perl backend], no)dnl
OL_ARG_WITH(perl-module,[module type], static, [static dynamic])dnl
OL_ARG_ENABLE(shell,[enable shell backend], no)dnl
OL_ARG_WITH(shell-module,[module type], static, [static dynamic])dnl
OL_ARG_ENABLE(sql,[enable sql backend], no)dnl
OL_ARG_WITH(sql-module,[module type], static, [static dynamic])dnl
OL_ARG_ENABLE(tcl,[enable tcl backend], no)dnl
OL_ARG_WITH(tcl-module,[module type], static, [static dynamic])dnl
dnl ----------------------------------------------------------------
dnl SLURPD OPTIONS
AC_ARG_WITH(xxslurpdoptions,[
SLURPD (Replication Daemon) Options:])
OL_ARG_ENABLE(slurpd,[ --enable-slurpd enable building slurpd], auto)dnl
OL_ARG_ENABLE(slurpd,[enable building slurpd], auto)dnl
dnl ----------------------------------------------------------------
AC_ARG_WITH(xxliboptions,[
Library Generation & Linking Options])
dnl Library Generation & Linking Options
AC_ENABLE_STATIC
AC_ENABLE_SHARED
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment