Cleanup --with and --enable help strings.

Removed variable compile_dhx. It just duped compile_ssl.

Removed explicit setting of compile_ssl on *BSD. If SSL exists on these
systems, it will be found. Also, this broke --disable-ssl on these systems.

diff --git a/configure.in b/configure.in
index ba8fb16a6a98d8562ebdf671e6df56c17ca27ccd..df4d44fdbb659910c2d4b1ee7cc84d2bb52c9f40 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.116 2001-10-21 17:14:22 jmarcus Exp $
+dnl $Id: configure.in,v 1.117 2001-10-24 16:18:00 srittau Exp $
 dnl configure.in for netatalk
 
 AC_INIT(bin/adv1tov2/adv1tov2.c)
@@ -154,7 +154,7 @@ AC_ARG_ENABLE(afs,
 )
 
 AC_ARG_WITH(config-dir,
-       [  --with-config-dir=DIR   obsolete - use --pkgconfdir],
+       [  --with-config-dir=DIR   obsolete - use --with-pkgconfdir],
                sysconfdir="$withval",
                if test "x$prefix" = "xNONE"; then
                        sysconfdir="$ac_default_prefix/etc"
@@ -165,13 +165,13 @@ AC_ARG_WITH(config-dir,
 
 AC_ARG_WITH(pkgconfdir,
        [  --with-pkgconfdir=DIR   package specific configuration in DIR
-                          [default=SYSCONF/netatalk]],
+                          [[SYSCONF/netatalk]]],
                PKGCONFDIR="$withval",
                PKGCONFDIR="${sysconfdir}/netatalk"
 )
 
 AC_ARG_WITH(cracklib,
-       [  --with-cracklib=dict    enable/set location of cracklib dictionary],
+       [  --with-cracklib=DICT    enable/set location of cracklib dictionary],
        if test "x$withval" != "xno" ; then
                cracklib="$withval"
                AC_CHECK_LIB(crack, main,
@@ -240,7 +240,7 @@ db3_required=no
 
 dnl Check for CNID DB support
 AC_ARG_ENABLE(cnid-db,
-       [  --enable-cnid-db   use persistent cnid database per volume (EXPERIMENTAL) ],
+       [  --enable-cnid-db        use persistent cnid database per volume (EXPERIMENTAL) ],
        if test "x$enableval" = "xyes"; then
                dnl Now we need DB3
                db3_required="yes"
@@ -293,7 +293,7 @@ if test "x$db3_required" != "xno"; then
 fi
 
 AC_ARG_WITH(did,
-       [  --with-did=[scheme]     set DID scheme (last,mtab)],
+       [  --with-did=SCHEME       set DID scheme (last,mtab)],
        if test "x$withval" != "xno" ; then
                if test "$withval" = "last"; then
                        AC_DEFINE(USE_LASTDID, 1)
@@ -308,19 +308,19 @@ AC_ARG_WITH(did,
 
 msg_dir=""
 AC_ARG_WITH(message-dir,
-       [  --with-msg-dir=path     path to message files [default=$ac_prefix_default/etc/msg]],
+       [  --with-msg-dir=PATH     path to message files [[PKGCONF/msg]]],
                msg_dir="$withval"
                if test x"$msg_dir" = "x"; then
                        msg_dir="${PKGCONFDIR}/msg"
                fi
                AC_DEFINE_UNQUOTED(SERVERTEXT, "$msg_dir",
-                       [path to message dir [default=$ac_prefix_default/etc/msg]])
+                       [path to message dir [[PKGCONF/msg]]])
                SERVERTEXT="$msg_dir"
                AC_SUBST(SERVERTEXT)
 )
 
 AC_ARG_ENABLE(srvloc,
-       [  --enable-srvloc         Turn on Server Location Protocol support (EXPERIMENTAL)],
+       [  --enable-srvloc         turn on Server Location Protocol support (EXPERIMENTAL)],
        srvloc=$enableval,
        srvloc=no
 )
@@ -343,7 +343,7 @@ fi
 # Check for PAM libs
 AC_MSG_CHECKING([whether PAM support should be enabled])
 AC_ARG_WITH(pam,
-    [  --with-pam              Enable PAM support],
+    [  --with-pam              enable PAM support],
     [PAM_MSG="$withval"],
     [PAM_MSG="yes"]
 )
@@ -438,7 +438,7 @@ AC_ARG_ENABLE(timelord,
 AC_MSG_RESULT([$compile_timelord])
 
 AC_ARG_WITH(uams-path,
-       [  --with-uams-path=path   path to UAMs [default=PKGCONF/uams]],
+       [  --with-uams-path=PATH   path to UAMs [[PKGCONF/uams]]],
        uams_path="$withval",
        uams_path="${PKGCONFDIR}/uams"
 )
@@ -611,8 +611,6 @@ if test x"$this_os" = "xnetbsd"; then
        dnl ----- NetBSD does not have crypt.h, uses unistd.h -----
        AC_DEFINE(UAM_DHX, 1)
        AC_DEFINE(UAM_RNDNUM, 1)
-       compile_dhx=yes
-       compile_ssl=yes
        AC_DEFINE(NO_CRYPT_H, 1)
 fi
 
@@ -628,8 +626,6 @@ if test x"$this_os" = "xopenbsd"; then
        dnl ----- OpenBSD does not have crypt.h, uses unistd.h -----
        AC_DEFINE(UAM_DHX, 1)
        AC_DEFINE(UAM_RNDNUM, 1)
-       compile_dhx=yes
-       compile_ssl=yes
        AC_DEFINE(NO_CRYPT_H, 1)
 fi
 
@@ -701,7 +697,6 @@ if test "$tryssl" = "yes"; then
                        AC_DEFINE(OPENSSL_DHX,  1)
                        AC_DEFINE(UAM_DHX,      1)
                        AC_DEFINE(UAM_RNDNUM,   1)
-                       compile_dhx=yes
                        compile_ssl=yes
                        AC_MSG_RESULT([Found ssl and enabling RANDNUM and DHX support "$ssldir"])
                        break
@@ -725,7 +720,7 @@ AC_ARG_ENABLE(pgp-uam,
 dnl --------------------- check for building Kerberos v4 UAM module
 
 AC_ARG_ENABLE(krb4-uam,
-       [  --enable-krb4-uam      enable build of Kerberos v4 UAM module],
+       [  --enable-krb4-uam       enable build of Kerberos v4 UAM module],
        if test "$enableval" = "yes"; then
                AC_DEFINE(UAM_KRB4, 1)
                compile_kerberos=yes
@@ -736,8 +731,7 @@ dnl --------------------- overwrite the config files . . . or not.
 
 AC_MSG_CHECKING([whether configuration files should be overwritten])
 AC_ARG_ENABLE(overwrite,
-       [  --enable-overwrite      Overwrite configuration files
-                                  default=PKGCONFDIR],
+       [  --enable-overwrite      overwrite configuration files],
        [OVERWRITE_CONFIG="${enable_overwrite}"],
        [OVERWRITE_CONFIG="no"]
 )
@@ -755,7 +749,7 @@ AC_SUBST(OVERWRITE_CONFIG)
 
 AM_CONDITIONAL(SOLARIS_MODULE, test x$solaris_module = xyes)
 AM_CONDITIONAL(COMPILE_TIMELORD, test x$compile_timelord = xyes)
-AM_CONDITIONAL(USE_DHX, test x$compile_dhx = xyes)
+AM_CONDITIONAL(USE_DHX, test x$compile_ssl = xyes)
 AM_CONDITIONAL(USE_KERBEROS, test x$compile_kerberos = xyes)
 AM_CONDITIONAL(USE_PAM_SO, test x$use_pam_so = xyes)
 AM_CONDITIONAL(USE_PAM, test x$compile_pam = xyes)