X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=configure;h=7666c289b5a95fef348cee34128ef0277345801c;hp=42044bf6d319c41638027a64d173526dcac60945;hb=173c34078c1d520926a8dabeeec01d58d6c8615f;hpb=13d2614380f499b1e5a1cc3546230239afe2b1dd

diff --git a/configure b/configure
index 42044bf..7666c28 100755
--- a/configure
+++ b/configure
@@ -12,29 +12,29 @@ ac_help=
 ac_default_prefix=/usr/local
 # Any additions from configure.in:
 ac_help="$ac_help
+  --enable-apop           enable client-side support for POP3 and APOP"
+ac_help="$ac_help
   --enable-debug          enable nmh code debugging"
 ac_help="$ac_help
   --enable-masquerade[='draft_from mmailid username_extension']
-                          enable 3 types of email address masquerading [none]"
+                          enable up to 3 types of address masquerading [none]"
 ac_help="$ac_help
   --enable-mhe            enable mhe support (DEFAULT)"
 ac_help="$ac_help
-  --enable-pop            enable client-side support for pop"
-ac_help="$ac_help
-  --enable-apop           enable client-side support for apop"
+  --enable-pop            enable client-side support for plain POP3"
 ac_help="$ac_help
   --with-hesiod=PREFIX    specify location of Hesiod"
 ac_help="$ac_help
-  --with-krb4=PREFIX      specify location of Kerberos V4 for kpop support"
+  --with-krb4=PREFIX      specify location of Kerberos V4 for KPOP support"
 ac_help="$ac_help
   --with-editor=EDITOR    specify the default editor"
 ac_help="$ac_help
-  --with-mts=MTS          specify the mail transport agent"
+  --with-mts=MTS          specify the mail transport agent/service"
 ac_help="$ac_help
   --with-pager=PAGER      specify the default pager"
 ac_help="$ac_help
   --with-smtpservers='SMTPSERVER1[ SMTPSERVER2...]'
-                          specify the default smtp server(s) [localhost]"
+                          specify the default SMTP server(s) [localhost]"
 ac_default_prefix=/usr/local/nmh
 
 # Initialize some variables set by options.
@@ -665,6 +665,20 @@ VERSION=`sed -e 's/nmh-//' ${srcdir}/VERSION`
 echo "configuring for nmh-$VERSION"
 
 
+# Check whether --enable-apop or --disable-apop was given.
+if test "${enable_apop+set}" = set; then
+  enableval="$enable_apop"
+  :
+fi
+
+if test x"$enable_apop" = x"yes"; then
+  cat >> confdefs.h <<\EOF
+#define APOP 1
+EOF
+  APOPLIB=md5.o
+  enable_pop=yes
+fi
+
 # Check whether --enable-debug or --disable-debug was given.
 if test "${enable_debug+set}" = set; then
   enableval="$enable_debug"
@@ -709,20 +723,6 @@ if test x"$enable_nmh_pop" = x"yes"; then
   enable_pop=yes
 fi
 
-# Check whether --enable-apop or --disable-apop was given.
-if test "${enable_apop+set}" = set; then
-  enableval="$enable_apop"
-  :
-fi
-
-if test x"$enable_apop" = x"yes"; then
-  cat >> confdefs.h <<\EOF
-#define APOP 1
-EOF
-  APOPLIB=md5.o
-  enable_pop=yes
-fi
-
 # Check whether --with-hesiod or --without-hesiod was given.
 if test "${with_hesiod+set}" = set; then
   withval="$with_hesiod"
@@ -4472,7 +4472,7 @@ trap 'rm -fr `echo "Makefile config/Makefile h/Makefile sbr/Makefile uip/Makefil
           zotnet/Makefile zotnet/mts/Makefile zotnet/tws/Makefile \
           zotnet/mf/Makefile zotnet/bboards/Makefile mts/Makefile \
           mts/smtp/Makefile mts/sendmail/Makefile mts/mmdf/Makefile \
-          etc/Makefile man/Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+          etc/Makefile docs/Makefile man/Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -4520,8 +4520,8 @@ s%@build_cpu@%$build_cpu%g
 s%@build_vendor@%$build_vendor%g
 s%@build_os@%$build_os%g
 s%@VERSION@%$VERSION%g
-s%@masquerade@%$masquerade%g
 s%@APOPLIB@%$APOPLIB%g
+s%@masquerade@%$masquerade%g
 s%@POPLIB@%$POPLIB%g
 s%@POPSED@%$POPSED%g
 s%@MTS@%$MTS%g
@@ -4603,7 +4603,7 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile config/Makefile h/Makefile sbr/Makefile u
           zotnet/Makefile zotnet/mts/Makefile zotnet/tws/Makefile \
           zotnet/mf/Makefile zotnet/bboards/Makefile mts/Makefile \
           mts/smtp/Makefile mts/sendmail/Makefile mts/mmdf/Makefile \
-          etc/Makefile man/Makefile"}
+          etc/Makefile docs/Makefile man/Makefile"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
@@ -4794,7 +4794,7 @@ if test x"$enable_pop" = x"yes"; then
         if test x"$enable_apop" = x"yes"; then
                 pop_kinds="${pop_kinds} apop"
         fi
-        if test x"$with_krb4" = x"yes"; then
+	if test x"$with_krb4" != x -a x"$with_krb4" != x"no"; then
                 pop_kinds="${pop_kinds} kpop"
         fi
         if test "$pop_kinds" = "yes (pop"; then