From 94d9ea5489c0bb284514ddf81e0f88f01f32cd74 Mon Sep 17 00:00:00 2001 From: Paul Mangan Date: Mon, 15 Dec 2008 09:21:27 +0000 Subject: [PATCH 1/1] 2008-12-15 [paul] 3.6.1cvs76 * m4/spamassassin.m4 fix warnings thrown up by autoconf-2.6.3 --- ChangeLog | 5 +++++ PATCHSETS | 1 + configure.ac | 2 +- m4/spamassassin.m4 | 40 ++++++++++++++++++++-------------------- 4 files changed, 27 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4ffd63a88..adc62036c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-12-15 [paul] 3.6.1cvs76 + + * m4/spamassassin.m4 + fix warnings thrown up by autoconf-2.6.3 + 2008-12-13 [colin] 3.6.1cvs75 * Makefile.am diff --git a/PATCHSETS b/PATCHSETS index 0f21f65d1..b8e582114 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -3657,3 +3657,4 @@ ( cvs diff -u -r 1.25.2.28 -r 1.25.2.29 tools/Makefile.am; diff -u /dev/null tools/ca-certificates.crt; cvs diff -u -r 1.24.2.18 -r 1.24.2.19 src/common/Makefile.am; cvs diff -u -r 1.9.2.37 -r 1.9.2.38 src/common/ssl.c; ) > 3.6.1cvs73.patchset ( cvs diff -u -r 1.25.2.29 -r 1.25.2.30 tools/Makefile.am; ) > 3.6.1cvs74.patchset ( cvs diff -u -r 1.24.2.24 -r 1.24.2.25 Makefile.am; cvs diff -u -r 1.155.2.94 -r 1.155.2.95 src/Makefile.am; cvs diff -u -r 1.9.2.38 -r 1.9.2.39 src/common/ssl.c; cvs diff -u -r 1.36.2.156 -r 1.36.2.157 src/common/utils.c; cvs diff -u -r 1.20.2.64 -r 1.20.2.65 src/common/utils.h; cvs diff -u -r 1.25.2.30 -r 1.25.2.31 tools/Makefile.am; ) > 3.6.1cvs75.patchset +( cvs diff -u -r 1.1.4.3 -r 1.1.4.4 m4/spamassassin.m4; ) > 3.6.1cvs76.patchset diff --git a/configure.ac b/configure.ac index 22af1be2d..eb98e6896 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=6 MICRO_VERSION=1 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=75 +EXTRA_VERSION=76 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/m4/spamassassin.m4 b/m4/spamassassin.m4 index 0ec448431..040073715 100644 --- a/m4/spamassassin.m4 +++ b/m4/spamassassin.m4 @@ -7,14 +7,14 @@ AC_CHECK_HEADERS(sys/time.h syslog.h unistd.h errno.h sys/errno.h) AC_CHECK_HEADERS(time.h sysexits.h sys/socket.h netdb.h netinet/in.h) AC_CACHE_CHECK([for SHUT_RD], - shutrd, [ + spamassassin_cv_has_shutrd, [ AC_TRY_COMPILE([#include #include ], [printf ("%d", SHUT_RD); return 0;], - [shutrd=yes], - [shutrd=no]), + [spamassassin_cv_has_shutrd=yes], + [spamassassin_cv_has_shutrd=no]), ]) -if test $shutrd = yes ; then +if test $spamassassin_cv_has_shutrd = yes ; then AC_DEFINE(HAVE_SHUT_RD, 1, HAVE_SHUT_RD) fi @@ -25,13 +25,13 @@ AC_CHECK_FUNCS(socket strdup strtod strtol snprintf shutdown) dnl ---------------------------------------------------------------------- AC_CACHE_CHECK([for h_errno], - herrno, [ + spamassassin_cv_has_herrno, [ AC_TRY_COMPILE([#include ], [printf ("%d", h_errno); return 0;], - [herrno=yes], - [herrno=no]), + [spamassassin_cv_has_herrno=yes], + [spamassassin_cv_has_herrno=no]), ]) -if test $herrno = yes ; then +if test $spamassassin_cv_has_herrno = yes ; then AC_DEFINE(HAVE_H_ERRNO, 1, HAVE_H_ERRNO) fi @@ -40,44 +40,44 @@ dnl ---------------------------------------------------------------------- dnl ---------------------------------------------------------------------- AC_CACHE_CHECK([for in_addr_t], - inaddrt, [ + spamassassin_cv_has_inaddrt, [ AC_TRY_COMPILE([#include #include ], [in_addr_t foo; return 0;], - [inaddrt=yes], - [inaddrt=no]), + [spamassassin_cv_has_inaddrt=yes], + [spamassassin_cv_has_inaddrt=no]), ]) -if test $inaddrt = no ; then +if test $spamassassin_cv_has_inaddrt = no ; then AC_CHECK_TYPE(in_addr_t, unsigned long) fi dnl ---------------------------------------------------------------------- AC_CACHE_CHECK([for INADDR_NONE], - haveinaddrnone, [ + spamassassin_cv_has_haveinaddrnone, [ AC_TRY_COMPILE([#include #include ], [in_addr_t foo = INADDR_NONE; return 0;], - [haveinaddrnone=yes], - [haveinaddrnone=no]), + [spamassassin_cv_has_haveinaddrnone=yes], + [spamassassin_cv_has_haveinaddrnone=no]), ]) -if test $haveinaddrnone = yes ; then +if test $spamassassin_cv_has_haveinaddrnone = yes ; then AC_DEFINE(HAVE_INADDR_NONE, 1, HAVE_INADDR_NONE) fi dnl ---------------------------------------------------------------------- AC_CACHE_CHECK([for EX__MAX], - haveexmax, [ + spamassassin_cv_has_haveexmax, [ AC_TRY_COMPILE([#ifdef HAVE_SYSEXITS_H #include #endif #include ], [int foo = EX__MAX; return 0;], - [haveexmax=yes], - [haveexmax=no]), + [spamassassin_cv_has_haveexmax=yes], + [spamassassin_cv_has_haveexmax=no]), ]) -if test $haveexmax = yes ; then +if test $spamassassin_cv_has_haveexmax = yes ; then AC_DEFINE(HAVE_EX__MAX, 1, HAVE_EX__MAX) fi -- 2.25.1