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,
+[ --enable-debug enable nmh code debugging])
+dnl The old redundant --enable-nmh-debug is deprecated and undocumented.
+if test x"$enable_nmh_debug" = x"yes"; then
+ enable_debug=yes
+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
fi])
AC_SUBST(masquerade)dnl
-dnl Do you want to debug nmh?
-undefine([nmh-debug])dnl
-AC_ARG_ENABLE(nmh-debug,
-[ --enable-nmh-debug enable nmh code debugging])
-
dnl Do you want mhe support?
-undefine([nmh-mhe])dnl
-AC_ARG_ENABLE(nmh-mhe,
-[ --enable-nmh-mhe enable mhe support (DEFAULT)])
+undefine([mhe])dnl
+AC_ARG_ENABLE(mhe,
+[ --enable-mhe enable mhe support (DEFAULT)])
-dnl mhe support is on by default, so define it unless
-dnl explicitly disabled.
-if test x$"enable_nmh_mhe" != x"no"; then
+dnl mhe support is on by default, so define it unless --disable-mhe or the
+dnl deprecated, undocumented --disable-nmh-mhe are specified.
+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([nmh-pop])dnl
-AC_ARG_ENABLE(nmh-pop,
-[ --enable-nmh-pop enable client-side support for pop])
+dnl Do you want client-side support for pop?
+undefine([pop])dnl
+AC_ARG_ENABLE(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 support for hesiod
+AC_ARG_WITH(hesiod,
+[ --with-hesiod=PREFIX specify location of Hesiod])
+if test x"$with_hesiod" != x -a x"$with_hesiod" != x"no"; then
+ AC_DEFINE(HESIOD)dnl
+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])
+if test x"$with_krb4" != x -a x"$with_krb4" != x"no"; then
+ enable_pop=yes
+ AC_DEFINE(KPOP)dnl
+ AC_DEFINE(KPOP_PRINCIPAL, "pop")dnl
+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
POPSED='/^%nmhbeginpop%/d;/^%nmhendpop%/d'
editorpath="$with_editor"
fi
-dnl Do you want support for hesiod
-AC_ARG_WITH(hesiod,
-[ --with-hesiod=PREFIX specify location of Hesiod])
-if test x"$with_hesiod" != x -a x"$with_hesiod" != x"no"; then
- AC_DEFINE(HESIOD)dnl
-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])
-if test x"$with_krb4" != x -a x"$with_krb4" != x"no"; then
- AC_DEFINE(KPOP)dnl
- AC_DEFINE(KPOP_PRINCIPAL, "pop")dnl
-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"
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
dnl We want these before the checks,
dnl so the checks can modify their values.
test -z "$CFLAGS" && CFLAGS= auto_cflags=1
-if test x"$enable_nmh_debug" = x"yes"; then
+if test x"$enable_debug" = x"yes"; then
test -z "$LDFLAGS" && LDFLAGS=-g
fi
dnl use -O2 and some warning flags
dnl else use -O
if test -n "$auto_cflags"; then
- if test x"$enable_nmh_debug" = x"yes"; then
+ if test x"$enable_debug" = x"yes"; then
if test -n "$GCC"; then
test -z "$CFLAGS" && CFLAGS="-Wall -g" || CFLAGS="$CFLAGS -Wall -g"
else
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
dnl Checks for network libraries (nsl, socket)
AC_CHECK_NETLIBS
-dnl Check for bug in libraries such that ruserpass
-dnl needs to be linked as _ruserpass.
-AC_CHECK_RUSERPASS
-
termcap_curses_order="termcap curses ncurses"
for lib in $termcap_curses_order; do
AC_CHECK_LIB(${lib}, tgetent, [TERMLIB="-l$lib"; break])
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, \
+ 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>
eval "nmhlib=${libdir}"; eval "nmhlib2=${nmhlib}"
eval "nmhman=${mandir}"
+pop_kinds=no
+if test x"$enable_pop" = x"yes"; then
+ 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 "
nmh configuration
-----------------
default smtp servers : ${smtpservers}
default editor : ${editorpath}
default pager : ${pagerpath}
-email address masquerading : ${masquerade}"
+email address masquerading : ${masquerade}
+pop is enabled : ${pop_kinds}"
echo ""
+
+
+