diff options
author | uid65697 <uid65697> | 2003-12-26 16:22:25 +0000 |
---|---|---|
committer | uid65697 <uid65697> | 2003-12-26 16:22:25 +0000 |
commit | d2de3e8905215943a11b6f57c570a3fcde11aa2b (patch) | |
tree | 60cd23269acce3593ea663d4e0889b5239c9d03e /m4 | |
parent | 9d3c733454ace9fc31ff0263e6c0e7379544ded7 (diff) | |
download | mailutils-d2de3e8905215943a11b6f57c570a3fcde11aa2b.tar.gz mailutils-d2de3e8905215943a11b6f57c570a3fcde11aa2b.tar.bz2 |
Fixes to work with automake 1.8/autoconf 2.59
Diffstat (limited to 'm4')
-rw-r--r-- | m4/db2.m4 | 2 | ||||
-rw-r--r-- | m4/debug.m4 | 2 | ||||
-rw-r--r-- | m4/getopt.m4 | 11 | ||||
-rw-r--r-- | m4/gsasl.m4 | 2 | ||||
-rw-r--r-- | m4/gssapi.m4 | 2 | ||||
-rw-r--r-- | m4/guile.m4 | 2 | ||||
-rw-r--r-- | m4/lib.m4 | 2 | ||||
-rw-r--r-- | m4/mu_libobj.m4 | 13 | ||||
-rw-r--r-- | m4/tls.m4 | 2 |
9 files changed, 21 insertions, 17 deletions
@@ -23,7 +23,7 @@ dnl The cursor member of DB structure used to take three arguments in older dnl implementations of Berkeley DB. Newer versions (>= 4.0) declare dnl it as taking four arguments. dnl This macro checks which of the variants we have. -AC_DEFUN(MU_DB2_CURSOR, +AC_DEFUN([MU_DB2_CURSOR], [AC_CACHE_CHECK([whether db->cursor takes 4 arguments], [mu_cv_bdb2_cursor_four_args], [AC_TRY_COMPILE([#include <db.h>], diff --git a/m4/debug.m4 b/m4/debug.m4 index 92a00358d..840f88bea 100644 --- a/m4/debug.m4 +++ b/m4/debug.m4 @@ -13,7 +13,7 @@ dnl Check for --enable-debug switch. When the switch is specified, add dnl -ggdb to CFLAGS and remove any optimization options from there. dnl -AC_DEFUN(MU_DEBUG_MODE, +AC_DEFUN([MU_DEBUG_MODE], [AC_ARG_ENABLE(debug, [ --enable-debug enable debugging mode], [if test x"$enableval" = xyes; then diff --git a/m4/getopt.m4 b/m4/getopt.m4 index b4b835557..4d586998e 100644 --- a/m4/getopt.m4 +++ b/m4/getopt.m4 @@ -7,8 +7,12 @@ AH_TEMPLATE(HAVE_GNU_GETOPT, [Define if your system has GNU getopt functions]) -AC_DEFUN(MU_REPLACE_GNU_GETOPT, +AC_DEFUN([MU_REPLACE_GNU_GETOPT], [ + AC_CHECK_HEADER([getopt.h], + mu_cv_have_getopt_h=yes + AC_DEFINE(HAVE_GETOPT_H,1,[Define if the system has getopt.h]), + mu_cv_have_getopt_h=no) AC_CACHE_CHECK([for GNU getopt], mu_cv_have_gnu_getopt, [ AC_TRY_RUN([ @@ -33,12 +37,15 @@ int argc; char **argv; mu_cv_have_gnu_getopt=no)]) if test x"$mu_cv_have_gnu_getopt" != xyes ; then - MU_HEADER(getopt.h) + mu_cv_have_getopt_h=no MU_LIBOBJ(getopt) MU_LIBOBJ(getopt1) else AC_DEFINE(HAVE_GNU_GETOPT) fi + if test "$mu_cv_have_getopt_h" = no; then + MU_HEADER(getopt.h) + fi ]) diff --git a/m4/gsasl.m4 b/m4/gsasl.m4 index 0c34fa638..37e496e21 100644 --- a/m4/gsasl.m4 +++ b/m4/gsasl.m4 @@ -15,7 +15,7 @@ dnl You should have received a copy of the GNU General Public License dnl along with GNU Mailutils; if not, write to the Free Software dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl -AC_DEFUN(MU_CHECK_GSASL, +AC_DEFUN([MU_CHECK_GSASL], [AC_CACHE_CHECK([whether to use GNU SASL library], [mu_cv_lib_gsasl], [if test "x$mu_cv_lib_gsasl" = x; then diff --git a/m4/gssapi.m4 b/m4/gssapi.m4 index 77c0ca237..3e1204ff6 100644 --- a/m4/gssapi.m4 +++ b/m4/gssapi.m4 @@ -5,7 +5,7 @@ dnl Search for a GSSAPI implementation in the standard locations plus PREFIX, dnl if it is set and not "yes". dnl Defines GSSAPI_CFLAGS and GSSAPI_LIBS if found. dnl Defines GSSAPI_IMPL to "Heimdal", "MIT", or "OldMIT", or "none" if not found -AC_DEFUN(MU_CHECK_GSSAPI, +AC_DEFUN([MU_CHECK_GSSAPI], [ if test "x$mu_cv_lib_gssapi_libs" = x; then cached="" diff --git a/m4/guile.m4 b/m4/guile.m4 index 9354d0fa4..a91ee339a 100644 --- a/m4/guile.m4 +++ b/m4/guile.m4 @@ -32,7 +32,7 @@ else ]ifelse([$4], , [:], [$4])[ fi]])dnl -AC_DEFUN(MU_CHECK_GUILE, +AC_DEFUN([MU_CHECK_GUILE], [ if test "x$mu_cv_lib_guile" = x; then cached="" @@ -5,7 +5,7 @@ dnl $3 -- Any additional libraries that might be needed dnl $4 -- Action to be taken when test succeeds dnl $5 -- Action to be taken when test fails dnl $6 -- Directories where the library may reside -AC_DEFUN(MU_CHECK_LIB, +AC_DEFUN([MU_CHECK_LIB], [ save_LIBS=$LIBS AC_CACHE_CHECK([for -l$1], mu_cv_lib_$1, diff --git a/m4/mu_libobj.m4 b/m4/mu_libobj.m4 index 90030dbeb..dc4a98f68 100644 --- a/m4/mu_libobj.m4 +++ b/m4/mu_libobj.m4 @@ -17,26 +17,26 @@ dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. dnl AC_SUBST(MU_LIBOBJS) -AC_DEFUN(MU_LIBOBJ,[ +AC_DEFUN([MU_LIBOBJ],[ MU_LIBOBJS="$MU_LIBOBJS $1.o"]) -AC_DEFUN(MU_CHECK_FUNC,[ +AC_DEFUN([MU_CHECK_FUNC],[ AC_CHECK_FUNC($1,, [MU_LIBOBJ($1)])]) -AC_DEFUN(MU_CHECK_FUNCS,[ +AC_DEFUN([MU_CHECK_FUNCS],[ for mu_func in $1 do MU_CHECK_FUNC($mu_func) done]) AC_SUBST(GNU_INCLS) -AC_DEFUN(MU_HEADER,[ +AC_DEFUN([MU_HEADER],[ pushdef([mu_upcase],translit($1,[a-z-],[A-Z_])) pushdef([mu_cache_var],[mu_cv_header_]translit($1,[-./],[___])) if test x"[$]mu_cache_var" != xyes; then - mu_header_list="$mu_header_list include/mailutils/gnu/$1:headers/$1" + AC_CONFIG_LINKS(include/mailutils/gnu/$1:headers/$1) GNU_INCLS="$GNU_INCLS $1" mu_cache_var=yes fi @@ -45,6 +45,3 @@ AC_DEFUN(MU_HEADER,[ popdef([mu_cache_var]) ]) -AC_DEFUN(MU_FINISH_LINKS,[ - AC_CONFIG_LINKS([$mu_header_list]) -])
\ No newline at end of file @@ -15,7 +15,7 @@ dnl You should have received a copy of the GNU General Public License dnl along with GNU Mailutils; if not, write to the Free Software dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA dnl -AC_DEFUN(MU_CHECK_TLS, +AC_DEFUN([MU_CHECK_TLS], [ if test "x$WITH_GNUTLS" = x; then cached="" |