Update to Autoconf 2.61.

2 files changed, 79 insertions, 61 deletions

diff --git a/ChangeLog b/ChangeLog
index 7ee19af5d..da26cbf45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-07-06  Ludovic Courtès  <ludo@gnu.org>
+
+	* configure.in: Update to Autoconf 2.61.
+
 2008-06-28  Ludovic Courtès  <ludo@gnu.org>
 
 	* configure.in: Use Automake with `-Wall -Wno-override'.
diff --git a/configure.in b/configure.in
index 5f72d357c..a6b409a68 100644
--- a/configure.in
+++ b/configure.in
@@ -25,7 +25,7 @@ Boston, MA 02110-1301, USA.
 
 ]])
 
-AC_PREREQ(2.59)
+AC_PREREQ(2.61)
 
 dnl  `patsubst' here deletes the newline which "echo" prints.  We can't use
 dnl  "echo -n" since -n is not portable (see autoconf manual "Limitations of
@@ -49,7 +49,7 @@ AC_CONFIG_SRCDIR([GUILE-VERSION])
 . $srcdir/GUILE-VERSION
 
 AM_MAINTAINER_MODE
-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
 AH_TOP(/*GUILE_CONFIGURE_COPYRIGHT*/)
 
 #--------------------------------------------------------------------
@@ -62,8 +62,11 @@ AC_CONFIG_SUBDIRS(guile-readline)
 
 #--------------------------------------------------------------------
 
+AC_LANG([C])
+
 dnl Some more checks for Win32
-AC_CYGWIN
+AC_CANONICAL_HOST
+
 AC_LIBTOOL_WIN32_DLL
 
 AC_PROG_INSTALL
@@ -75,7 +78,8 @@ AC_PROG_AWK
 dnl Gnulib.
 gl_INIT
 
-AM_PROG_CC_STDC
+AC_PROG_CC_C89
+
 # for per-target cflags in the libguile subdir
 AM_PROG_CC_C_O
 
@@ -124,7 +128,7 @@ AC_ARG_ENABLE(debug-malloc,
 
 SCM_I_GSC_GUILE_DEBUG=0
 AC_ARG_ENABLE(guile-debug,
-  [AC_HELP_STRING([--enable-guile-debug],
+  [AS_HELP_STRING([--enable-guile-debug],
                   [include internal debugging functions])],
   if test "$enable_guile_debug" = y || test "$enable_guile_debug" = yes; then
     SCM_I_GSC_GUILE_DEBUG=1
@@ -143,7 +147,7 @@ AC_ARG_ENABLE(regex,
   enable_regex=yes)
 
 AC_ARG_ENABLE([discouraged],
-  AC_HELP_STRING([--disable-discouraged],[omit discouraged features]))
+  AS_HELP_STRING([--disable-discouraged],[omit discouraged features]))
 
 if test "$enable_discouraged" = no; then
   SCM_I_GSC_ENABLE_DISCOURAGED=0
@@ -152,7 +156,7 @@ else
 fi
 
 AC_ARG_ENABLE([deprecated],
-  AC_HELP_STRING([--disable-deprecated],[omit deprecated features]))
+  AS_HELP_STRING([--disable-deprecated],[omit deprecated features]))
 
 if test "$enable_deprecated" = no; then
   SCM_I_GSC_ENABLE_DEPRECATED=0
@@ -198,7 +202,7 @@ dnl  For now, --without-64-calls allows Guile to build on OSs where it
 dnl  wasn't building before.
 AC_MSG_CHECKING([whether to use system and library "64" calls])
 AC_ARG_WITH([64-calls],
-  AC_HELP_STRING([--without-64-calls],
+  AS_HELP_STRING([--without-64-calls],
                  [don't attempt to use system and library calls with "64" in their names]),
   [use_64_calls=$withval],
   [use_64_calls=yes
@@ -727,24 +731,28 @@ AC_SEARCH_LIBS(crypt, crypt,
 # is a workaround for the failure of some systems to conform to C99.
 if test "$ac_cv_type_complex_double" = yes; then
   AC_MSG_CHECKING([for i])
-  AC_TRY_COMPILE([
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #if HAVE_COMPLEX_H
 #include <complex.h>
 #endif
 complex double z;
-],[
+]], [[
 z = _Complex_I;
-],[AC_DEFINE(GUILE_I,_Complex_I,[The imaginary unit (positive square root of -1).])
-   AC_MSG_RESULT([_Complex_I])],[AC_TRY_COMPILE([
+]])],
+    [AC_DEFINE(GUILE_I,_Complex_I,[The imaginary unit (positive square root of -1).])
+     AC_MSG_RESULT([_Complex_I])],
+    [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #if HAVE_COMPLEX_H
 #include <complex.h>
 #endif
 complex double z;
-],[
+]],[[
 z = 1.0fi;
-],[AC_DEFINE(GUILE_I,1.0fi)
-   AC_MSG_RESULT([1.0fi])],[ac_cv_type_complex_double=no
-                            AC_MSG_RESULT([not available])])])
+]])],
+  [AC_DEFINE(GUILE_I,1.0fi)
+   AC_MSG_RESULT([1.0fi])],
+  [ac_cv_type_complex_double=no
+   AC_MSG_RESULT([not available])])])
 fi
 
 # glibc 2.3.6 (circa 2006) and various prior versions had a bug where
