X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=configure.in;h=111c53f5bdc37a8653f67081daead1c2d2c87207;hp=814884f4ca35f31c2728a4917f3e2d76cf532cda;hb=d66e48eced59def411e289f040956b1ec3666cb0;hpb=7593f8f93951b6ca853a72bdbcd0a34dc741bc52 diff --git a/configure.in b/configure.in index 814884f..111c53f 100644 --- a/configure.in +++ b/configure.in @@ -31,11 +31,20 @@ dnl -------------------------- dnl CHECK COMMAND LINE OPTIONS 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 @@ -43,44 +52,35 @@ AC_ARG_ENABLE(masquerade, 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 pop]) +dnl The old redundant --enable-nmh-pop is deprecated and undocumented. if test x"$enable_nmh_pop" = x"yes"; then - AC_DEFINE(POP)dnl - POPLIB=popsbr.o - POPSED='/^%nmhbeginpop%/d;/^%nmhendpop%/d' -else - POPSED='/^%nmhbeginpop%/,/^%nmhendpop%/d' + enable_pop=yes fi -AC_SUBST(POPLIB)dnl -AC_SUBST(POPSED)dnl - -dnl What should be the default editor? -undefine([editor])dnl -AC_ARG_WITH(editor, -[ --with-editor=EDITOR specify the default editor]) -if test -n "$with_editor"; then - editorpath="$with_editor" +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, @@ -93,10 +93,31 @@ 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' +else + POPSED='/^%nmhbeginpop%/,/^%nmhendpop%/d' +fi +AC_SUBST(POPLIB)dnl +AC_SUBST(POPSED)dnl + +dnl What should be the default editor? +undefine([editor])dnl +AC_ARG_WITH(editor, +[ --with-editor=EDITOR specify the default editor]) + +if test -n "$with_editor"; then + editorpath="$with_editor" +fi + dnl What method of posting should post use? undefine([mts])dnl AC_ARG_WITH(mts, @@ -151,7 +172,7 @@ dnl ------------------ 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 @@ -162,7 +183,7 @@ dnl if compiler is gcc, then 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 @@ -424,10 +445,6 @@ AC_CHECK_FUNC(modf, , AC_CHECK_LIB(m, modf)) 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]) @@ -682,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?? -- @@ -691,6 +708,22 @@ eval "nmhsysconf=${sysconfdir}"; eval "nmhsysconf2=${nmhsysconf}" eval "nmhlib=${libdir}"; eval "nmhlib2=${nmhlib}" eval "nmhman=${mandir}" +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 -a x"$with_krb4" != x"no"; then + pop_kinds="${pop_kinds} kpop" + fi + if test "$pop_kinds" = "yes (pop"; then + pop_kinds="yes" + else + pop_kinds="${pop_kinds})" + fi +fi + echo " nmh configuration ----------------- @@ -708,5 +741,9 @@ transport system : ${MTS} default smtp servers : ${smtpservers} default editor : ${editorpath} default pager : ${pagerpath} -email address masquerading : ${masquerade}" +email address masquerading : ${masquerade} +pop is enabled : ${pop_kinds}" echo "" + + +