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,
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
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])
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
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 default mail transport agent/service])
if test x"$with_mts" = x"smtp"; then
MTS="smtp"
- MTSLIB="mts/smtp/libsmtp.a"
- AC_DEFINE(SMTPMTS)dnl
elif test x"$with_mts" = x"sendmail"; then
MTS="sendmail"
- MTSLIB="mts/sendmail/libsend.a"
- AC_DEFINE(SENDMTS)dnl
else
MTS="smtp"
- MTSLIB="mts/smtp/libsmtp.a"
- AC_DEFINE(SMTPMTS)dnl
fi
-
AC_SUBST(MTS)dnl
-AC_SUBST(MTSLIB)dnl
+
+dnl Both the smtp and sendmail mail transport services use the smtp code
+AC_DEFINE(SMTPMTS)dnl
dnl What should be the default pager?
undefine([pager])dnl
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
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
pathtmp=/usr/bin:/bin:/usr/local/bin:/usr/xpg4/bin:/usr/ucb
AC_PATH_PROG(cutpath, cut, no, [$pathtmp])
+dnl ----------------------------------------------
+dnl check for lclint, and lint if it doesn't exist
+dnl ----------------------------------------------
+AC_CHECK_PROG(linttmp1, lclint, lclint, no)dnl
+if test x$ac_cv_prog_linttmp1 != xno ; then
+ LINT=$ac_cv_prog_linttmp1
+ LINTFLAGS="-weak +posixlib -macrovarprefixexclude"
+else
+ AC_CHECK_PROG(linttmp2, lint, lint, no)dnl
+ if test x$ac_cv_prog_linttmp2 != xno ; then
+ LINT=$ac_cv_prog_linttmp2
+ LINTFLAGS=""
+ else
+ LINT="echo 'No lint program found'"
+ LINTFLAGS=""
+ fi
+fi
+AC_SUBST(LINT)
+AC_SUBST(LINTFLAGS)
dnl try to figure out which one we've got
AC_CHECK_PROG(LIBTOOL, libtool, libtool, , [$pathtmp])
dnl AC_SUBST(TSORT)dnl
fi
+dnl Check whether tsort can deal with loops
+AC_CACHE_CHECK(whether tsort can deal with loops, nmh_cv_tsort_loop,
+ [if test -z "`echo a b b a | tsort 2>/dev/null | grep a`" ; then
+ nmh_cv_tsort_loop=no
+ else
+ nmh_cv_tsort_loop=yes
+ fi])
+if test x$nmh_cv_tsort_loop = xno ; then
+ LORDER=echo
+ TSORT=cat
+ AC_SUBST(LORDER)dnl
+ AC_SUBST(TSORT)dnl
+fi
+
dnl Look for `ls'
pathtmp=/usr/bin:/bin:/usr/local/bin:/usr/xpg4/bin:/usr/ucb
AC_PATH_PROG(lspath, ls, no, [$pathtmp])
fi])
fi
-dnl ...If it's not, we need to #define MAILGROUP to 1 and make inc setgid.
-if test x"$nmh_cv_mailspool_world_writable" = x"no"; then
+dnl Also, check for liblockfile (as found on Debian systems)
+AC_CHECK_HEADER(lockfile.h, AC_CHECK_LIB(lockfile, lockfile_create) )
+
+dnl and whether its companion program dotlockfile is setgid
+AC_PATH_PROG(dotlockfilepath, dotlockfile, no)
+if test "$ac_cv_lib_lockfile_lockfile_create" != "no" ; then
+ if test "$ac_cv_path_dotlockfilepath" != "no" ; then
+ AC_CACHE_CHECK(whether dotlockfile is setgid, nmh_cv_dotlockfile_setgid,
+ [ if test -g "$ac_cv_path_dotlockfilepath" ; then
+ nmh_cv_dotlockfile_setgid=yes
+ else
+ nmh_cv_dotlockfile_setgid=no
+ fi])
+ fi
+fi
+
+dnl If mailspool is not world-writable and dotlockfile is not setgid,
+dnl we need to #define MAILGROUP to 1 and make inc setgid.
+if test x"$nmh_cv_mailspool_world_writable" = x"no" -a x"$nmh_cv_dotlockfile_setgid" != x"yes" ; then
dnl do we really need both of these?
AC_DEFINE(MAILGROUP)dnl
SETGID_MAIL=1
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)],
done
AC_SUBST(TERMLIB)dnl
-
dnl --------------
dnl CHECK FOR NDBM
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>
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 "
projects / mmh / blobdiff