@@ -755,7 +763,7 @@ if test "$ac_cv_type_complex_double" = yes; then
 
   AC_CACHE_CHECK([whether csqrt is usable],
     guile_cv_use_csqrt,
-    [AC_TRY_RUN([
+    [AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include <complex.h>
 /* "volatile" is meant to prevent gcc from calculating the sqrt as a
    constant, we want to test libc. */
@@ -768,7 +776,7 @@ main (void)
     return 0;  /* good */
   else
     return 1;  /* bad */
-}],
+}]])],
     [guile_cv_use_csqrt=yes],
     [guile_cv_use_csqrt="no, glibc 2.3 bug"],
     [guile_cv_use_csqrt="yes, hopefully (cross-compiling)"])])
@@ -785,8 +793,9 @@ AC_CHECK_LIB([gmp], [__gmpz_init], ,
   [AC_MSG_ERROR([GNU MP not found, see README])])
 
 # mpz_import is a macro so we need to include <gmp.h>
-AC_TRY_LINK([#include <gmp.h>],
-            [mpz_import (0, 0, 0, 0, 0, 0, 0);] , ,
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <gmp.h>]],
+ 			        [[mpz_import (0, 0, 0, 0, 0, 0, 0); ]])],
+  [],
   [AC_MSG_ERROR([At least GNU MP 4.1 is required, see README])])
 
 dnl i18n tests
@@ -864,11 +873,11 @@ AC_CHECK_MEMBERS([struct sockaddr.sin_len],,,
 
 AC_MSG_CHECKING(for __libc_stack_end)
 AC_CACHE_VAL(guile_cv_have_libc_stack_end,
-[AC_TRY_LINK([#include <stdio.h>
-extern char *__libc_stack_end;],
-             [printf("%p", (char*) __libc_stack_end);],
-             guile_cv_have_libc_stack_end=yes,
-             guile_cv_have_libc_stack_end=no)])
+[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
+extern char *__libc_stack_end;]],
+   [[printf("%p", (char*) __libc_stack_end);]])],
+   [guile_cv_have_libc_stack_end=yes],
+   [guile_cv_have_libc_stack_end=no])])
 AC_MSG_RESULT($guile_cv_have_libc_stack_end)
 
 if test $guile_cv_have_libc_stack_end = yes; then
