Re: head depends on autoconf 2.60

[Eric Blake]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

According to Eric Blake on 6/24/2006 4:53 PM:
> Now that Ralf got the first release of autoconf out in a couple of years,
> we can finally use its new features.  This 3-line change resulted in an
> 8k reduction to configure between two runs of autoconf 2.60.
> 
> 2006-06-24  Eric Blake  <address@hidden>
> 
>       * configure.ac (AC_PREREQ): Autoconf 2.60 is now released.
>       (AC_CHECK_HEADERS_ONCE): Use this new feature.
>       (AC_CHECK_FUNCS_ONCE): Likewise.

Ported this one to CVS head:

2006-07-07  Eric Blake  <address@hidden>

        * configure.ac (AC_PREREQ): Autoconf 2.60 is now out.
        (AC_CHECK_HEADERS): Assume signal.h.
        (AC_CHECK_HEADERS_ONCE): Use new feature to shrink configure.
        (AC_CHECK_FUNCS_ONCE): Likewise.
        * src/m4.h (includes): Assume signal.h.

- --
Life is short - so eat dessert first!

Eric Blake             address@hidden
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.1 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFErlya84KuGfSFAYARAhXvAJ9WFFGvBRAg9UcWKavVyz+SVf3PYQCfaPtK
xBpBNDUuwXWciEGgjhuouFM=
=cJzh
-----END PGP SIGNATURE-----

Index: configure.ac
===================================================================
RCS file: /sources/m4/m4/configure.ac,v
retrieving revision 1.48
diff -u -p -r1.48 configure.ac
--- configure.ac        16 Jun 2006 05:13:18 -0000      1.48
+++ configure.ac        7 Jul 2006 13:05:49 -0000
@@ -17,7 +17,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301  USA
 
-AC_PREREQ([2.59d])
+AC_PREREQ([2.60])
 
 ## ------------------------ ##
 ## Autoconf initialisation. ##
@@ -168,8 +168,7 @@ AC_CHECK_SIZEOF([long long int])
 ## ------------------------- ##
 ## C headers required by M4. ##
 ## ------------------------- ##
-AC_CHECK_HEADERS([limits.h])
-AC_CHECK_HEADERS([signal.h sys/signal.h], [break])
+AC_CHECK_HEADERS_ONCE([limits.h])
 
 if test $ac_cv_header_stdbool_h = yes; then
   INCLUDE_STDBOOL_H='#include <stdbool.h>'
@@ -183,7 +182,7 @@ AC_SUBST([INCLUDE_STDBOOL_H])
 ## --------------------------------- ##
 ## Library functions required by M4. ##
 ## --------------------------------- ##
-AC_CHECK_FUNCS([calloc strerror tmpfile])
+AC_CHECK_FUNCS_ONCE([calloc strerror tmpfile])
 
 AM_WITH_DMALLOC
 
@@ -192,8 +191,8 @@ M4_SYS_STACKOVF
 # This is for the modules
 AC_STRUCT_TM
 AC_FUNC_STRFTIME
-AC_CHECK_FUNCS([getcwd gethostname mktime uname \
-               setenv unsetenv putenv clearenv])
+AC_CHECK_FUNCS_ONCE([getcwd gethostname mktime uname])
+AC_CHECK_FUNCS_ONCE([setenv unsetenv putenv clearenv])
 
 M4_LIB_GMP
 AM_CONDITIONAL([USE_GMP], [test "x$USE_GMP" = xyes])
Index: src/m4.h
===================================================================
RCS file: /sources/m4/m4/src/m4.h,v
retrieving revision 1.19
diff -u -p -r1.19 m4.h
--- src/m4.h    13 Jun 2006 01:19:09 -0000      1.19
+++ src/m4.h    7 Jul 2006 13:05:49 -0000
@@ -75,6 +75,7 @@ long strtol ();
 #endif /* STDC_HEADERS */
 
 #include <errno.h>
+#include <signal.h>
 
 #ifndef errno
 extern int errno;
@@ -90,12 +91,6 @@ extern int errno;
 # define setlocale(Category, Locale)
 #endif
 
-#if HAVE_SIGNAL_H
-# include <signal.h>
-#elif HAVE_SYS_SIGNAL_H
-# include <sys/signal.h>
-#endif
-
 #include "ltdl.h"
 
 /* Error handling.  */