diff options
| author | Sergey Poznyakoff <gray@gnu.org.ua> | 2007-12-12 13:19:02 +0000 |
|---|---|---|
| committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2007-12-12 13:19:02 +0000 |
| commit | 57adf50a0299978606069e64b994e9bfb58ad701 (patch) | |
| tree | daf5506f682c93a5b6d64c79aa179e57ddf67ef0 /configure.ac | |
| parent | 0f78d4cebb75377eeb3c61e349e8eb088d9d88be (diff) | |
| download | mailfromd-57adf50a0299978606069e64b994e9bfb58ad701.tar.gz mailfromd-57adf50a0299978606069e64b994e9bfb58ad701.tar.bz2 | |
* src/syslog_async.c: Include config.h, netinet/in.h and signal.h
Conditionally include paths.h, provide replacements for _PATH_LOG
and _PATH_CONSOLE if it is absent.
Provide dummy replacement for MSG_NOSIGNAL and LOG_PERROR.
(log_write_async): Ignore SIGPIPE if MSG_NOSIGNAL is not defined.
* src/main.c: Conditionally compile syslog-async stuff.
* src/Makefile.am: Likewise.
* configure.ac: Check for paths.h.
Restore previous meaning of --enable-syslog-async.
(DEFAULT_SYSLOG_ASYNC): New variable.
Raise version number to 4.2.1.
* doc/mailfromd.texi: Reflect above-mentioned changes.
* gacopyz/server.c, gacopyz/gacopyz.c: Rename all sun to s_un and
sin to s_in, to avoid name clashes.
* NEWS (4.2.1): New entry.
git-svn-id: file:///svnroot/mailfromd/tags/release_4_2@1535 7a8a7f39-df28-0410-adc6-e0d955640f24
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac index e49a654a..492f9487 100644 --- a/configure.ac +++ b/configure.ac @@ -17,7 +17,7 @@ AC_PREREQ(2.59) m4_define([MF_VERSION_MAJOR], 4) m4_define([MF_VERSION_MINOR], 2) -dnl m4_define([MF_VERSION_PATCH], 0) +m4_define([MF_VERSION_PATCH], 1) AC_INIT([mailfromd], MF_VERSION_MAJOR.MF_VERSION_MINOR[]m4_ifdef([MF_VERSION_PATCH],.MF_VERSION_PATCH), [bug-mailfromd@gnu.org.ua]) @@ -47,7 +47,7 @@ AC_CHECK_LIB(resolv, res_query) # Checks for header files. AC_HEADER_STDC -AC_CHECK_HEADERS([stdlib.h unistd.h sysexits.h]) +AC_CHECK_HEADERS([stdlib.h unistd.h sysexits.h paths.h]) # Checks for typedefs, structures, and compiler characteristics. AC_TYPE_SIGNAL @@ -96,7 +96,8 @@ AC_SUBST(MAILUTILS_LIBS) MAILUTILS_VERSION=`$MU_CONFIG --info version|sed 's/VERSION=//'` case $MAILUTILS_VERSION in 0.*) AC_MSG_ERROR([Mailutils version too old; at least 1.0 is required]);; -1.1*) MAILUTILS_LIBS=`$MU_CONFIG --link auth`;; +1.1|1.1.*) MAILUTILS_LIBS=`$MU_CONFIG --link auth`;; +1.2) MAILUTILS_LIBS=`$MU_CONFIG --link auth`;; *) MAILUTILS_LIBS=`$MU_CONFIG --link auth mailer`;; esac MAILUTILS_INCLUDES=`$MU_CONFIG --compile` @@ -127,19 +128,23 @@ AM_GNU_GETTEXT_VERSION([0.16]) # Syslog AC_ARG_ENABLE([syslog-async], AC_HELP_STRING([--enable-syslog-async], - [use non-blocking version of syslog by default]), + [compile non-blocking version of syslog]), [case "${enableval}" in yes) syslog_async=yes ;; no) syslog_async=no ;; *) AC_MSG_ERROR([bad value ${enableval} for --enable-syslog-async]) ;; esac],[syslog_async=no]) -AH_TEMPLATE([DEFAULT_SYSLOG_ASYNC], - [Define to 1 if syslog-async is being used by default]) if test $syslog_async = "yes"; then - AC_DEFINE([DEFAULT_SYSLOG_ASYNC], [1]) -else - AC_DEFINE([DEFAULT_SYSLOG_ASYNC], [0]) + AC_ARG_VAR([DEFAULT_SYSLOG_ASYNC], + [Define to 1 if syslog-async is being used by default]) + if test -z "$DEFAULT_SYSLOG_ASYNC"; then + DEFAULT_SYSLOG_ASYNC=0 + fi + AC_DEFINE_UNQUOTED([DEFAULT_SYSLOG_ASYNC],$DEFAULT_SYSLOG_ASYNC, + [Define to 1 to use syslog_async by default]) + AC_SUBST([BUILD_SYSLOG_ASYNC], '$(SYSLOG_ASYNC_O)') + AC_DEFINE([USE_SYSLOG_ASYNC], [1], [Define if syslog-async is being used]) fi # Check for DBM flavor @@ -573,7 +578,7 @@ Socket.................................... $socket Expiration interval....................... $expire Negative DNS answer expiration interval... $negative_dns_expire Rates expire interval..................... $rates_expire -Default syslog implementation............. $syslog_flavor +Compile asynchronous syslog............... $syslog_async Readline (for mtasim)..................... $usereadline Documentation rendition type.............. $rendition ******************************************************************* @@ -594,11 +599,7 @@ negative_dns_expire=$DEFAULT_DNS_NEGATIVE_EXPIRE_INTERVAL rates_expire=$DEFAULT_EXPIRE_RATES_INTERVAL usereadline=$usereadline rendition=$RENDITION -if test "$syslog_async" = "yes"; then - syslog_flavor="non-blocking" -else - syslog_flavor="standard" -fi +syslog_async=$syslog_async ]) AC_CONFIG_FILES([Makefile |