X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=configure.ac;h=c3ebacf08d60cbad6637bc8431b8abe72626137c;hb=e69044f7624abe5cb2cb796d528c0cc5f29515f7;hp=9abe1b5913a7467b9435cab1de489a80f2905b83;hpb=23a50c38aa582542f8cf3ef928396faad89cbae7;p=mmh diff --git a/configure.ac b/configure.ac index 9abe1b5..c3ebacf 100644 --- a/configure.ac +++ b/configure.ac @@ -3,135 +3,80 @@ dnl configure.ac -- autoconf template for nmh dnl dnl Move this up a bit -AC_PREREQ(2.61) +AC_PREREQ([2.61]) -AC_INIT(nmh, m4_normalize(m4_include([VERSION]))) -AC_CONFIG_SRCDIR(h/nmh.h) -AC_CONFIG_HEADER(config.h) +AC_INIT([nmh], m4_normalize(m4_include([VERSION])), [nmh-workers@nongnu.org]) +AC_CONFIG_SRCDIR([h/nmh.h]) +AC_CONFIG_HEADER([config.h]) +AM_INIT_AUTOMAKE([-Wall foreign subdir-objects]) -AC_CANONICAL_TARGET +AC_CANONICAL_HOST -dnl --------------------- -dnl define a macro or two -dnl --------------------- - -AC_DEFUN(NMH_PROG_GNU_LIBTOOL, [ -if test -n "$LIBTOOL" ; then - tmptest=`$LIBTOOL --version 2>&1 | grep GNU` - if test x"$tmptest" != x ; then - GNU_LIBTOOL=1 - AC_SUBST(GNU_LIBTOOL)dnl - fi -fi -] ) - -echo "configuring for AC_PACKAGE_NAME-AC_PACKAGE_VERSION" +AC_MSG_NOTICE([configuring for AC_PACKAGE_NAME-AC_PACKAGE_VERSION]) AC_SUBST(VERSION,AC_PACKAGE_VERSION)dnl dnl What date of nmh are we building? DATE=`cat ${srcdir}/DATE` -echo "configuring for nmh dated $DATE" -AC_SUBST(DATE)dnl +AC_MSG_NOTICE([configuring for nmh dated $DATE]) +AC_SUBST([DATE])dnl dnl -------------------------- dnl CHECK COMMAND LINE OPTIONS dnl -------------------------- dnl Do you want to debug nmh? -AC_ARG_ENABLE(debug, +AC_ARG_ENABLE([debug], AS_HELP_STRING([--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? -AC_ARG_ENABLE(masquerade, - AS_HELP_STRING([--enable-masquerade='draft_from mmailid username_extension'], - [enable up to 3 types of address masquerading]), - [if test x"$enable_masquerade" = x"yes"; then - masquerade="draft_from mmailid username_extension" - else - masquerade="$enable_masquerade" - fi], [masquerade="draft_from mmailid username_extension"]) -AC_SUBST(masquerade)dnl - -dnl Do you want client-side support for pop? -AC_ARG_ENABLE(pop, - AS_HELP_STRING([--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 +AS_IF([test x"$enable_nmh_debug" = x"yes"], [enable_debug=yes]) dnl Do you want to disable use of locale functions AH_TEMPLATE([LOCALE], [Undefine if you don't want locale features. By default this is defined.]) AC_ARG_ENABLE([locale], -AC_HELP_STRING([--disable-locale], [turn off locale features]), -[if test x$enableval = xyes; then - AC_DEFINE(LOCALE) -fi], -AC_DEFINE(LOCALE) -) + [AS_HELP_STRING([--disable-locale], [turn off locale features])], + [AS_IF([test x$enableval = xyes], [AC_DEFINE(LOCALE)])], + [AC_DEFINE(LOCALE)]) dnl Do you want client-side support for using SASL for authentication? dnl Note that this code will be enabled for both POP and SMTP -AC_ARG_WITH(cyrus-sasl, AS_HELP_STRING([--with-cyrus-sasl], +AC_ARG_WITH([cyrus-sasl], AS_HELP_STRING([--with-cyrus-sasl], [Enable SASL support via the Cyrus SASL library])) -if test x"$with_cyrus_sasl" != x -a x"$with_cyrus_sasl" != x"no"; then - AC_DEFINE(CYRUS_SASL, 1, - [Define to use the Cyrus SASL library for authentication of POP and SMTP.])dnl - if test x"$with_cyrus_sasl" != xyes; then - AC_MSG_WARN([Arguments to --with-cyrus-sasl now ignored]) - AC_MSG_WARN([Please pass the appropriate arguments to CPPFLAGS/LDFLAGS]) - fi - sasl_support=yes -else - sasl_support=no -fi +AS_IF([test x"$with_cyrus_sasl" != x -a x"$with_cyrus_sasl" != x"no"],[ + AC_DEFINE([CYRUS_SASL], [1], + [Define to use the Cyrus SASL library for authentication of POP and SMTP.])dnl + AS_IF([test x"$with_cyrus_sasl" != xyes],[ + AC_MSG_WARN([Arguments to --with-cyrus-sasl now ignored]) + AC_MSG_WARN([Please pass the appropriate arguments to CPPFLAGS/LDFLAGS])]) + sasl_support=yes], [sasl_support=no]) dnl Do you want client-side support for encryption with TLS? -AC_ARG_WITH(tls, AS_HELP_STRING([--with-tls], [Enable TLS support])) -if test x"$with_tls" != x -a x"$with_tls" != x"no"; then - AC_DEFINE(TLS_SUPPORT, 1, [Support TLS for session encryption.])dnl - tls_support=yes -else - tls_support=no -fi +AC_ARG_WITH([tls], AS_HELP_STRING([--with-tls], [Enable TLS support])) +AS_IF([test x"$with_tls" != x -a x"$with_tls" != x"no"],[ + AC_DEFINE([TLS_SUPPORT], [1], [Support TLS for session encryption.])dnl + tls_support=yes],[tls_support=no]) dnl What should be the default editor? -AC_ARG_WITH(editor, +AC_ARG_WITH([editor], AS_HELP_STRING([--with-editor=EDITOR],[specify the default editor])) -if test -n "$with_editor"; then - editorpath="$with_editor" -fi +AS_IF([test -n "$with_editor"], [editorpath="$with_editor"]) dnl Set the backup prefix AC_ARG_WITH([hash-backup], AS_HELP_STRING([--with-hash-backup],[use # as the backup prefix (default: ,)])) -if test x"$with_hash_backup" != x -a x"$with_hash_backup" != x"no"; then - backup_prefix="#" -else - backup_prefix="," -fi -AC_DEFINE_UNQUOTED(BACKUP_PREFIX, "$backup_prefix", +AS_IF([test x"$with_hash_backup" != x -a x"$with_hash_backup" != x"no"], + [backup_prefix="#"], [backup_prefix=","]) +AC_DEFINE_UNQUOTED([BACKUP_PREFIX], "$backup_prefix", [The prefix that is prepended to the name of message files when they are "removed" by rmm. This should typically be `,' or `#'.])dnl -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, 1, - [Define this to compile client-side support for pop into inc and msgchk.])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 method of locking to use? +AS_CASE(["$host_os"], + [aix*|cygwin*|linux*], + [default_locktype="fcntl"; default_locking=FCNTL_LOCKING], + [freebsd*|openbsd*|darwin*], [default_locktype="flock"; default_locking=FLOCK_LOCKING], + [default_locktype="dot"; default_locking=DOT_LOCKING]) + AC_ARG_WITH(locking, AS_HELP_STRING([--with-locking=@<:@dot|fcntl|flock|lockf@:>@], [specify the file locking method])) @@ -149,13 +94,13 @@ elif test x"$with_locking" = x"fcntl"; then LOCKTYPE="fcntl" AC_DEFINE(FCNTL_LOCKING, 1, [Define to use fnctl() based locking.])dnl else - LOCKTYPE="dot" - AC_DEFINE(DOT_LOCKING)dnl + LOCKTYPE="$default_locktype" + AC_DEFINE_UNQUOTED($default_locking, 1)dnl fi dnl Should we use a locking directory? -AC_ARG_ENABLE([lockdir], [ - AS_HELP_STRING([--enable-lockdir=dir], [Store dot-lock files in "dir"])], [ +AC_ARG_ENABLE([lockdir], + [AS_HELP_STRING([--enable-lockdir=dir], [Store dot-lock files in "dir"])], [ AS_IF([test "x$enableval" = xyes],[ AC_MSG_ERROR([--enable-lockdir requires an argument])]) AS_IF([test "x$LOCKTYPE" != xdot],[ @@ -165,46 +110,44 @@ AC_ARG_ENABLE([lockdir], [ ]) dnl What method of posting should post use? -AC_ARG_WITH(mts, - AS_HELP_STRING([--with-mts=@<:@smtp|sendmail@:>@], +AC_ARG_WITH([mts], + AS_HELP_STRING([--with-mts=@<:@smtp|sendmail/smtp|sendmail/pipe@:>@], [specify the default mail transport agent/service])) -if test x"$with_mts" = x"smtp"; then - MTS="smtp" -elif test x"$with_mts" = x"sendmail"; then - MTS="sendmail" -else - MTS="smtp" -fi -AC_SUBST(MTS)dnl - -dnl Both the smtp and sendmail mail transport services use the smtp code -AC_DEFINE(SMTPMTS, 1, - [Define if you want SMTP (simple mail transport protocol) support.])dnl +AS_IF([test x"$with_mts" = x"smtp"], [MTS="smtp"], + [test x"$with_mts" = x"sendmail"], [MTS="sendmail/smtp"], + [test x"$with_mts" = x"sendmail/smtp"], [MTS="sendmail/smtp"], + [test x"$with_mts" = x"sendmail/pipe"], [MTS="sendmail/pipe"], + [MTS="smtp"]) +AC_SUBST([MTS])dnl dnl What should be the default pager? -AC_ARG_WITH(pager, +AC_ARG_WITH([pager], AS_HELP_STRING([--with-pager=PAGER],[specify the default pager])) -if test -n "$with_pager"; then - pagerpath="$with_pager" +AS_IF([test -n "$with_pager"], [pagerpath="$with_pager"]) + +dnl If a pager is not explicitly specified, then look for one. +dnl Fall back to `cat', to avoid catastrophic failure of +dnl `mhshow', et al., if pagerpath is set to `no'. +if test -z "$pagerpath"; then + pathtmp=/usr/bin:/bin:/usr/ucb:/usr/local/bin + AC_PATH_PROGS([pagerpath], [more less most cat], [no], [$pathtmp]) fi +AC_SUBST(pagerpath)dnl dnl What should be the default mail server(s)? AC_ARG_WITH(smtpservers, AS_HELP_STRING([--with-smtpservers='SMTPSERVER1@<:@ SMTPSERVER2...@:>@'], [specify the default SMTP server(s) @<:@localhost@:>@])) -if test -n "$with_smtpservers"; then - smtpservers="$with_smtpservers" -else - smtpservers="localhost" -fi -AC_SUBST(smtpservers)dnl +AS_IF([test -n "$with_smtpservers"], [smtpservers="$with_smtpservers"], + [smtpservers="localhost"]) +AC_SUBST([smtpservers])dnl dnl ---------------------------------------------------- dnl Default location is /usr/local/nmh/{bin,etc,lib,man} dnl ---------------------------------------------------- -AC_PREFIX_DEFAULT(/usr/local/nmh) +AC_PREFIX_DEFAULT([/usr/local/nmh]) dnl ------------------ dnl CHECK THE COMPILER @@ -217,47 +160,92 @@ if test x"$enable_debug" = x"yes"; then fi AC_PROG_CC +AM_PROG_CC_C_O -AC_SUBST(EXEEXT)dnl - -AC_CACHE_CHECK(whether preprocessor supports -Wunused-macros, - nmh_cv_has_unusedmacros, +AC_CACHE_CHECK([whether preprocessor supports -Wunused-macros], + [nmh_cv_has_unusedmacros], [nmh_saved_cppflags="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -Wunused-macros -Wno-unused-macros" AC_TRY_COMPILE([],[],nmh_cv_has_unusedmacros=yes,nmh_cv_has_unusedmacros=no) CPPFLAGS="$nmh_saved_cppflags"]) if test "$nmh_cv_has_unusedmacros" = 'yes'; then - test -z "$CPPLAGS" && CPPFLAGS=-Wunused-macros \ + test -z "$CPPFLAGS" && CPPFLAGS=-Wunused-macros \ || CPPFLAGS="$CPPFLAGS -Wunused-macros" DISABLE_UNUSED_MACROS_WARNING=-Wno-unused-macros fi AC_SUBST(DISABLE_UNUSED_MACROS_WARNING)dnl -AC_CACHE_CHECK(whether compiler supports -Wextra, nmh_cv_wextra, +AC_CACHE_CHECK([whether compiler supports -Wno-sign-compare], + [nmh_cv_has_nosigncompare], + [nmh_saved_cppflags="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -Wno-sign-compare" + AC_TRY_COMPILE([],[],nmh_cv_has_nosigncompare=yes, + nmh_cv_has_nosigncompare=no) + CPPFLAGS="$nmh_saved_cppflags"]) + +if test "$nmh_cv_has_nosigncompare" = 'yes'; then + DISABLE_SIGN_COMPARE_WARNING=-Wno-sign-compare +fi +AC_SUBST(DISABLE_SIGN_COMPARE_WARNING)dnl + +AC_CACHE_CHECK([whether compiler supports -Wextra], [nmh_cv_has_wextra], [nmh_saved_cflags="$CFLAGS" - CFLAGS="$CFLAGS -Wextra" - AC_TRY_COMPILE([],[],nmh_cv_wextra=' -Wextra',echo -n no) + CFLAGS="$CFLAGS -Wextra -Wno-clobbered" + AC_TRY_COMPILE([],[],nmh_cv_has_wextra=yes,nmh_cv_has_wextra=no) CFLAGS="$nmh_saved_cflags"]) -AC_CACHE_CHECK(whether compiler supports -Wno-pointer-sign, nmh_cv_has_noptrsign, +AC_CACHE_CHECK([whether compiler supports -Wno-pointer-sign], [nmh_cv_has_noptrsign], [nmh_saved_cflags="$CFLAGS" CFLAGS="$CFLAGS -Wno-pointer-sign" AC_TRY_COMPILE([],[],nmh_cv_has_noptrsign=yes,nmh_cv_has_noptrsign=no) CFLAGS="$nmh_saved_cflags"]) +dnl Can't use -ansi with gcc 4.5.3 on Cygwin, at least through setup +dnl setup version 2.763, because it disables some features in the +dnl system system header files and warns about them with -Wall. Try +dnl to test for that generally, though still with gcc. +if test "$GCC" = yes; then + AC_CACHE_CHECK([whether we can use -ansi with gcc], [nmh_cv_has_dash_ansi], + [nmh_saved_cppflags="$CPPFLAGS" + nmh_saved_cflags="$CFLAGS" + CPPFLAGS="-D_GNU_SOURCE" + CFLAGS="-ansi -Wall -Werror" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ],[tzset();])], + [nmh_cv_has_dash_ansi=yes], + [nmh_cv_has_dash_ansi=no]) + CPPFLAGS="$nmh_saved_cppflags" + CFLAGS="$nmh_saved_cflags"]) +else + nmh_cv_has_dash_ansi=no +fi + dnl if the user hasn't specified CFLAGS, then dnl if compiler is gcc, then -dnl use -O2 and some warning flags +dnl use -O2 and some warning flags dnl else use -O dnl We use -Wall and -Wextra if supported. If the compiler supports it we dnl also use -Wno-pointer-sign, because gcc 4 now produces a lot of new dnl warnings which are probably mostly spurious and which in any case we dnl don't want to deal with now. if test "$nmh_cv_has_noptrsign" = "yes"; then - nmh_gcc_warnflags="-Wall$nmh_cv_wextra -Wno-pointer-sign" + if test "$nmh_cv_has_dash_ansi" = "yes"; then + nmh_gcc_common_flags="-ansi -pedantic -Wall" + else + nmh_gcc_common_flags="-Wall" + fi + if test "$nmh_cv_has_wextra" = "yes"; then + nmh_gcc_warnflags="${nmh_gcc_common_flags} -Wextra -Wno-clobbered "\ +"-Wno-pointer-sign" + else + nmh_gcc_warnflags="${nmh_gcc_common_flags} -Wno-pointer-sign" + fi else - nmh_gcc_warnflags="-Wall$nmh_cv_wextra" + if test "$nmh_cv_has_wextra" = "yes"; then + nmh_gcc_warnflags="${nmh_gcc_common_flags} -Wextra -Wno-clobbered" + else + nmh_gcc_warnflags="${nmh_gcc_common_flags}" + fi fi if test -n "$auto_cflags"; then @@ -295,11 +283,22 @@ AC_PROG_MAKE_SET dnl Does make define $MAKE AC_PROG_INSTALL dnl Check for BSD compatible `install' AC_PROG_RANLIB dnl Check for `ranlib' AC_PROG_AWK dnl Check for mawk,gawk,nawk, then awk +AC_PROG_SED dnl Check for Posix-compliant sed AC_PROG_LEX dnl Check for lex/flex dnl Look for `cut' pathtmp=/usr/bin:/bin:/usr/local/bin:/usr/xpg4/bin:/usr/ucb -AC_PATH_PROG(cutpath, cut, no, [$pathtmp]) +AC_PATH_PROG([cutpath], [cut], [no], [$pathtmp]) + +dnl +dnl Check for MD5 program and formatting command +dnl +AC_CHECK_PROGS([MD5SUM], [md5sum md5], [missing]) +AS_CASE(["${MD5SUM}"], + [md5sum], [MD5FMT="cat"], + [md5], [[MD5FMT="${SED} -e 's/MD5 *(\(.*\)) *= \([0-9a-f]*\)/\2 \1/'"]], + [MD5FMT="missing"]) +AC_SUBST([MD5FMT]) dnl ---------------------------------------------- dnl check for lclint, and lint if it doesn't exist @@ -318,53 +317,17 @@ else LINTFLAGS="" fi fi -AC_SUBST(LINT)dnl -AC_SUBST(LINTFLAGS)dnl - -dnl try to figure out which one we've got -AC_CHECK_PROG(LIBTOOL, libtool, libtool, , [$pathtmp]) -NMH_PROG_GNU_LIBTOOL - -dnl Check for lorder and tsort commands -AC_CHECK_PROG(LORDER, lorder, lorder, no)dnl -AC_CHECK_PROG(TSORT, tsort, tsort, no)dnl - -dnl If either doesn't exist, replace them with echo and cat -if test x$ac_cv_prog_LORDER != xlorder -o x$ac_cv_prog_TSORT != xtsort; then - LORDER=echo - TSORT=cat - AC_SUBST(LORDER)dnl - AC_SUBST(TSORT)dnl -dnl Mac OS X has lorder, but sh is too broken for it to work -dnl elif test -z "`lorder config/config.c 2>&1 | grep config/config.c`" ; then -dnl LORDER=echo -dnl TSORT=cat -dnl AC_SUBST(LORDER)dnl -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 +AC_SUBST([LINT])dnl +AC_SUBST([LINTFLAGS])dnl dnl Look for `ls' pathtmp=/usr/bin:/bin:/usr/local/bin:/usr/xpg4/bin:/usr/ucb -AC_PATH_PROG(lspath, ls, no, [$pathtmp]) +AC_PATH_PROG([lspath], [ls], [no], [$pathtmp]) dnl See how we get ls to display the owner and the group if test "$lspath" != "no"; then - AC_CACHE_CHECK(how to get ls to show us the group ownership of a file, - nmh_cv_ls_grpopt, + AC_CACHE_CHECK([how to get ls to show us the group ownership of a file], + [nmh_cv_ls_grpopt], [if test x"`$lspath -dl / | $AWK '{print $9}'`" = x"/"; then dnl There were 9 parameters, so unless this is a really bizarre, nonstandard dnl ls, it would seem -l gave us both the user and group. On this type of @@ -376,31 +339,25 @@ if test "$lspath" != "no"; then fi]) fi -dnl Look for `more' -pathtmp=/usr/bin:/bin:/usr/ucb:/usr/local/bin -AC_PATH_PROG(morepath, more, no, [$pathtmp]) - -dnl If pager is not specified yet, -dnl then use `more' as the default. -if test -z "$pagerpath"; then - pagerpath="$morepath" -fi -AC_SUBST(pagerpath)dnl - dnl Look for `sendmail' pathtmp=/usr/lib:/usr/sbin:/usr/etc:/usr/ucblib:/usr/bin:/bin -AC_PATH_PROG(sendmailpath, sendmail, /usr/sbin/sendmail, [$pathtmp]) +AC_PATH_PROG([sendmailpath], [sendmail], [/usr/sbin/sendmail], [$pathtmp]) dnl Look for `vi' pathtmp=/usr/bin:/bin:/usr/ucb:/usr/local/bin -AC_PATH_PROG(vipath, vi, /bin/vi, [$pathtmp]) +AC_PATH_PROG([vipath], [vi], [/bin/vi], [$pathtmp]) dnl If editor is not specified yet, dnl then use `vi' as the default. -if test -z "$editorpath"; then - editorpath="$vipath" -fi -AC_SUBST(editorpath)dnl +AS_IF([test -z "$editorpath"], [editorpath="$vipath"]) +AC_SUBST([editorpath])dnl + +dnl Cygwin FAT filesystems do not support hard links. So default to +dnl cp instead, even if running on an NTFS or other filesystem. +AS_CASE(["$host_os"], + [cygwin*],[LN=cp], + [LN=ln]) +AC_SUBST([LN]) dnl ---------------------------------------------------------- dnl FIND MAIL SPOOL AND SEE IF WE NEED TO MAKE inc SETGID MAIL @@ -416,7 +373,7 @@ done nmh_cv_mailspool=$mailspool ]) mailspool=$nmh_cv_mailspool -AC_SUBST(mailspool)dnl +AC_SUBST([mailspool])dnl dnl See whether the mail spool directory is world-writable. if test "$lspath" != "no" -a "$cutpath" != "no"; then @@ -430,7 +387,7 @@ if test "$lspath" != "no" -a "$cutpath" != "no"; then fi dnl Also, check for liblockfile (as found on Debian systems) -AC_CHECK_HEADER(lockfile.h, AC_CHECK_LIB(lockfile, lockfile_create) ) +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) @@ -445,6 +402,12 @@ if test "$ac_cv_lib_lockfile_lockfile_create" != "no" ; then fi fi +dnl Provide a way for distcheck to disable setgid_mail via +dnl DISTCHECK_CONFIGURE_FLAGS. +if test x"$DISABLE_SETGID_MAIL" != x -a x"$DISABLE_SETGID_MAIL" != x0; then + nmh_cv_dotlockfile_setgid=yes +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"$LOCKTYPE" = x"dot" -a x"$nmh_cv_mailspool_world_writable" = x"no" -a x"$nmh_cv_dotlockfile_setgid" != x"yes" ; then @@ -476,20 +439,17 @@ dnl because it must be set before any system header is included and there's no dnl portable way to make sure that files generated by lex include config.h dnl before system header files. -case "$target_os" in - linux*) - # Like DEFS, but doesn't get stomped on by configure when using config.h: - test -z "$OURDEFS" && OURDEFS="-D_GNU_SOURCE" \ - || OURDEFS="$OURDEFS -D_GNU_SOURCE" - ;; -esac -AC_SUBST(OURDEFS) +AS_CASE(["$host_os"], + [linux*], + [# Like DEFS, but doesn't get stomped on by configure when using config.h: + AS_IF([test -z "$CPPFLAGS"],[CPPFLAGS="-D_GNU_SOURCE"], + [CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"])]) AC_HEADER_STDC AC_HEADER_TIOCGWINSZ -AC_CHECK_HEADERS(errno.h fcntl.h crypt.h ncurses/termcap.h termcap.h \ - langinfo.h wchar.h wctype.h iconv.h netdb.h \ - sys/param.h sys/time.h sys/stream.h) +AC_CHECK_HEADERS([errno.h fcntl.h crypt.h ncurses/termcap.h termcap.h \ + langinfo.h wchar.h wctype.h iconv.h netdb.h \ + sys/param.h sys/time.h sys/stream.h]) dnl dnl Checks for _IO_write_ptr. A Linuxism used by nmh on linux. We @@ -510,29 +470,39 @@ AC_CHECK_HEADER([sys/ptem.h], AC_DEFINE(WINSIZE_IN_PTEM,1, dnl --------------- dnl CHECK FUNCTIONS dnl --------------- -AC_CHECK_FUNCS(writev lstat getutent nl_langinfo) +AC_CHECK_FUNCS([wcwidth mbtowc writev lstat nl_langinfo getutxent]) dnl Check for multibyte character set support -if test "x$ac_cv_header_wchar_h" = "xyes" -a "x$ac_cv_header_wctype_h" = "xyes" \ - -a "x$ac_cv_func_wcwidth" = "xyes" -a "x$ac_cv_func_mbtowc" = "xyes"; then - AC_DEFINE(MULTIBYTE_SUPPORT, 1, - [Define to enable support for multibyte character sets.]) -fi +AS_IF([test "x$ac_cv_header_wchar_h" = "xyes" -a \ + "x$ac_cv_header_wctype_h" = "xyes" -a \ + "x$ac_cv_func_wcwidth" = "xyes" -a \ + "x$ac_cv_func_mbtowc" = "xyes"], + [AC_DEFINE([MULTIBYTE_SUPPORT], [1], + [Define to enable support for multibyte character sets.]) + MULTIBYTE_ENABLED=1], + [MULTIBYTE_ENABLED=0]) +AC_SUBST([MULTIBYTE_ENABLED]) dnl ------------------- dnl CHECK FOR LIBRARIES dnl ------------------- dnl Check location of modf -AC_CHECK_FUNC(modf, , AC_CHECK_LIB(m, modf)) +AC_CHECK_FUNC([modf], , AC_CHECK_LIB([m], [modf])) dnl Checks for network libraries (nsl, socket) -AC_CHECK_NETLIBS +NMH_CHECK_NETLIBS + +NMH_READLINE termcap_curses_order="termcap curses ncurses" for lib in $termcap_curses_order; do AC_CHECK_LIB(${lib}, tgetent, [TERMLIB="-l$lib"; break]) done -AC_SUBST(TERMLIB)dnl +AC_SUBST([TERMLIB])dnl +AS_IF([test "x$TERMLIB" = "x"], + [AC_MSG_FAILURE([Could not find tgetent in any library. Is there a curses +or ncurses library or package that you can install?])]) + dnl --------------- dnl CHECK FOR ICONV @@ -547,7 +517,7 @@ if test "x$ac_cv_header_iconv_h" = "xyes"; then AC_CHECK_LIB(iconv, libiconv, ac_found_iconv=yes) fi if test "x$ac_found_iconv" != "xno"; then - LIBS="-liconv $LIBS" + ICONVLIB="-liconv" fi else dnl Handle case where there is a native iconv but iconv.h is from libiconv @@ -557,8 +527,9 @@ if test "x$ac_cv_header_iconv_h" = "xyes"; then fi fi if test "x$ac_found_iconv" = xyes; then - AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.]) + AC_DEFINE([HAVE_ICONV], [1], [Define if you have the iconv() function.]) fi +AC_SUBST([ICONVLIB]) dnl Check if iconv uses const in prototype declaration if test "x$ac_found_iconv" = "xyes"; then @@ -639,7 +610,7 @@ else else NDBM_LIBS= fi - AC_SUBST(NDBM_LIBS) + AC_SUBST([NDBM_LIBS]) fi dnl ------------------ @@ -652,7 +623,7 @@ AC_ARG_WITH(rpmdir, AS_HELP_STRING([--with-rpmdir=RPMDIR], [RPM build directory @<:@RPM@:>@])) AS_IF([test x"$with_rpmdir" = x], [rpmdir='$(abs_srcdir)/RPM'; nmhrpm=./RPM], [rpmdir="$with_rpmdir"; eval "nmhrpm=${rpmdir}"]) -AC_SUBST(rpmdir) +AC_SUBST([rpmdir]) dnl -------------------- @@ -661,8 +632,9 @@ dnl -------------------- AS_IF([test x"$sasl_support" = x"yes"],[ AC_CHECK_HEADER([sasl/sasl.h], , [AC_MSG_ERROR([sasl.h not found])]) - AC_CHECK_LIB([sasl2], [sasl_client_new], , - [AC_MSG_ERROR([Cyrus SASL library not found])])]) + AC_CHECK_LIB([sasl2], [sasl_client_new], [SASLLIB="-lsasl2"], + [AC_MSG_ERROR([Cyrus SASL library not found])])],[SASLLIB=""]) +AC_SUBST([SASLLIB]) dnl ----------------- dnl CHECK FOR OPENSSL @@ -767,8 +739,10 @@ dnl ---------------- dnl CHECK STRUCTURES dnl ---------------- +dnl For platforms such as FreeBSD that have tm_gmtoff in struct tm. +dnl (FreeBSD has a timezone() function but not a timezone global +dnl variable that is visible). AC_CHECK_MEMBERS([struct tm.tm_gmtoff],,,[#include ]) -AC_CHECK_MEMBERS(struct utmp.ut_type,,,[#include ]) AC_STRUCT_DIRENT_D_TYPE @@ -790,17 +764,21 @@ nmh_cv_path_signal_h=$SIGNAL_H SIGNAL_H=$nmh_cv_path_signal_h AC_SUBST(SIGNAL_H)dnl -dnl ---------------- -dnl OUTPUT MAKEFILES -dnl ---------------- -AC_CONFIG_FILES(Makefile config/Makefile h/Makefile sbr/Makefile uip/Makefile \ - mts/Makefile mts/smtp/Makefile \ - etc/Makefile docs/Makefile man/Makefile) -AC_CONFIG_COMMANDS([stamp],[test -z "$CONFIG_HEADERS" || echo > stamp-h]) -AC_OUTPUT +dnl +dnl Sigh, this is required because under the new world order autoconf has +dnl nothing to create in a few of the build directories when doing an object +dnl tree build. So make sure we created certain directories if they don't +dnl exist. +dnl + +AC_CONFIG_COMMANDS([build-directories], +[test -d etc || ${MKDIR_P} etc +test -d man || ${MKDIR_P} man]) + +AC_CONFIG_COMMANDS_POST([ dnl These odd looking assignments are done to expand out unexpanded -dnl variables in bindir et al (for instance mandir is '${datarootdir}/man', +dnl variables in bindir et al (for instance mandir is '${datarootdir}/man'), dnl but expanding that gives '${prefix}/share/man', so we need to expand dnl again to get the final answer. dnl We only use the expanded versions to print the install paths in @@ -812,26 +790,15 @@ eval "nmhlib=${libdir}"; eval "nmhlib=${nmhlib}" eval "nmhman=${mandir}"; eval "nmhman=${nmhman}" eval "nmhrpm=${nmhrpm}"; -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 - - pop_kinds="${pop_kinds}POP3)" -fi - -echo " +AC_MSG_NOTICE([ nmh configuration ----------------- nmh version : AC_PACKAGE_VERSION -target os : ${target} +host os : ${host} compiler : ${CC} compiler flags : ${CFLAGS} linker flags : ${LDFLAGS} -definitions : ${OURDEFS} +preprocessor flags : ${CPPFLAGS} source code location : ${srcdir} binary install path : ${nmhbin} library install path : ${nmhlib} @@ -844,8 +811,13 @@ file locking type : ${LOCKTYPE} default smtp servers : ${smtpservers} default editor : ${editorpath} default pager : ${pagerpath} -email address masquerading : ${masquerade} -pop is enabled : ${pop_kinds} SASL support : ${sasl_support} -TLS support : ${tls_support}" -echo "" +TLS support : ${tls_support} +])])dnl + +dnl --------------- +dnl OUTPUT MAKEFILE +dnl --------------- +AC_CONFIG_FILES([Makefile test/common.sh]) +AC_CONFIG_FILES([uip/spost], [chmod +x uip/spost]) +AC_OUTPUT