From fb3a6ee715e263b358ba0efd6b5086cefe122f23 Mon Sep 17 00:00:00 2001
From: Kurt Zeilenga <kurt@openldap.org>
Date: Sun, 22 Aug 1999 18:47:54 +0000
Subject: [PATCH] ./configure --help cleanup
---
configure | 48 ++++++++++++++++++++++++------------------------
configure.in | 12 ++++++------
2 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/configure b/configure
index f54f1d5b34..d1b6b0d2c9 100755
--- a/configure
+++ b/configure
@@ -33,17 +33,17 @@ ac_help="$ac_help
ac_help="$ac_help
--enable-dmalloc enable debug malloc support (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 Kerberos support (auto)"
ac_help="$ac_help
- --with-readline with readline support (auto)"
+ --with-readline with readline support (auto)"
ac_help="$ac_help
--with-threads use 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)"
ac_help="$ac_help
@@ -84,10 +84,10 @@ ac_help="$ac_help
--with-ldap-module module type (static)"
ac_help="$ac_help
--enable-ldbm enable ldbm backend (yes)"
-ac_help="$ac_help
- --with-ldbm-module module type (static)"
ac_help="$ac_help
--with-ldbm-api use LDBM API (auto)"
+ac_help="$ac_help
+ --with-ldbm-module module type (static)"
ac_help="$ac_help
--with-ldbm-type use LDBM type (auto)"
ac_help="$ac_help
@@ -1832,47 +1832,47 @@ else
ol_enable_ldbm="yes"
fi
# end --enable-ldbm
-# OpenLDAP --with-ldbm_module
- # Check whether --with-ldbm_module or --without-ldbm_module was given.
-if test "${with_ldbm_module+set}" = set; then
- withval="$with_ldbm_module"
+# OpenLDAP --with-ldbm_api
+ # Check whether --with-ldbm_api or --without-ldbm_api was given.
+if test "${with_ldbm_api+set}" = set; then
+ withval="$with_ldbm_api"
ol_arg=invalid
- for ol_val in static dynamic ; do
+ for ol_val in auto db2 db mdbm gdbm ndbm manual ; do
if test "$withval" = "$ol_val" ; then
ol_arg="$ol_val"
fi
done
if test "$ol_arg" = "invalid" ; then
- { echo "configure: error: bad value $withval for --with-ldbm_module" 1>&2; exit 1; }
+ { echo "configure: error: bad value $withval for --with-ldbm_api" 1>&2; exit 1; }
fi
- ol_with_ldbm_module="$ol_arg"
+ ol_with_ldbm_api="$ol_arg"
else
- ol_with_ldbm_module="static"
+ ol_with_ldbm_api="auto"
fi
-# end --with-ldbm_module
+# end --with-ldbm_api
-# OpenLDAP --with-ldbm_api
- # Check whether --with-ldbm_api or --without-ldbm_api was given.
-if test "${with_ldbm_api+set}" = set; then
- withval="$with_ldbm_api"
+# OpenLDAP --with-ldbm_module
+ # Check whether --with-ldbm_module or --without-ldbm_module was given.
+if test "${with_ldbm_module+set}" = set; then
+ withval="$with_ldbm_module"
ol_arg=invalid
- for ol_val in auto db2 db mdbm gdbm ndbm manual ; do
+ 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 "configure: error: bad value $withval for --with-ldbm_api" 1>&2; exit 1; }
+ { echo "configure: error: bad value $withval for --with-ldbm_module" 1>&2; exit 1; }
fi
- ol_with_ldbm_api="$ol_arg"
+ ol_with_ldbm_module="$ol_arg"
else
- ol_with_ldbm_api="auto"
+ ol_with_ldbm_module="static"
fi
-# end --with-ldbm_api
+# end --with-ldbm_module
# OpenLDAP --with-ldbm_type
# Check whether --with-ldbm_type or --without-ldbm_type was given.
diff --git a/configure.in b/configure.in
index 960d600fe3..b4646a756a 100644
--- a/configure.in
+++ b/configure.in
@@ -80,17 +80,17 @@ OL_ARG_ENABLE(x_compile,[ --enable-x-compile enable cross compiling],
dnl General "with" options
OL_ARG_ENABLE(dmalloc,[ --enable-dmalloc enable debug malloc support], no)dnl
-OL_ARG_WITH(cyrus_sasl,[ --with-cyrus-sasl with Cyrus SASL support],
+OL_ARG_WITH(cyrus_sasl,[ --with-cyrus-sasl with Cyrus SASL support],
auto, [auto yes no] )
-OL_ARG_WITH(fetch,[ --with-fetch with fetch URL support],
+OL_ARG_WITH(fetch,[ --with-fetch with fetch URL support],
auto, [auto yes no] )
OL_ARG_WITH(kerberos,[ --with-kerberos with Kerberos support],
auto, [auto k5 k4 afs yes no])
-OL_ARG_WITH(readline,[ --with-readline with readline support],
+OL_ARG_WITH(readline,[ --with-readline with readline support],
auto, [auto yes no] )
OL_ARG_WITH(threads,[ --with-threads use threads],
auto, [auto posix mach pth lwp yes no manual] )
-OL_ARG_WITH(tls,[ --with-tls with TLS/SSL support],
+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] )
@@ -123,10 +123,10 @@ OL_ARG_ENABLE(ldap,[ --enable-ldap enable ldap backend], no)dnl
OL_ARG_WITH(ldap_module,[ --with-ldap-module module type], static,
[static dynamic])
OL_ARG_ENABLE(ldbm,[ --enable-ldbm enable ldbm backend], yes)dnl
-OL_ARG_WITH(ldbm_module,[ --with-ldbm-module module type], static,
- [static dynamic])
OL_ARG_WITH(ldbm_api,[ --with-ldbm-api use LDBM API], auto,
[auto db2 db mdbm gdbm ndbm manual])
+OL_ARG_WITH(ldbm_module,[ --with-ldbm-module module type], static,
+ [static dynamic])
OL_ARG_WITH(ldbm_type,[ --with-ldbm-type use LDBM type], auto,
[auto btree hash])
--
GitLab