diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2007-11-19 14:55:55 +0000 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2007-11-19 14:55:55 +0000 |
commit | a54d77908064d87a7e9439445baff7dfa17b1e79 (patch) | |
tree | e86386508dc135d479ff7313aed3505d9946b91c | |
parent | 719964de49d9a50b63b006bcf64e632c2503327a (diff) | |
download | mailfromd-a54d77908064d87a7e9439445baff7dfa17b1e79.tar.gz mailfromd-a54d77908064d87a7e9439445baff7dfa17b1e79.tar.bz2 |
* README-alpha: Update
* configure.ac: Use AM_GNU_MAILUTILS.
* acinclude.m4: Minor fix.
git-svn-id: file:///svnroot/mailfromd/trunk@1529 7a8a7f39-df28-0410-adc6-e0d955640f24
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | README-alpha | 1 | ||||
-rw-r--r-- | acinclude.m4 | 3 | ||||
-rw-r--r-- | configure.ac | 23 |
4 files changed, 8 insertions, 23 deletions
@@ -2,2 +2,6 @@ + * README-alpha: Update + * configure.ac: Use AM_GNU_MAILUTILS. + * acinclude.m4: Minor fix. + * smap: New directory. diff --git a/README-alpha b/README-alpha index 824e66a1..783d819e 100644 --- a/README-alpha +++ b/README-alpha @@ -20,2 +20,3 @@ latest stable version. - Gnulib <http://www.gnu.org/software/gnulib/> +- Mailutils <http://www.gnu.org/software/mailutils/> - M4 <http://www.gnu.org/software/m4/> diff --git a/acinclude.m4 b/acinclude.m4 index 840f88be..21bf3d50 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -17,3 +17,3 @@ AC_DEFUN([MU_DEBUG_MODE], [AC_ARG_ENABLE(debug, - [ --enable-debug enable debugging mode], + AC_HELP_STRING([--enable-debug], [enable debugging mode]), [if test x"$enableval" = xyes; then @@ -34 +34,2 @@ AC_DEFUN([MU_DEBUG_MODE], fi])]) + diff --git a/configure.ac b/configure.ac index d25011e1..cef20881 100644 --- a/configure.ac +++ b/configure.ac @@ -87,24 +87,3 @@ extern char *strtok_r (char *s, const char *delim, char **save_ptr); # Check for GNU Mailutils -AC_PATH_PROG(MU_CONFIG, mailutils-config, none, $PATH) -if test "$MU_CONFIG" = "none"; then - AC_MSG_ERROR(cannot find GNU Mailutils) -fi - -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|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` +AM_GNU_MAILUTILS(1.0, [auth mailer cfg argp], [:]) |