@@ -881,9 +890,10 @@ dnl macro.  With cygwin it may be in a DLL.
 
 AC_MSG_CHECKING(whether netdb.h declares h_errno)
 AC_CACHE_VAL(guile_cv_have_h_errno,
-[AC_TRY_COMPILE([#include <netdb.h>],
-[int a = h_errno;],
-guile_cv_have_h_errno=yes, guile_cv_have_h_errno=no)])
+  [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <netdb.h>]],
+                                      [[int a = h_errno;]])],
+  [guile_cv_have_h_errno=yes],
+  [guile_cv_have_h_errno=no])])
 AC_MSG_RESULT($guile_cv_have_h_errno)
 if test $guile_cv_have_h_errno = yes; then
   AC_DEFINE(HAVE_H_ERRNO, 1, [Define if h_errno is declared in netdb.h.])
@@ -891,15 +901,16 @@ fi
 
 AC_MSG_CHECKING(whether uint32_t is defined)
 AC_CACHE_VAL(guile_cv_have_uint32_t,
-  [AC_TRY_COMPILE([#include <sys/types.h>
+  [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
 		   #if HAVE_STDINT_H
 		   #include <stdint.h>
                    #endif
 		   #ifndef HAVE_NETDB_H
 	           #include <netdb.h>
-		   #endif],
-		  [uint32_t a;],
-		  guile_cv_have_uint32_t=yes, guile_cv_have_uint32_t=no)])
+		   #endif]],
+		   [[uint32_t a;]])],
+		   [guile_cv_have_uint32_t=yes],
+		   [guile_cv_have_uint32_t=no])])
 AC_MSG_RESULT($guile_cv_have_uint32_t)
 if test $guile_cv_have_uint32_t = yes; then
   AC_DEFINE(HAVE_UINT32_T, 1,
@@ -908,14 +919,15 @@ fi
 
 AC_MSG_CHECKING(for working IPv6 support)
 AC_CACHE_VAL(guile_cv_have_ipv6,
-[AC_TRY_COMPILE([
+[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
 #include <netinet/in.h>
-#include <sys/socket.h>],
-[struct sockaddr_in6 a;  a.sin6_family = AF_INET6;],
-guile_cv_have_ipv6=yes, guile_cv_have_ipv6=no)])
+#include <sys/socket.h>]],
+[[struct sockaddr_in6 a;  a.sin6_family = AF_INET6;]])],
+[guile_cv_have_ipv6=yes],
+[guile_cv_have_ipv6=no])])
 AC_MSG_RESULT($guile_cv_have_ipv6)
 if test $guile_cv_have_ipv6 = yes; then
   AC_DEFINE(HAVE_IPV6, 1, [Define if you want support for IPv6.])
@@ -924,13 +936,14 @@ fi
 # included in rfc2553 but not in older implementations, e.g., glibc 2.1.3.
 AC_MSG_CHECKING(whether sockaddr_in6 has sin6_scope_id)
 AC_CACHE_VAL(guile_cv_have_sin6_scope_id,
-[AC_TRY_COMPILE([
+[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
-#include <netinet/in.h>],
-[struct sockaddr_in6 sok;  sok.sin6_scope_id = 0;],
-guile_cv_have_sin6_scope_id=yes, guile_cv_have_sin6_scope_id=no)])
+#include <netinet/in.h>]],
+[[struct sockaddr_in6 sok;  sok.sin6_scope_id = 0;]])],
+[guile_cv_have_sin6_scope_id=yes],
+[guile_cv_have_sin6_scope_id=no])])
 AC_MSG_RESULT($guile_cv_have_sin6_scope_id)
 if test $guile_cv_have_sin6_scope_id = yes; then
   AC_DEFINE(HAVE_SIN6_SCOPE_ID, 1,
@@ -947,7 +960,7 @@ AC_CHECK_MEMBERS([struct sockaddr_in6.sin6_len],,,
 AC_MSG_CHECKING(whether localtime caches TZ)
 AC_CACHE_VAL(guile_cv_localtime_cache,
 [if test x$ac_cv_func_tzset = xyes; then
-AC_TRY_RUN([#include <time.h>
+AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <time.h>
 #if STDC_HEADERS
 # include <stdlib.h>
 #endif
@@ -978,7 +991,9 @@ main()
   if (localtime (&now)->tm_hour != hour_unset)
     exit (1);
   exit (0);
-}], guile_cv_localtime_cache=no, guile_cv_localtime_cache=yes,
+}]])],
+[guile_cv_localtime_cache=no],
+[guile_cv_localtime_cache=yes],
 [# If we have tzset, assume the worst when cross-compiling.
 guile_cv_localtime_cache=yes])
 else
