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

diff --git a/configure b/configure
index bba17f2..7666c28 100755
--- a/configure
+++ b/configure
@@ -12,6 +12,8 @@ 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']
@@ -19,22 +21,20 @@ ac_help="$ac_help
 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"
@@ -1263,7 +1263,7 @@ if test -n "$RANLIB"; then
 else
   echo "$ac_t""no" 1>&6
 fi
-		for ac_prog in gawk mawk nawk awk
+		for ac_prog in mawk gawk nawk awk
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -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