From a54d77908064d87a7e9439445baff7dfa17b1e79 Mon Sep 17 00:00:00 2001
From: Sergey Poznyakoff <gray@gnu.org.ua>
Date: Mon, 19 Nov 2007 14:55:55 +0000
Subject: * 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
---
 ChangeLog    |  4 ++++
 README-alpha |  1 +
 acinclude.m4 |  3 ++-
 configure.ac | 23 +----------------------
 4 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 71380907..dc95cdfe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-11-19  Sergey Poznyakoff  <gray@gnu.org.ua>
 
+	* README-alpha: Update
+	* configure.ac: Use AM_GNU_MAILUTILS.
+	* acinclude.m4: Minor fix.
+
 	* smap: New directory.
 	* smap/smap.c: New file. A general-purpose socket map for MeTA1 
 	(for future use).
diff --git a/README-alpha b/README-alpha
index 824e66a1..783d819e 100644
--- a/README-alpha
+++ b/README-alpha
@@ -18,6 +18,7 @@ latest stable version.
 - Flex <http://flex.sourceforge.net/>
 - Gettext <http://www.gnu.org/software/gettext/>
 - Gnulib <http://www.gnu.org/software/gnulib/>
+- Mailutils <http://www.gnu.org/software/mailutils/>
 - M4 <http://www.gnu.org/software/m4/>
 - Texinfo <http://www.gnu.org/software/texinfo>
 - Wget <http://www.gnu.org/software/wget/>
diff --git a/acinclude.m4 b/acinclude.m4
index 840f88be..21bf3d50 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -15,7 +15,7 @@ dnl
 
 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
        if test x"$GCC" = xyes; then
 	 AC_MSG_CHECKING(whether gcc accepts -ggdb)
@@ -32,3 +32,4 @@ AC_DEFUN([MU_DEBUG_MODE],
          CFLAGS="`echo $save_CFLAGS | sed 's/-O[[0-9]]//g'` $CFLAGS"
        fi
      fi])])
+
diff --git a/configure.ac b/configure.ac
index d25011e1..cef20881 100644
--- a/configure.ac
+++ b/configure.ac
@@ -85,28 +85,7 @@ 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], [:])
 
 save_LIBS=$LIBS
 LIBS="$LIBS $MAILUTILS_LIBS"
-- 
cgit v1.2.1