X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=configure.in;h=111c53f5bdc37a8653f67081daead1c2d2c87207;hb=refs%2Ftags%2Fnmh-1_0_3;hp=9d3d2263c47ef757a0eb2d492bd3ee9f5d764af6;hpb=3021e2535d74e219a9c7ccba2cc91c126e4b1a9f;p=mmh

diff --git a/configure.in b/configure.in
index 9d3d226..111c53f 100644
--- a/configure.in
+++ b/configure.in
@@ -43,8 +43,8 @@ fi
 dnl Allow users to send email from addresses other than their default?
 undefine([masquerade])dnl
 AC_ARG_ENABLE(masquerade,
-  [  --enable-masquerade[='draft_from[ mmailid[ username_extension]]']
-                          enable 3 types of email address masquerading [none]],
+  [  --enable-masquerade[='draft_from mmailid username_extension']
+                          enable up to 3 types of address masquerading [none]],
   [if test x"$enable_masquerade" = x"yes"; then
     masquerade="draft_from mmailid username_extension"
   else
@@ -63,10 +63,18 @@ if test x"$enable_mhe" != x"no" -a x"$enable_nmh_mhe" != x"no"; then
   AC_DEFINE(MHE)dnl
 fi
 
+dnl Do you want client-side support for pop?
+undefine([pop])dnl
+AC_ARG_ENABLE(pop,
+[  --enable-pop            enable client-side support for pop])
+dnl The old redundant --enable-nmh-pop is deprecated and undocumented.
+if test x"$enable_nmh_pop" = x"yes"; then
+  enable_pop=yes
+fi
+
 dnl Do you want client-side support for apop?
-dnl Note that this appears before pop so that we can enforce enable-pop
 AC_ARG_ENABLE(apop,
-[  --enable-apop            enable client-side support for apop])
+[  --enable-apop           enable client-side support for apop])
 if test x"$enable_apop" = x"yes"; then
   AC_DEFINE(APOP)dnl
   APOPLIB=md5.o
@@ -90,14 +98,7 @@ if test x"$with_krb4" != x -a x"$with_krb4" != x"no"; then
   AC_DEFINE(KPOP_PRINCIPAL, "pop")dnl
 fi
 
-dnl Do you want client-side support for pop?
-undefine([pop])dnl
-AC_ARG_ENABLE(pop,
-[  --enable-pop            enable client-side support for pop])
-dnl The old redundant --enable-nmh-pop is deprecated and undocumented.
-if test x"$enable_nmh_pop" = x"yes"; then
-  enable_pop=yes
-fi
+dnl After we know if we're including apop and kpop support, do pop stuff
 if test x"$enable_pop" = x"yes"; then
   AC_DEFINE(POP)dnl
   POPLIB=popsbr.o
@@ -698,7 +699,7 @@ AC_OUTPUT(Makefile config/Makefile h/Makefile sbr/Makefile uip/Makefile \
           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, \
           [test -z "$CONFIG_HEADERS" || echo > stamp-h])
 
 dnl Umm, what's the point of these assignments??  -- <dan-nmh@dilvish.speed.net>
@@ -713,7 +714,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