X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=configure.in;h=7929547d2fcb90d5be1b1b989d305e5f8fe82d81;hp=e008945151d541254708ec99af6188e44423233a;hb=e5800b52263f682f4383d0c88872febb9cf76085;hpb=13d2614380f499b1e5a1cc3546230239afe2b1dd

diff --git a/configure.in b/configure.in
index e008945..7929547 100644
--- a/configure.in
+++ b/configure.in
@@ -31,6 +31,16 @@ dnl --------------------------
 dnl CHECK COMMAND LINE OPTIONS
 dnl --------------------------
 
+dnl Do you want client-side support for apop?
+AC_ARG_ENABLE(apop,
+[  --enable-apop           enable client-side support for POP3 and APOP])
+if test x"$enable_apop" = x"yes"; then
+  AC_DEFINE(APOP)dnl
+  APOPLIB=md5.o
+  enable_pop=yes
+fi
+AC_SUBST(APOPLIB)dnl
+
 dnl Do you want to debug nmh?
 undefine([debug])dnl
 AC_ARG_ENABLE(debug,
@@ -44,7 +54,7 @@ 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 up to 3 types of address masquerading [none]],
   [if test x"$enable_masquerade" = x"yes"; then
     masquerade="draft_from mmailid username_extension"
   else
@@ -66,22 +76,12 @@ 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])
+[  --enable-pop            enable client-side support for plain POP3])
 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?
-AC_ARG_ENABLE(apop,
-[  --enable-apop           enable client-side support for apop])
-if test x"$enable_apop" = x"yes"; then
-  AC_DEFINE(APOP)dnl
-  APOPLIB=md5.o
-  enable_pop=yes
-fi
-AC_SUBST(APOPLIB)dnl
-
 dnl Do you want support for hesiod
 AC_ARG_WITH(hesiod,
 [  --with-hesiod=PREFIX    specify location of Hesiod])
@@ -91,7 +91,7 @@ fi
 
 dnl Do you want client-side support for kpop
 AC_ARG_WITH(krb4,
-[  --with-krb4=PREFIX      specify location of Kerberos V4 for kpop support])
+[  --with-krb4=PREFIX      specify location of Kerberos V4 for KPOP support])
 if test x"$with_krb4" != x -a x"$with_krb4" != x"no"; then
   enable_pop=yes
   AC_DEFINE(KPOP)dnl
@@ -121,7 +121,7 @@ fi
 dnl What method of posting should post use?
 undefine([mts])dnl
 AC_ARG_WITH(mts,
-[  --with-mts=MTS          specify the mail transport agent])
+[  --with-mts=MTS          specify the mail transport agent/service])
 
 if test x"$with_mts" = x"smtp"; then
   MTS="smtp"
@@ -153,7 +153,7 @@ dnl What should be the default mail server(s)?
 undefine([smtpservers])dnl
 AC_ARG_WITH(smtpservers,
 [  --with-smtpservers='SMTPSERVER1[ SMTPSERVER2...]'
-                          specify the default smtp server(s) [localhost]])
+                          specify the default SMTP server(s) [localhost]])
 if test -n "$with_smtpservers"; then
   smtpservers="$with_smtpservers"
 else
@@ -192,7 +192,7 @@ if test -n "$auto_cflags"; then
   else
     test -z "$LDFLAGS" && LDFLAGS=-s
     if test -n "$GCC"; then
-      test -z "$CFLAGS" && CFLAGS=-O2 || CFLAGS="$CFLAGS -O2"
+      test -z "$CFLAGS" && CFLAGS="-Wall -O2" || CFLAGS="$CFLAGS -Wall -O2"
     else
       test -z "$CFLAGS" && CFLAGS=-O  || CFLAGS="$CFLAGS -O"
     fi
@@ -403,7 +403,7 @@ AC_FUNC_VFORK
 AC_CHECK_LIB(mkstemp,mkstemp)
 AC_CHECK_FUNCS(waitpid wait3 sigaction sigprocmask sigblock sigsetmask \
                sighold sigrelse writev lstat uname tzset killpg mkstemp \
-               sethostent)
+               sethostent getutent)
 
 dnl solaris screws this up
 AC_CHECK_FUNC(gethostbyname, [AC_DEFINE(HAVE_GETHOSTBYNAME)],
@@ -696,10 +696,10 @@ dnl ----------------
 dnl OUTPUT MAKEFILES
 dnl ----------------
 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, \
+          zotnet/Makefile zotnet/mts/Makefile \
+          mts/Makefile mts/smtp/Makefile \
+	  mts/sendmail/Makefile mts/mmdf/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>
@@ -708,20 +708,19 @@ eval "nmhsysconf=${sysconfdir}"; eval "nmhsysconf2=${nmhsysconf}"
 eval "nmhlib=${libdir}";         eval "nmhlib2=${nmhlib}"
 eval "nmhman=${mandir}"
 
-pop_kinds="no"
+pop_kinds=no
 if test x"$enable_pop" = x"yes"; then
-        pop_kinds="yes (pop"
-        if test x"$enable_apop" = x"yes"; then
-                pop_kinds="${pop_kinds} apop"
-        fi
-        if test x"$with_krb4" = x"yes"; then
-                pop_kinds="${pop_kinds} kpop"
-        fi
-        if test "$pop_kinds" = "yes (pop"; then
-                pop_kinds="yes"
-        else
-                pop_kinds="${pop_kinds})"
-        fi
+  pop_kinds="yes ("
+
+  if test x"$enable_apop" = x"yes"; then
+    pop_kinds="${pop_kinds}APOP "
+  fi
+
+  if test x"$with_krb4" != x -a x"$with_krb4" != x"no"; then
+    pop_kinds="${pop_kinds}KPOP "
+  fi
+
+  pop_kinds="${pop_kinds}POP3)"
 fi
 
 echo "