Merge commit '29776e85da637ec4d44b2b2822d6934a50c0084b' into boehm-demers-weiser-gc

[bpt/guile.git] / configure.in

diff --git a/configure.in b/configure.in
index cad32b9..541e3a6 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -25,7 +25,7 @@ Boston, MA 02110-1301, USA.
 
 ]])
 
-AC_PREREQ(2.53)
+AC_PREREQ(2.59)
 
 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
@@ -37,9 +37,11 @@ AC_INIT(patsubst(m4_esyscmd(. ./GUILE-VERSION && echo ${PACKAGE}),[
         patsubst(m4_esyscmd(. ./GUILE-VERSION && echo ${GUILE_VERSION}),[
 ]),
         [bug-guile@gnu.org])
-AC_CONFIG_AUX_DIR([.])
+AC_CONFIG_AUX_DIR([build-aux])
+AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR(GUILE-VERSION)
-AM_INIT_AUTOMAKE([no-define])
+
+AM_INIT_AUTOMAKE([gnu no-define check-news])
 
 AC_COPYRIGHT(GUILE_CONFIGURE_COPYRIGHT)
 AC_CONFIG_SRCDIR([GUILE-VERSION])
@@ -66,12 +68,12 @@ AC_LIBTOOL_WIN32_DLL
 
 AC_PROG_INSTALL
 AC_PROG_CC
+gl_EARLY
 AC_PROG_CPP
 AC_PROG_AWK
 
-AC_AIX
-AC_ISC_POSIX
-AC_MINIX
+dnl Gnulib.
+gl_INIT
 
 AM_PROG_CC_STDC
 # for per-target cflags in the libguile subdir
@@ -546,7 +548,7 @@ AC_CHECK_HEADERS([complex.h fenv.h io.h libc.h limits.h malloc.h memory.h proces
 regex.h rxposix.h rx/rxposix.h sys/dir.h sys/ioctl.h sys/select.h \
 sys/time.h sys/timeb.h sys/times.h sys/stdtypes.h sys/types.h \
 sys/utime.h time.h unistd.h utime.h pwd.h grp.h sys/utsname.h \
-strings.h direct.h langinfo.h nl_types.h])
+direct.h langinfo.h nl_types.h])
 
 # "complex double" is new in C99, and "complex" is only a keyword if
 # <complex.h> is included
@@ -621,6 +623,9 @@ AC_CHECK_HEADERS([assert.h crt_externs.h])
 #   DQNAN - OSF specific
 #       (DINFINITY and DQNAN are actually global variables, not functions)
 #   chsize - an MS-DOS-ism, found in mingw
+#   cexp, clog - not in various pre-c99 systems, and note that it's possible
+#       for gcc to provide the "complex double" type but the system to not
+#       have functions like cexp and clog
 #   clog10 - not in mingw (though others like clog and csqrt are)
 #   fesetround - available in C99, but not older systems
 #   ftruncate - posix, but probably not older systems (current mingw
@@ -638,7 +643,7 @@ AC_CHECK_HEADERS([assert.h crt_externs.h])
 #   strcoll_l, newlocale - GNU extensions (glibc), also available on Darwin
 #   nl_langinfo - X/Open, not available on Windows.
 #
-AC_CHECK_FUNCS([DINFINITY DQNAN chsize clog10 ctermid fesetround ftime ftruncate fchown getcwd geteuid gettimeofday gmtime_r ioctl lstat mkdir mknod nice pipe _pipe readdir_r readlink rename rmdir select setegid seteuid setlocale setpgid setsid sigaction siginterrupt stat64 strftime strptime symlink sync sysconf tcgetpgrp tcsetpgrp times uname waitpid strdup system usleep atexit on_exit chown link fcntl ttyname getpwent getgrent kill getppid getpgrp fork setitimer getitimer strchr strcmp index bcopy memcpy rindex truncate unsetenv isblank _NSGetEnviron strncasecmp strcoll strcoll_l newlocale nl_langinfo])
+AC_CHECK_FUNCS([DINFINITY DQNAN cexp chsize clog clog10 ctermid fesetround ftime ftruncate fchown getcwd geteuid gettimeofday gmtime_r ioctl lstat mkdir mknod nice pipe _pipe readdir_r readlink rename rmdir select setegid seteuid setlocale setpgid setsid sigaction siginterrupt stat64 strftime strptime symlink sync sysconf tcgetpgrp tcsetpgrp times uname waitpid strdup system usleep atexit on_exit chown link fcntl ttyname getpwent getgrent kill getppid getpgrp fork setitimer getitimer strchr strcmp index bcopy memcpy rindex truncate unsetenv isblank _NSGetEnviron strcoll strcoll_l newlocale nl_langinfo])
 
 # Reasons for testing:
 #   netdb.h - not in mingw
@@ -676,7 +681,6 @@ AC_SEARCH_LIBS(crypt, crypt,
 #
 if test "$ac_cv_type_complex_double" = yes; then
 
-  AC_CHECK_FUNCS(cexp clog carg)                        
   AC_CACHE_CHECK([whether csqrt is usable],
     guile_cv_use_csqrt,
     [AC_TRY_RUN([
@@ -987,16 +991,6 @@ int main () { return (isnan(x) != 0); }]]),
              [Define to 1 if you have the `isnan' macro or function.])],
   [AC_MSG_RESULT([no])])
 
-# We must have a proper stack-using alloca in order for stack-copying
-# continuations to work properly.  If we don't find a native one,
-# abort.
-
-AC_FUNC_ALLOCA
-if test "$ALLOCA" = "alloca.o"
-then
-  AC_ERROR([No native alloca found.])
-fi
-
 # Reasons for checking:
 #
 #     st_rdev
@@ -1362,6 +1356,7 @@ AC_CONFIG_FILES([libguile/gen-scmconfig.h])
 AC_CONFIG_FILES([
   Makefile
   am/Makefile
+  lib/Makefile
   benchmark-suite/Makefile
   doc/Makefile
   doc/goops/Makefile