diff options
| author | Sergey Poznyakoff <gray@gnu.org.ua> | 2007-11-19 13:38:36 +0000 |
|---|---|---|
| committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2007-11-19 13:38:36 +0000 |
| commit | b1a3e134c1e3127cf3f31cdfa24d784858c9873d (patch) | |
| tree | 1058a6d8b4a5e9a328ed5356ec94c69f0be72732 /configure.ac | |
| parent | 4b9defbcfe01fb05acf9ecd74a683390d6110872 (diff) | |
| download | mailfromd-b1a3e134c1e3127cf3f31cdfa24d784858c9873d.tar.gz mailfromd-b1a3e134c1e3127cf3f31cdfa24d784858c9873d.tar.bz2 | |
* src/mu_dbm.c [WITH_GDBM]: do not bail out if the database does
not exist.
* src/mailfromd.h: Add argp.h
* src/bi_sa.m4: Minor fixes.
* src/main.c: Support for Mailutils CVS HEAD.
* configure.ac: Likewise.
git-svn-id: file:///svnroot/mailfromd/trunk@1527 7a8a7f39-df28-0410-adc6-e0d955640f24
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index e49a654a..d25011e1 100644 --- a/configure.ac +++ b/configure.ac @@ -94,24 +94,25 @@ AC_SUBST(MAILUTILS_VERSION) AC_SUBST(MAILUTILS_INCLUDES) AC_SUBST(MAILUTILS_LIBS) MAILUTILS_VERSION=`$MU_CONFIG --info version|sed 's/VERSION=//'` +VEX=`echo $MAILUTILS_VERSION | sed 's/\./ \\\\* 1000 + /;s/\./ \\\\* 100 + /'` +MAILUTILS_VERSION_NUMBER=`eval expr "$VEX"` +AC_SUBST(MAILUTILS_VERSION_NUMBER) +AC_DEFINE_UNQUOTED(MAILUTILS_VERSION_NUMBER, $MAILUTILS_VERSION_NUMBER, + [Packed Mailutils version number]) 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`;; -*) MAILUTILS_LIBS=`$MU_CONFIG --link auth mailer`;; +0.*) AC_MSG_ERROR([Mailutils version too old; at least 1.0 is required]);; +1.1|1.1.*) MAILUTILS_LIBS=`$MU_CONFIG --link auth`;; +1.2|1.2.[[1-9]]) MAILUTILS_LIBS=`$MU_CONFIG --link auth mailer`;; +[[0-9]]*) MAILUTILS_LIBS=`$MU_CONFIG --link auth mailer cfg argp`;; +*) AC_MSG_ERROR([Unrecognized mailutils version: "$MAILUTILS_VERSION"]);; esac MAILUTILS_INCLUDES=`$MU_CONFIG --compile` save_LIBS=$LIBS LIBS="$LIBS $MAILUTILS_LIBS" -AC_CHECK_FUNCS([argcv_unescape_char mu_get_auth]) +AC_CHECK_FUNCS([mu_get_auth]) LIBS=$save_LIBS -AH_BOTTOM([#ifndef HAVE_ARGCV_UNESCAPE_CHAR -# define argcv_unescape_char argcv_unquote_char -# define argcv_escape_char argcv_quote_char -#endif -]) - ### Check for Emacs site-lisp directory AM_PATH_LISPDIR @@ -565,6 +566,7 @@ cat <<EOF ******************************************************************* Mailfromd configured with the following settings: +Mailutils version......................... $mu_version External preprocessor..................... $ext_pp DBM version............................... $status_dbm Default user.............................. $user @@ -580,7 +582,8 @@ Documentation rendition type.............. $rendition EOF ], -[if test -z "$DEFAULT_PREPROCESSOR"; then +[mu_version=$MAILUTILS_VERSION +if test -z "$DEFAULT_PREPROCESSOR"; then ext_pp=no else ext_pp="$DEFAULT_PREPROCESSOR" |