@@ -1099,12 +1114,12 @@ GUILE_STRUCT_UTIMBUF
 #--------------------------------------------------------------------
 
 SCM_I_GSC_STACK_GROWS_UP=0
-AC_TRY_RUN(aux (l) unsigned long l;
+AC_RUN_IFELSE([AC_LANG_SOURCE([[aux (l) unsigned long l;
 	     { int x; exit (l >= ((unsigned long)&x)); }
-	   main () { int q; aux((unsigned long)&q); },
-           [SCM_I_GSC_STACK_GROWS_UP=1],
-	   [],
-           [AC_MSG_WARN(Guessing that stack grows down -- see scmconfig.h)])
+	   main () { int q; aux((unsigned long)&q); }]])],
+  [SCM_I_GSC_STACK_GROWS_UP=1],
+  [],
+  [AC_MSG_WARN(Guessing that stack grows down -- see scmconfig.h)])
 
 AC_CHECK_SIZEOF(float)
 if test "$ac_cv_sizeof_float" -le "$ac_cv_sizeof_long"; then
@@ -1114,12 +1129,12 @@ fi
 
 AC_MSG_CHECKING(for struct linger)
 AC_CACHE_VAL(scm_cv_struct_linger,
-	AC_TRY_COMPILE([
+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include <sys/types.h>
-#include <sys/socket.h>],
-			[struct linger lgr;  lgr.l_linger = 100],
-			scm_cv_struct_linger="yes",
-			scm_cv_struct_linger="no"))
+#include <sys/socket.h>]],
+	                  [[struct linger lgr;  lgr.l_linger = 100]])],
+			  [scm_cv_struct_linger="yes"],
+			  [scm_cv_struct_linger="no"]))
 AC_MSG_RESULT($scm_cv_struct_linger)
 if test $scm_cv_struct_linger = yes; then
 	AC_DEFINE(HAVE_STRUCT_LINGER, 1,
@@ -1132,14 +1147,13 @@ fi
 #
 AC_MSG_CHECKING(for struct timespec)
 AC_CACHE_VAL(scm_cv_struct_timespec,
-	AC_TRY_COMPILE([
+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include <time.h>
 #if HAVE_PTHREAD_H
 #include <pthread.h>
-#endif],
-			[struct timespec t;  t.tv_nsec = 100],
-			scm_cv_struct_timespec="yes",
-			scm_cv_struct_timespec="no"))
+#endif]], [[struct timespec t;  t.tv_nsec = 100]])],
+          [scm_cv_struct_timespec="yes"],
+          [scm_cv_struct_timespec="no"]))
 AC_MSG_RESULT($scm_cv_struct_timespec)
 if test $scm_cv_struct_timespec = yes; then
   AC_DEFINE(HAVE_STRUCT_TIMESPEC, 1,
@@ -1259,8 +1273,7 @@ if test "$with_threads" = pthreads; then
 AC_MSG_CHECKING(whether pthread_attr_getstack works for the main thread)
 old_CFLAGS="$CFLAGS"
 CFLAGS="$PTHREAD_CFLAGS $CFLAGS"
-AC_TRY_RUN(
-[
+AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #if HAVE_PTHREAD_ATTR_GETSTACK
 #include <pthread.h>
 
@@ -1285,10 +1298,11 @@ int main ()
   return 1;
 }
 #endif
-],
+]])],
 [works=yes
 AC_DEFINE(PTHREAD_ATTR_GETSTACK_WORKS, [1], [Define when pthread_att_get_stack works for the main thread])],
-[works=no])
+[works=no],
+[])
 CFLAGS="$old_CFLAGS"
 AC_MSG_RESULT($works)