Autoconf 2.62

[Ludovic Courtès]

Hi,

I just upgraded from Autoconf 2.61 to 2.62 and noticed that it complains
a little:

  configure.in:76: warning: AC_COMPILE_IFELSE was called before 
AC_USE_SYSTEM_EXTENSIONS
  ../../lib/autoconf/specific.m4:385: AC_USE_SYSTEM_EXTENSIONS is expanded 
from...
  ../../lib/autoconf/specific.m4:456: AC_MINIX is expanded from...
  configure.in:76: the top level

Running `autoupdate' in `branch_release-1-8' yields the attached path.
Some of the things changed have long been obsolete, like the `AC_TRY_'
macros and `AC_HELP_STRING', while others may be more recent.

Question: should we update to 2.62 (and have `AC_PREREQ(2.62)') or not?
We can also choose to do it in `master' but no in 1.8.  I'd be in favor
of doing it in both branches.

Thanks,
Ludovic.

diff --git a/configure.in b/configure.in
index 153d4ca..7b29d42 100644
--- a/configure.in
+++ b/configure.in
@@ -25,18 +25,16 @@ Boston, MA 02110-1301, USA.
 
 ]])
 
-AC_PREREQ(2.53)
+AC_PREREQ(2.62)
 
 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
 dnl  Builtins"), in particular on solaris it results in a literal "-n" in
 dnl  the output.
 dnl
-AC_INIT(patsubst(m4_esyscmd(. ./GUILE-VERSION && echo ${PACKAGE}),[
-]),
-        patsubst(m4_esyscmd(. ./GUILE-VERSION && echo ${GUILE_VERSION}),[
-]),
-        address@hidden)
+AC_INIT([patsubst(m4_esyscmd(. ./GUILE-VERSION && echo ${PACKAGE}),
+)],[patsubst(m4_esyscmd(. ./GUILE-VERSION && echo ${GUILE_VERSION}),
+)],address@hidden)
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR(GUILE-VERSION)
@@ -49,7 +47,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*/)
 
 #--------------------------------------------------------------------
@@ -63,7 +61,14 @@ AC_CONFIG_SUBDIRS(guile-readline)
 #--------------------------------------------------------------------
 
 dnl Some more checks for Win32
-AC_CYGWIN
+AC_DIAGNOSE([obsolete],[AC_CYGWIN is obsolete: use AC_CANONICAL_HOST and check 
if $host_os
+matches *cygwin*])dnl
+AC_CANONICAL_HOST
+case $host_os in
+  *cygwin* ) CYGWIN=yes;;
+        * ) CYGWIN=no;;
+esac
+
 AC_LIBTOOL_WIN32_DLL
 
 AC_PROG_INSTALL
@@ -71,11 +76,18 @@ AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_AWK
 
-AC_AIX
-AC_ISC_POSIX
-AC_MINIX
+AC_USE_SYSTEM_EXTENSIONS
+AC_SEARCH_LIBS([strerror],[cposix])
+AC_USE_SYSTEM_EXTENSIONS
+
+AC_PROG_CC
+AC_DIAGNOSE([obsolete],[AM_PROG_CC_STDC:
+       your code should no longer depend upon `am_cv_prog_cc_stdc', but upon
+       `ac_cv_prog_cc_stdc'.  Remove this warning and the assignment when
+       you adjust the code.  You can also remove the above call to
+       AC_PROG_CC if you already called it elsewhere.])
+am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
 
-AM_PROG_CC_STDC
 # for per-target cflags in the libguile subdir
 AM_PROG_CC_C_O
 
@@ -124,8 +136,7 @@ AC_ARG_ENABLE(debug-malloc,
 
 SCM_I_GSC_GUILE_DEBUG=0
 AC_ARG_ENABLE(guile-debug,
-  [AC_HELP_STRING([--enable-guile-debug],
-                  [include internal debugging functions])],
+  [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
   fi)
@@ -143,7 +154,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 +163,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,8 +209,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],
-                 [don't attempt to use system and library calls with "64" in 
their names]),
+  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
    case $host in
@@ -725,15 +735,15 @@ 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])],[_au_m4_changequote([,])AC_TRY_COMPILE([
 #if HAVE_COMPLEX_H
 #include <complex.h>
 #endif
@@ -752,7 +762,7 @@ fi
 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. */
@@ -765,10 +775,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)"])])
+}]])],[guile_cv_use_csqrt=yes],[guile_cv_use_csqrt="no, glibc 2.3 
bug"],[guile_cv_use_csqrt="yes, hopefully (cross-compiling)"])])
   case $guile_cv_use_csqrt in
     yes*)
       AC_DEFINE(HAVE_USABLE_CSQRT, 1, [Define to 1 if csqrt is bug-free])
@@ -782,9 +789,7 @@ 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_MSG_ERROR([At least GNU MP 4.1 is required, see README])])
+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
 #AC_CHECK_HEADERS([libintl.h])
@@ -861,11 +866,8 @@ 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
@@ -878,9 +880,7 @@ 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.])
@@ -888,15 +888,13 @@ 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,
@@ -905,14 +903,12 @@ 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.])
@@ -921,13 +917,11 @@ 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,
@@ -944,7 +938,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
@@ -975,8 +969,7 @@ main()
   if (localtime (&now)->tm_hour != hour_unset)
     exit (1);
   exit (0);
-}], guile_cv_localtime_cache=no, guile_cv_localtime_cache=yes,
-[# If we have tzset, assume the worst when cross-compiling.
+}]])],[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
         # If we lack tzset, report that localtime does not cache TZ,
@@ -1067,7 +1060,7 @@ int main () { return (isnan(x) != 0); }]]),
 AC_FUNC_ALLOCA
 if test "$ALLOCA" = "alloca.o"
 then
-  AC_ERROR([No native alloca found.])
+  AC_MSG_ERROR([No native alloca found.])
 fi
 
 # Reasons for checking:
@@ -1106,12 +1099,9 @@ 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
@@ -1121,12 +1111,9 @@ 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,
@@ -1139,14 +1126,11 @@ 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,
@@ -1266,8 +1250,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>
 
@@ -1292,10 +1275,8 @@ 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=yes
+AC_DEFINE(PTHREAD_ATTR_GETSTACK_WORKS, [1], [Define when pthread_att_get_stack 
works for the main thread])],[works=no],[])
 CFLAGS="$old_CFLAGS"
 AC_MSG_RESULT($works)