Commit 903106a0 authored by Howard Chu's avatar Howard Chu
Browse files

Change ldbm options from --with to --enable to preserve order in helptext

parent 7cea1516
......@@ -254,7 +254,7 @@ dnl ----------------------------------------------------------------
dnl ----------------------------------------------------------------
dnl SLAPD OPTIONS
AC_ARG_WITH(xxslapdoptions,[
AC_ARG_ENABLE(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
......@@ -276,7 +276,7 @@ dnl SLAPD Backend Options
Backends="bdb dnssrv hdb ldap ldbm meta monitor null \
passwd perl relay shell sql"
AC_ARG_WITH(xxslapbackends,[
AC_ARG_ENABLE(xxslapbackends,[
SLAPD Backend Options:])
OL_ARG_ENABLE(backends,[ --enable-backends enable all available backends no|yes|mod],
......@@ -292,9 +292,9 @@ OL_ARG_ENABLE(ldap,[ --enable-ldap enable ldap backend no|yes|mod],
[${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],
OL_ARG_ENABLE(ldbm_api,[ --enable-ldbm-api use 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],
OL_ARG_ENABLE(ldbm_type,[ --enable-ldbm-type use LDBM type auto|btree|hash],
auto, [auto btree hash])
OL_ARG_ENABLE(meta,[ --enable-meta enable metadirectory backend no|yes|mod],
[${ol_dflt_backends-no}], [no yes mod])dnl
......@@ -318,7 +318,7 @@ dnl SLAPD Overlay Options
Overlays="accesslog denyop dyngroup dynlist glue lastmod ppolicy proxycache \
refint retcode rwm syncprov translucent unique"
AC_ARG_WITH(xxslapoverlays,[
AC_ARG_ENABLE(xxslapoverlays,[
SLAPD Overlay Options:])
OL_ARG_ENABLE(overlays,[ --enable-overlays enable all available overlays no|yes|mod],
......@@ -356,12 +356,12 @@ OL_ARG_ENABLE(unique,[ --enable-unique Attribute Uniqueness overlay no|
dnl ----------------------------------------------------------------
dnl SLURPD OPTIONS
AC_ARG_WITH(xxslurpdoptions,[
AC_ARG_ENABLE(xxslurpdoptions,[
SLURPD (Replication Daemon) Options:])
OL_ARG_ENABLE(slurpd,[ --enable-slurpd enable building slurpd], auto)dnl
dnl ----------------------------------------------------------------
AC_ARG_WITH(xxliboptions,[
AC_ARG_ENABLE(xxliboptions,[
Library Generation & Linking Options])
AC_ENABLE_STATIC
AC_ENABLE_SHARED
......@@ -399,11 +399,11 @@ if test $ol_enable_slapd = no ; then
if test $ol_enable_aci = yes ; then
AC_MSG_WARN([slapd disabled, ignoring --enable-aci argument])
fi
if test $ol_with_ldbm_api != auto ; then
AC_MSG_WARN([slapd disabled, ignoring --with-ldbm-api argument])
if test $ol_enable_ldbm_api != auto ; then
AC_MSG_WARN([slapd disabled, ignoring --enable-ldbm-api argument])
fi
if test $ol_with_ldbm_type != auto ; then
AC_MSG_WARN([slapd disabled, ignoring --with-ldbm-type argument])
if test $ol_enable_ldbm_type != auto ; then
AC_MSG_WARN([slapd disabled, ignoring --enable-ldbm-type argument])
fi
if test $ol_enable_slurpd = yes ; then
AC_MSG_ERROR([slurpd requires slapd])
......@@ -434,8 +434,8 @@ if test $ol_enable_slapd = no ; then
ol_enable_aci=no
ol_enable_wrappers=no
ol_with_ldbm_api=no
ol_with_ldbm_type=no
ol_enable_ldbm_api=no
ol_enable_ldbm_type=no
ol_enable_slurpd=no
......@@ -444,12 +444,12 @@ if test $ol_enable_slapd = no ; then
elif test $ol_enable_ldbm = no ; then
dnl SLAPD without LDBM
if test $ol_with_ldbm_api != auto ; then
AC_MSG_WARN([LDBM disabled, ignoring --with-ldbm-api argument])
if test $ol_enable_ldbm_api != auto ; then
AC_MSG_WARN([LDBM disabled, ignoring --enable-ldbm-api argument])
fi
if test $ol_with_ldbm_type != auto ; then
AC_MSG_WARN([LDBM disabled, ignoring --with-ldbm-type argument])
if test $ol_enable_ldbm_type != auto ; then
AC_MSG_WARN([LDBM disabled, ignoring --enable-ldbm-type argument])
fi
if test $ol_enable_modules != yes -a \
......@@ -474,32 +474,32 @@ elif test $ol_enable_ldbm = no ; then
fi
fi
ol_with_ldbm_api=no
ol_with_ldbm_type=no
ol_enable_ldbm_api=no
ol_enable_ldbm_type=no
if test $ol_enable_bdb != no -o $ol_enable_hdb != no; then
ol_with_ldbm_api=berkeley
ol_enable_ldbm_api=berkeley
fi
else
dnl SLAPD with LDBM
if test $ol_with_ldbm_api = gdbm -a \
$ol_with_ldbm_type = btree ; then
if test $ol_enable_ldbm_api = gdbm -a \
$ol_enable_ldbm_type = btree ; then
AC_MSG_ERROR([GDBM only supports LDBM type hash])
fi
if test $ol_with_ldbm_api = mdbm -a \
$ol_with_ldbm_type = btree ; then
if test $ol_enable_ldbm_api = mdbm -a \
$ol_enable_ldbm_type = btree ; then
AC_MSG_ERROR([MDBM only supports LDBM type hash])
fi
if test $ol_with_ldbm_api = ndbm -a \
$ol_with_ldbm_type = btree ; then
if test $ol_enable_ldbm_api = ndbm -a \
$ol_enable_ldbm_type = btree ; then
AC_MSG_ERROR([NDBM only supports LDBM type hash])
fi
if test $ol_enable_bdb != no -o $ol_enable_hdb != no ; then
if test $ol_with_ldbm_api = auto ; then
ol_with_ldbm_api=berkeley
elif test $ol_with_ldbm_api != berkeley ; then
if test $ol_enable_ldbm_api = auto ; then
ol_enable_ldbm_api=berkeley
elif test $ol_enable_ldbm_api != berkeley ; then
AC_MSG_ERROR([LDBM API not compatible with BDB/HDB])
fi
fi
......@@ -1937,11 +1937,11 @@ fi
dnl ----------------------------------------------------------------
ol_link_ldbm=no
if test $ol_with_ldbm_api = auto \
-o $ol_with_ldbm_api = berkeley \
-o $ol_with_ldbm_api = bcompat ; then
if test $ol_enable_ldbm_api = auto \
-o $ol_enable_ldbm_api = berkeley \
-o $ol_enable_ldbm_api = bcompat ; then
if test $ol_with_ldbm_api = bcompat; then \
if test $ol_enable_ldbm_api = bcompat; then \
OL_BERKELEY_COMPAT_DB
else
OL_BERKELEY_DB
......@@ -1952,9 +1952,9 @@ if test $ol_with_ldbm_api = auto \
[define this if Berkeley DB is available])
ol_link_ldbm=berkeley
ol_with_ldbm_api=berkeley
ol_enable_ldbm_api=berkeley
if test $ol_with_ldbm_type = hash ; then
if test $ol_enable_ldbm_type = hash ; then
AC_DEFINE(LDBM_USE_DBHASH,1,
[define this to use DBHASH w/ LDBM backend])
else
......@@ -1982,29 +1982,29 @@ if test $ol_enable_bdb != no -o $ol_enable_hdb != no; then
fi
fi
if test $ol_link_ldbm = no -a $ol_with_ldbm_type = btree ; then
if test $ol_link_ldbm = no -a $ol_enable_ldbm_type = btree ; then
AC_MSG_WARN([Could not find LDBM with BTREE support])
ol_with_ldbm_api=none
ol_enable_ldbm_api=none
fi
if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = mdbm ; then
if test $ol_enable_ldbm_api = auto -o $ol_enable_ldbm_api = mdbm ; then
OL_MDBM
if test $ol_cv_mdbm = yes ; then
ol_link_ldbm=mdbm
ol_with_ldbm_api=mdbm
ol_enable_ldbm_api=mdbm
if test $ol_cv_lib_mdbm != yes ; then
LDBM_LIBS="$LDBM_LIBS $ol_cv_lib_mdbm"
fi
fi
fi
if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = gdbm ; then
if test $ol_enable_ldbm_api = auto -o $ol_enable_ldbm_api = gdbm ; then
OL_GDBM
if test $ol_cv_gdbm = yes ; then
ol_link_ldbm=gdbm
ol_with_ldbm_api=gdbm
ol_enable_ldbm_api=gdbm
if test $ol_cv_lib_gdbm != yes ; then
LDBM_LIBS="$LDBM_LIBS $ol_cv_lib_gdbm"
......@@ -2012,12 +2012,12 @@ if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = gdbm ; then
fi
fi
if test $ol_with_ldbm_api = ndbm ; then
if test $ol_enable_ldbm_api = ndbm ; then
OL_NDBM
if test $ol_cv_ndbm = yes ; then
ol_link_ldbm=ndbm
ol_with_ldbm_api=ndbm
ol_enable_ldbm_api=ndbm
if test $ol_cv_lib_ndbm != yes ; then
LDBM_LIBS="$LDBM_LIBS $ol_cv_lib_ndbm"
......
Supports Markdown
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