aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2007-11-19 14:55:55 +0000
committerSergey Poznyakoff <gray@gnu.org.ua>2007-11-19 14:55:55 +0000
commita54d77908064d87a7e9439445baff7dfa17b1e79 (patch)
treee86386508dc135d479ff7313aed3505d9946b91c
parent719964de49d9a50b63b006bcf64e632c2503327a (diff)
downloadmailfromd-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--ChangeLog4
-rw-r--r--README-alpha1
-rw-r--r--acinclude.m43
-rw-r--r--configure.ac23
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 @@
12007-11-19 Sergey Poznyakoff <gray@gnu.org.ua> 12007-11-19 Sergey Poznyakoff <gray@gnu.org.ua>
2 2
3 * README-alpha: Update
4 * configure.ac: Use AM_GNU_MAILUTILS.
5 * acinclude.m4: Minor fix.
6
3 * smap: New directory. 7 * smap: New directory.
4 * smap/smap.c: New file. A general-purpose socket map for MeTA1 8 * smap/smap.c: New file. A general-purpose socket map for MeTA1
5 (for future use). 9 (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.
18- Flex <http://flex.sourceforge.net/> 18- Flex <http://flex.sourceforge.net/>
19- Gettext <http://www.gnu.org/software/gettext/> 19- Gettext <http://www.gnu.org/software/gettext/>
20- Gnulib <http://www.gnu.org/software/gnulib/> 20- Gnulib <http://www.gnu.org/software/gnulib/>
21- Mailutils <http://www.gnu.org/software/mailutils/>
21- M4 <http://www.gnu.org/software/m4/> 22- M4 <http://www.gnu.org/software/m4/>
22- Texinfo <http://www.gnu.org/software/texinfo> 23- Texinfo <http://www.gnu.org/software/texinfo>
23- Wget <http://www.gnu.org/software/wget/> 24- 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
15 15
16AC_DEFUN([MU_DEBUG_MODE], 16AC_DEFUN([MU_DEBUG_MODE],
17 [AC_ARG_ENABLE(debug, 17 [AC_ARG_ENABLE(debug,
18 [ --enable-debug enable debugging mode], 18 AC_HELP_STRING([--enable-debug], [enable debugging mode]),
19 [if test x"$enableval" = xyes; then 19 [if test x"$enableval" = xyes; then
20 if test x"$GCC" = xyes; then 20 if test x"$GCC" = xyes; then
21 AC_MSG_CHECKING(whether gcc accepts -ggdb) 21 AC_MSG_CHECKING(whether gcc accepts -ggdb)
@@ -32,3 +32,4 @@ AC_DEFUN([MU_DEBUG_MODE],
32 CFLAGS="`echo $save_CFLAGS | sed 's/-O[[0-9]]//g'` $CFLAGS" 32 CFLAGS="`echo $save_CFLAGS | sed 's/-O[[0-9]]//g'` $CFLAGS"
33 fi 33 fi
34 fi])]) 34 fi])])
35
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);
85]) 85])
86 86
87# Check for GNU Mailutils 87# Check for GNU Mailutils
88AC_PATH_PROG(MU_CONFIG, mailutils-config, none, $PATH) 88AM_GNU_MAILUTILS(1.0, [auth mailer cfg argp], [:])
89if test "$MU_CONFIG" = "none"; then
90 AC_MSG_ERROR(cannot find GNU Mailutils)
91fi
92
93AC_SUBST(MAILUTILS_VERSION)
94AC_SUBST(MAILUTILS_INCLUDES)
95AC_SUBST(MAILUTILS_LIBS)
96MAILUTILS_VERSION=`$MU_CONFIG --info version|sed 's/VERSION=//'`
97VEX=`echo $MAILUTILS_VERSION | sed 's/\./ \\\\* 1000 + /;s/\./ \\\\* 100 + /'`
98MAILUTILS_VERSION_NUMBER=`eval expr "$VEX"`
99AC_SUBST(MAILUTILS_VERSION_NUMBER)
100AC_DEFINE_UNQUOTED(MAILUTILS_VERSION_NUMBER, $MAILUTILS_VERSION_NUMBER,
101 [Packed Mailutils version number])
102case $MAILUTILS_VERSION in
1030.*) AC_MSG_ERROR([Mailutils version too old; at least 1.0 is required]);;
1041.1|1.1.*) MAILUTILS_LIBS=`$MU_CONFIG --link auth`;;
1051.2|1.2.[[1-9]]) MAILUTILS_LIBS=`$MU_CONFIG --link auth mailer`;;
106[[0-9]]*) MAILUTILS_LIBS=`$MU_CONFIG --link auth mailer cfg argp`;;
107*) AC_MSG_ERROR([Unrecognized mailutils version: "$MAILUTILS_VERSION"]);;
108esac
109MAILUTILS_INCLUDES=`$MU_CONFIG --compile`
110 89
111save_LIBS=$LIBS 90save_LIBS=$LIBS
112LIBS="$LIBS $MAILUTILS_LIBS" 91LIBS="$LIBS $MAILUTILS_LIBS"

Return to:

Send suggestions and report system problems to the System administrator.