mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-06 20:20:20 +02:00
Code Activity

Update to Autoconf 2.61.

Browse source
This commit is contained in:
Ludovic Courtès 2008-07-06 19:53:49 +02:00
parent 47463c8fd7
commit 34ca35ed4d
2 changed files with 79 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -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> 2008-06-28 Ludovic Courtès <ludo@gnu.org>
* configure.in: Use Automake with `-Wall -Wno-override'. * configure.in: Use Automake with `-Wall -Wno-override'.

128
configure.in
View file

@ -25,7 +25,7 @@ Boston, MA 02110-1301, USA.
]]) ]])
AC_PREREQ(2.53) AC_PREREQ(2.61)
dnl `patsubst' here deletes the newline which "echo" prints. We can't use 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 "echo -n" since -n is not portable (see autoconf manual "Limitations of
@ -49,7 +49,7 @@ AC_CONFIG_SRCDIR([GUILE-VERSION])
. $srcdir/GUILE-VERSION . $srcdir/GUILE-VERSION
AM_MAINTAINER_MODE AM_MAINTAINER_MODE
AM_CONFIG_HEADER([config.h]) AC_CONFIG_HEADERS([config.h])
AH_TOP(/*GUILE_CONFIGURE_COPYRIGHT*/) AH_TOP(/*GUILE_CONFIGURE_COPYRIGHT*/)
#-------------------------------------------------------------------- #--------------------------------------------------------------------
@ -62,8 +62,11 @@ AC_CONFIG_SUBDIRS(guile-readline)
#-------------------------------------------------------------------- #--------------------------------------------------------------------
AC_LANG([C])
dnl Some more checks for Win32 dnl Some more checks for Win32
AC_CYGWIN AC_CANONICAL_HOST
AC_LIBTOOL_WIN32_DLL AC_LIBTOOL_WIN32_DLL
AC_PROG_INSTALL AC_PROG_INSTALL
@ -75,7 +78,8 @@ AC_AIX
AC_ISC_POSIX AC_ISC_POSIX
AC_MINIX AC_MINIX
AM_PROG_CC_STDC AC_PROG_CC_C89
# for per-target cflags in the libguile subdir # for per-target cflags in the libguile subdir
AM_PROG_CC_C_O AM_PROG_CC_C_O
@ -124,7 +128,7 @@ AC_ARG_ENABLE(debug-malloc,
SCM_I_GSC_GUILE_DEBUG=0 SCM_I_GSC_GUILE_DEBUG=0
AC_ARG_ENABLE(guile-debug, AC_ARG_ENABLE(guile-debug,
[AC_HELP_STRING([--enable-guile-debug], [AS_HELP_STRING([--enable-guile-debug],
[include internal debugging functions])], [include internal debugging functions])],
if test "$enable_guile_debug" = y || test "$enable_guile_debug" = yes; then if test "$enable_guile_debug" = y || test "$enable_guile_debug" = yes; then
SCM_I_GSC_GUILE_DEBUG=1 SCM_I_GSC_GUILE_DEBUG=1
@ -143,7 +147,7 @@ AC_ARG_ENABLE(regex,
enable_regex=yes) enable_regex=yes)
AC_ARG_ENABLE([discouraged], 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 if test "$enable_discouraged" = no; then
SCM_I_GSC_ENABLE_DISCOURAGED=0 SCM_I_GSC_ENABLE_DISCOURAGED=0
@ -152,7 +156,7 @@ else
fi fi
AC_ARG_ENABLE([deprecated], 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 if test "$enable_deprecated" = no; then
SCM_I_GSC_ENABLE_DEPRECATED=0 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. dnl wasn't building before.
AC_MSG_CHECKING([whether to use system and library "64" calls]) AC_MSG_CHECKING([whether to use system and library "64" calls])
AC_ARG_WITH([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]), [don't attempt to use system and library calls with "64" in their names]),
[use_64_calls=$withval], [use_64_calls=$withval],
[use_64_calls=yes [use_64_calls=yes
@ -725,23 +729,27 @@ AC_SEARCH_LIBS(crypt, crypt,
# is a workaround for the failure of some systems to conform to C99. # is a workaround for the failure of some systems to conform to C99.
if test "$ac_cv_type_complex_double" = yes; then if test "$ac_cv_type_complex_double" = yes; then
AC_MSG_CHECKING([for i]) AC_MSG_CHECKING([for i])
AC_TRY_COMPILE([ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#if HAVE_COMPLEX_H #if HAVE_COMPLEX_H
#include <complex.h> #include <complex.h>
#endif #endif
complex double z; complex double z;
],[ ]], [[
z = _Complex_I; 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 #if HAVE_COMPLEX_H
#include <complex.h> #include <complex.h>
#endif #endif
complex double z; complex double z;
],[ ]],[[
z = 1.0fi; z = 1.0fi;
],[AC_DEFINE(GUILE_I,1.0fi) ]])],
AC_MSG_RESULT([1.0fi])],[ac_cv_type_complex_double=no [AC_DEFINE(GUILE_I,1.0fi)
AC_MSG_RESULT([1.0fi])],
[ac_cv_type_complex_double=no
AC_MSG_RESULT([not available])])]) AC_MSG_RESULT([not available])])])
fi fi
@ -752,7 +760,7 @@ fi
if test "$ac_cv_type_complex_double" = yes; then if test "$ac_cv_type_complex_double" = yes; then
AC_CACHE_CHECK([whether csqrt is usable], AC_CACHE_CHECK([whether csqrt is usable],
guile_cv_use_csqrt, guile_cv_use_csqrt,
[AC_TRY_RUN([ [AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include <complex.h> #include <complex.h>
/* "volatile" is meant to prevent gcc from calculating the sqrt as a /* "volatile" is meant to prevent gcc from calculating the sqrt as a
constant, we want to test libc. */ constant, we want to test libc. */
@ -765,7 +773,7 @@ main (void)
return 0; /* good */ return 0; /* good */
else else
return 1; /* bad */ return 1; /* bad */
}], }]])],
[guile_cv_use_csqrt=yes], [guile_cv_use_csqrt=yes],
[guile_cv_use_csqrt="no, glibc 2.3 bug"], [guile_cv_use_csqrt="no, glibc 2.3 bug"],
[guile_cv_use_csqrt="yes, hopefully (cross-compiling)"])]) [guile_cv_use_csqrt="yes, hopefully (cross-compiling)"])])
@ -782,8 +790,9 @@ AC_CHECK_LIB([gmp], [__gmpz_init], ,
[AC_MSG_ERROR([GNU MP not found, see README])]) [AC_MSG_ERROR([GNU MP not found, see README])])
# mpz_import is a macro so we need to include <gmp.h> # mpz_import is a macro so we need to include <gmp.h>
AC_TRY_LINK([#include <gmp.h>], AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <gmp.h>]],
[mpz_import (0, 0, 0, 0, 0, 0, 0);] , , [[mpz_import (0, 0, 0, 0, 0, 0, 0); ]])],
[],
[AC_MSG_ERROR([At least GNU MP 4.1 is required, see README])]) [AC_MSG_ERROR([At least GNU MP 4.1 is required, see README])])
dnl i18n tests dnl i18n tests
@ -861,11 +870,11 @@ AC_CHECK_MEMBERS([struct sockaddr.sin_len],,,
AC_MSG_CHECKING(for __libc_stack_end) AC_MSG_CHECKING(for __libc_stack_end)
AC_CACHE_VAL(guile_cv_have_libc_stack_end, AC_CACHE_VAL(guile_cv_have_libc_stack_end,
[AC_TRY_LINK([#include <stdio.h> [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
extern char *__libc_stack_end;], extern char *__libc_stack_end;]],
[printf("%p", (char*) __libc_stack_end);], [[printf("%p", (char*) __libc_stack_end);]])],
guile_cv_have_libc_stack_end=yes, [guile_cv_have_libc_stack_end=yes],
guile_cv_have_libc_stack_end=no)]) [guile_cv_have_libc_stack_end=no])])
AC_MSG_RESULT($guile_cv_have_libc_stack_end) AC_MSG_RESULT($guile_cv_have_libc_stack_end)
if test $guile_cv_have_libc_stack_end = yes; then if test $guile_cv_have_libc_stack_end = yes; then
@ -878,9 +887,10 @@ dnl macro. With cygwin it may be in a DLL.
AC_MSG_CHECKING(whether netdb.h declares h_errno) AC_MSG_CHECKING(whether netdb.h declares h_errno)
AC_CACHE_VAL(guile_cv_have_h_errno, AC_CACHE_VAL(guile_cv_have_h_errno,
[AC_TRY_COMPILE([#include <netdb.h>], [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <netdb.h>]],
[int a = h_errno;], [[int a = h_errno;]])],
guile_cv_have_h_errno=yes, guile_cv_have_h_errno=no)]) [guile_cv_have_h_errno=yes],
[guile_cv_have_h_errno=no])])
AC_MSG_RESULT($guile_cv_have_h_errno) AC_MSG_RESULT($guile_cv_have_h_errno)
if test $guile_cv_have_h_errno = yes; then if test $guile_cv_have_h_errno = yes; then
AC_DEFINE(HAVE_H_ERRNO, 1, [Define if h_errno is declared in netdb.h.]) AC_DEFINE(HAVE_H_ERRNO, 1, [Define if h_errno is declared in netdb.h.])
@ -888,15 +898,16 @@ fi
AC_MSG_CHECKING(whether uint32_t is defined) AC_MSG_CHECKING(whether uint32_t is defined)
AC_CACHE_VAL(guile_cv_have_uint32_t, 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 #if HAVE_STDINT_H
#include <stdint.h> #include <stdint.h>
#endif #endif
#ifndef HAVE_NETDB_H #ifndef HAVE_NETDB_H
#include <netdb.h> #include <netdb.h>
#endif], #endif]],
[uint32_t a;], [[uint32_t a;]])],
guile_cv_have_uint32_t=yes, guile_cv_have_uint32_t=no)]) [guile_cv_have_uint32_t=yes],
[guile_cv_have_uint32_t=no])])
AC_MSG_RESULT($guile_cv_have_uint32_t) AC_MSG_RESULT($guile_cv_have_uint32_t)
if test $guile_cv_have_uint32_t = yes; then if test $guile_cv_have_uint32_t = yes; then
AC_DEFINE(HAVE_UINT32_T, 1, AC_DEFINE(HAVE_UINT32_T, 1,
@ -905,14 +916,15 @@ fi
AC_MSG_CHECKING(for working IPv6 support) AC_MSG_CHECKING(for working IPv6 support)
AC_CACHE_VAL(guile_cv_have_ipv6, AC_CACHE_VAL(guile_cv_have_ipv6,
[AC_TRY_COMPILE([ [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#ifdef HAVE_SYS_TYPES_H #ifdef HAVE_SYS_TYPES_H
#include <sys/types.h> #include <sys/types.h>
#endif #endif
#include <netinet/in.h> #include <netinet/in.h>
#include <sys/socket.h>], #include <sys/socket.h>]],
[struct sockaddr_in6 a; a.sin6_family = AF_INET6;], [[struct sockaddr_in6 a; a.sin6_family = AF_INET6;]])],
guile_cv_have_ipv6=yes, guile_cv_have_ipv6=no)]) [guile_cv_have_ipv6=yes],
[guile_cv_have_ipv6=no])])
AC_MSG_RESULT($guile_cv_have_ipv6) AC_MSG_RESULT($guile_cv_have_ipv6)
if test $guile_cv_have_ipv6 = yes; then if test $guile_cv_have_ipv6 = yes; then
AC_DEFINE(HAVE_IPV6, 1, [Define if you want support for IPv6.]) AC_DEFINE(HAVE_IPV6, 1, [Define if you want support for IPv6.])
@ -921,13 +933,14 @@ fi
# included in rfc2553 but not in older implementations, e.g., glibc 2.1.3. # 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_MSG_CHECKING(whether sockaddr_in6 has sin6_scope_id)
AC_CACHE_VAL(guile_cv_have_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 #ifdef HAVE_SYS_TYPES_H
#include <sys/types.h> #include <sys/types.h>
#endif #endif
#include <netinet/in.h>], #include <netinet/in.h>]],
[struct sockaddr_in6 sok; sok.sin6_scope_id = 0;], [[struct sockaddr_in6 sok; sok.sin6_scope_id = 0;]])],
guile_cv_have_sin6_scope_id=yes, guile_cv_have_sin6_scope_id=no)]) [guile_cv_have_sin6_scope_id=yes],
[guile_cv_have_sin6_scope_id=no])])
AC_MSG_RESULT($guile_cv_have_sin6_scope_id) AC_MSG_RESULT($guile_cv_have_sin6_scope_id)
if test $guile_cv_have_sin6_scope_id = yes; then if test $guile_cv_have_sin6_scope_id = yes; then
AC_DEFINE(HAVE_SIN6_SCOPE_ID, 1, AC_DEFINE(HAVE_SIN6_SCOPE_ID, 1,
@ -944,7 +957,7 @@ AC_CHECK_MEMBERS([struct sockaddr_in6.sin6_len],,,
AC_MSG_CHECKING(whether localtime caches TZ) AC_MSG_CHECKING(whether localtime caches TZ)
AC_CACHE_VAL(guile_cv_localtime_cache, AC_CACHE_VAL(guile_cv_localtime_cache,
[if test x$ac_cv_func_tzset = xyes; then [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 #if STDC_HEADERS
# include <stdlib.h> # include <stdlib.h>
#endif #endif
@ -975,7 +988,9 @@ main()
if (localtime (&now)->tm_hour != hour_unset) if (localtime (&now)->tm_hour != hour_unset)
exit (1); exit (1);
exit (0); 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. [# If we have tzset, assume the worst when cross-compiling.
guile_cv_localtime_cache=yes]) guile_cv_localtime_cache=yes])
else else
@ -1106,9 +1121,9 @@ GUILE_STRUCT_UTIMBUF
#-------------------------------------------------------------------- #--------------------------------------------------------------------
SCM_I_GSC_STACK_GROWS_UP=0 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)); } { int x; exit (l >= ((unsigned long)&x)); }
main () { int q; aux((unsigned long)&q); }, main () { int q; aux((unsigned long)&q); }]])],
[SCM_I_GSC_STACK_GROWS_UP=1], [SCM_I_GSC_STACK_GROWS_UP=1],
[], [],
[AC_MSG_WARN(Guessing that stack grows down -- see scmconfig.h)]) [AC_MSG_WARN(Guessing that stack grows down -- see scmconfig.h)])
@ -1121,12 +1136,12 @@ fi
AC_MSG_CHECKING(for struct linger) AC_MSG_CHECKING(for struct linger)
AC_CACHE_VAL(scm_cv_struct_linger, AC_CACHE_VAL(scm_cv_struct_linger,
AC_TRY_COMPILE([ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h>], #include <sys/socket.h>]],
[struct linger lgr; lgr.l_linger = 100], [[struct linger lgr; lgr.l_linger = 100]])],
scm_cv_struct_linger="yes", [scm_cv_struct_linger="yes"],
scm_cv_struct_linger="no")) [scm_cv_struct_linger="no"]))
AC_MSG_RESULT($scm_cv_struct_linger) AC_MSG_RESULT($scm_cv_struct_linger)
if test $scm_cv_struct_linger = yes; then if test $scm_cv_struct_linger = yes; then
AC_DEFINE(HAVE_STRUCT_LINGER, 1, AC_DEFINE(HAVE_STRUCT_LINGER, 1,
@ -1139,14 +1154,13 @@ fi
# #
AC_MSG_CHECKING(for struct timespec) AC_MSG_CHECKING(for struct timespec)
AC_CACHE_VAL(scm_cv_struct_timespec, AC_CACHE_VAL(scm_cv_struct_timespec,
AC_TRY_COMPILE([ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include <time.h> #include <time.h>
#if HAVE_PTHREAD_H #if HAVE_PTHREAD_H
#include <pthread.h> #include <pthread.h>
#endif], #endif]], [[struct timespec t; t.tv_nsec = 100]])],
[struct timespec t; t.tv_nsec = 100], [scm_cv_struct_timespec="yes"],
scm_cv_struct_timespec="yes", [scm_cv_struct_timespec="no"]))
scm_cv_struct_timespec="no"))
AC_MSG_RESULT($scm_cv_struct_timespec) AC_MSG_RESULT($scm_cv_struct_timespec)
if test $scm_cv_struct_timespec = yes; then if test $scm_cv_struct_timespec = yes; then
AC_DEFINE(HAVE_STRUCT_TIMESPEC, 1, AC_DEFINE(HAVE_STRUCT_TIMESPEC, 1,
@ -1266,8 +1280,7 @@ if test "$with_threads" = pthreads; then
AC_MSG_CHECKING(whether pthread_attr_getstack works for the main thread) AC_MSG_CHECKING(whether pthread_attr_getstack works for the main thread)
old_CFLAGS="$CFLAGS" old_CFLAGS="$CFLAGS"
CFLAGS="$PTHREAD_CFLAGS $CFLAGS" CFLAGS="$PTHREAD_CFLAGS $CFLAGS"
AC_TRY_RUN( AC_RUN_IFELSE([AC_LANG_SOURCE([[
[
#if HAVE_PTHREAD_ATTR_GETSTACK #if HAVE_PTHREAD_ATTR_GETSTACK
#include <pthread.h> #include <pthread.h>
@ -1292,10 +1305,11 @@ int main ()
return 1; return 1;
} }
#endif #endif
], ]])],
[works=yes [works=yes
AC_DEFINE(PTHREAD_ATTR_GETSTACK_WORKS, [1], [Define when pthread_att_get_stack works for the main thread])], 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" CFLAGS="$old_CFLAGS"
AC_MSG_RESULT($works) AC_MSG_RESULT($works)