From a64cee85e32add8c145c5423282a9d626e0431b5 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Sat, 13 Aug 2005 05:47:59 +0000 Subject: [PATCH] Misc cleanup Help strings are screwed --- configure | 67 +++++++++++++++++++++++----------------------------- configure.in | 63 +++++++++++++++++++++--------------------------- 2 files changed, 56 insertions(+), 74 deletions(-) diff --git a/configure b/configure index 07950a05e8..d809a691a2 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in OpenLDAP: pkg/ldap/configure.in,v 1.586.2.17 2005/08/13 00:47:49 kurt Exp . +# From configure.in OpenLDAP: pkg/ldap/configure.in,v 1.586.2.18 2005/08/13 01:04:51 kurt Exp . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59. # @@ -1580,15 +1580,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - -# set unset (borrowed from autoconf 2.49c) -if (OL_FOO=OL_FOO; unset OL_FOO) >/dev/null 2>&1; then - ol_unset=unset -else - ol_unset=false -fi -# unset CDPATH -$ol_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; } ac_aux_dir= for ac_dir in build $srcdir/build; do @@ -5591,7 +5582,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5594 "configure"' > conftest.$ac_ext + echo '#line 5585 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7412,7 +7403,7 @@ fi # Provide some information about the compiler. -echo "$as_me:7415:" \ +echo "$as_me:7406:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -8510,11 +8501,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8513: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8504: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8517: \$? = $ac_status" >&5 + echo "$as_me:8508: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8772,11 +8763,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8775: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8766: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8779: \$? = $ac_status" >&5 + echo "$as_me:8770: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8834,11 +8825,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8837: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8828: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8841: \$? = $ac_status" >&5 + echo "$as_me:8832: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -11074,7 +11065,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:13414: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13427: \$? = $ac_status" >&5 + echo "$as_me:13418: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13482,11 +13473,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13485: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13476: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13489: \$? = $ac_status" >&5 + echo "$as_me:13480: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14851,7 +14842,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:15828: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15841: \$? = $ac_status" >&5 + echo "$as_me:15832: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -15896,11 +15887,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15899: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15890: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15903: \$? = $ac_status" >&5 + echo "$as_me:15894: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -18018,11 +18009,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18021: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18012: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:18025: \$? = $ac_status" >&5 + echo "$as_me:18016: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -18280,11 +18271,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18283: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18274: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:18287: \$? = $ac_status" >&5 + echo "$as_me:18278: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -18342,11 +18333,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18345: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18336: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:18349: \$? = $ac_status" >&5 + echo "$as_me:18340: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -20582,7 +20573,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext </dev/null 2>&1; then - ol_unset=unset -else - ol_unset=false -fi -# unset CDPATH -$ol_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; } - AC_CONFIG_AUX_DIR(build)dnl eval `$ac_aux_dir/version.sh` @@ -292,35 +283,35 @@ OL_ARG_ENABLE(backends,[ --enable-backends enable all available backends no --, [no yes mod])dnl test -n "$ol_enable_backends" && ol_dflt_backends="$ol_enable_backends" OL_ARG_ENABLE(bdb,[ --enable-bdb enable Berkeley DB backend no|yes|mod], - ${ol_dflt_backends-yes}, [no yes mod])dnl + [${ol_dflt_backends-yes}], [no yes mod])dnl OL_ARG_ENABLE(dnssrv,[ --enable-dnssrv enable dnssrv backend no|yes|mod], - ${ol_dflt_backends-no}, [no yes mod])dnl + [${ol_dflt_backends-no}], [no yes mod])dnl OL_ARG_ENABLE(hdb,[ --enable-hdb enable Hierarchical DB backend no|yes|mod], - ${ol_dflt_backends-yes}, [no yes mod])dnl + [${ol_dflt_backends-yes}], [no yes mod])dnl OL_ARG_ENABLE(ldap,[ --enable-ldap enable ldap backend no|yes|mod], - ${ol_dflt_backends-no}, [no yes mod])dnl + [${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_dflt_backends-no}], [no yes mod])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_type,[ --with-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 + [${ol_dflt_backends-no}], [no yes mod])dnl OL_ARG_ENABLE(monitor,[ --enable-monitor enable monitor backend no|yes|mod], - ${ol_dflt_backends-yes}, [no yes mod])dnl + [${ol_dflt_backends-yes}], [no yes mod])dnl OL_ARG_ENABLE(null,[ --enable-null enable null backend no|yes|mod], - ${ol_dflt_backends-no}, [no yes mod])dnl + [${ol_dflt_backends-no}], [no yes mod])dnl OL_ARG_ENABLE(passwd,[ --enable-passwd enable passwd backend no|yes|mod], - ${ol_dflt_backends-no}, [no yes mod])dnl + [${ol_dflt_backends-no}], [no yes mod])dnl OL_ARG_ENABLE(perl,[ --enable-perl enable perl backend no|yes|mod], - ${ol_dflt_backends-no}, [no yes mod])dnl + [${ol_dflt_backends-no}], [no yes mod])dnl OL_ARG_ENABLE(relay,[ --enable-relay enable relay backend no|yes|mod], - ${ol_dflt_backends-yes}, [no yes mod])dnl + [${ol_dflt_backends-yes}], [no yes mod])dnl OL_ARG_ENABLE(shell,[ --enable-shell enable shell backend no|yes|mod], - ${ol_dflt_backends-no}, [no yes mod])dnl + [${ol_dflt_backends-no}], [no yes mod])dnl OL_ARG_ENABLE(sql,[ --enable-sql enable sql backend no|yes|mod], - ${ol_dflt_backends-no}, [no yes mod])dnl + [${ol_dflt_backends-no}], [no yes mod])dnl dnl ---------------------------------------------------------------- dnl SLAPD Overlay Options @@ -334,33 +325,33 @@ OL_ARG_ENABLE(overlays,[ --enable-overlays enable all available overlays no --, [no yes mod])dnl test -n "$ol_enable_overlays" && ol_dflt_overlays="$ol_enable_overlays" OL_ARG_ENABLE(accesslog,[ --enable-accesslog In-Directory Access Logging overlay no|yes|mod], - ${ol_dflt_overlays-no}, [no yes mod]) + [${ol_dflt_overlays-no}], [no yes mod]) OL_ARG_ENABLE(denyop,[ --enable-denyop Deny Operation overlay no|yes|mod], - ${ol_dflt_overlays-no}, [no yes mod]) + [${ol_dflt_overlays-no}], [no yes mod]) OL_ARG_ENABLE(dyngroup,[ --enable-dyngroup Dynamic Group overlay no|yes|mod], - ${ol_dflt_overlays-no}, [no yes mod]) + [${ol_dflt_overlays-no}], [no yes mod]) OL_ARG_ENABLE(dynlist,[ --enable-dynlist Dynamic List overlay no|yes|mod], - ${ol_dflt_overlays-no}, [no yes mod]) + [${ol_dflt_overlays-no}], [no yes mod]) OL_ARG_ENABLE(glue,[ --enable-glue Backend Glue overlay no|yes|mod], - ${ol_dflt_overlays-yes}, [no yes mod]) + [${ol_dflt_overlays-yes}], [no yes mod]) OL_ARG_ENABLE(lastmod,[ --enable-lastmod Last Modification overlay no|yes|mod], - ${ol_dflt_overlays-no}, [no yes mod]) + [${ol_dflt_overlays-no}], [no yes mod]) OL_ARG_ENABLE(ppolicy,[ --enable-ppolicy Password Policy overlay no|yes|mod], - ${ol_dflt_overlays-no}, [no yes mod]) + [${ol_dflt_overlays-no}], [no yes mod]) OL_ARG_ENABLE(proxycache,[ --enable-proxycache Proxy Cache overlay no|yes|mod], - ${ol_dflt_overlays-no}, [no yes mod]) + [${ol_dflt_overlays-no}], [no yes mod]) OL_ARG_ENABLE(refint,[ --enable-refint Referential Integrity overlay no|yes|mod], - ${ol_dflt_overlays-no}, [no yes mod]) + [${ol_dflt_overlays-no}], [no yes mod]) OL_ARG_ENABLE(retcode,[ --enable-retcode Return Code testing overlay no|yes|mod], - ${ol_dflt_overlays-no}, [no yes mod]) + [${ol_dflt_overlays-no}], [no yes mod]) OL_ARG_ENABLE(rwm,[ --enable-rwm Rewrite/Remap overlay no|yes|mod], - ${ol_dflt_overlays-no}, [no yes mod]) + [${ol_dflt_overlays-no}], [no yes mod]) OL_ARG_ENABLE(syncprov,[ --enable-syncprov Syncrepl Provider overlay no|yes|mod], - ${ol_dflt_overlays-yes}, [no yes mod]) + [${ol_dflt_overlays-yes}], [no yes mod]) OL_ARG_ENABLE(translucent,[ --enable-translucent Translucent Proxy overlay no|yes|mod], - ${ol_dflt_overlays-no}, [no yes mod]) + [${ol_dflt_overlays-no}], [no yes mod]) OL_ARG_ENABLE(unique,[ --enable-unique Attribute Uniqueness overlay no|yes|mod], - ${ol_dflt_overlays-no}, [no yes mod]) + [${ol_dflt_overlays-no}], [no yes mod]) dnl ---------------------------------------------------------------- -- 2.39.5