X-Git-Url: http://git.hcoop.net/bpt/guile.git/blobdiff_plain/a73256d0181d97b1b8743e0e9e27467735867994..a483777244b2645a8477f733c19f43034a6ac4d3:/configure.in diff --git a/configure.in b/configure.in index 0fe842e01..2cf1d716c 100644 --- a/configure.in +++ b/configure.in @@ -27,11 +27,16 @@ Boston, MA 02111-1307, USA. AC_PREREQ(2.53) -AC_INIT +AC_INIT(m4_esyscmd(. ./GUILE-VERSION && echo -n ${PACKAGE}), + m4_esyscmd(. ./GUILE-VERSION && echo -n ${GUILE_VERSION})) +AC_CONFIG_SRCDIR(GUILE-VERSION) +AM_INIT_AUTOMAKE([no-define]) + AC_COPYRIGHT(GUILE_CONFIGURE_COPYRIGHT) AC_CONFIG_SRCDIR([GUILE-VERSION]) + . $srcdir/GUILE-VERSION -AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define) + AM_MAINTAINER_MODE AM_CONFIG_HEADER([config.h]) AH_TOP(/*GUILE_CONFIGURE_COPYRIGHT*/) @@ -42,6 +47,7 @@ AH_TOP(/*GUILE_CONFIGURE_COPYRIGHT*/) # #-------------------------------------------------------------------- +AC_CONFIG_SUBDIRS(libltdl) AC_CONFIG_SUBDIRS(guile-readline) #-------------------------------------------------------------------- @@ -63,8 +69,12 @@ AC_MINIX AM_PROG_CC_STDC AC_LIBTOOL_DLOPEN +AC_LIBLTDL_INSTALLABLE AC_PROG_LIBTOOL -AC_LIB_LTDL + +AC_SUBST(DLPREOPEN) +AC_SUBST(LTDLINCL) +AC_SUBST(LIBLTDL) AC_CHECK_PROG(have_makeinfo, makeinfo, yes, no) AM_CONDITIONAL(HAVE_MAKEINFO, test "$have_makeinfo" = yes) @@ -127,27 +137,14 @@ AC_ARG_ENABLE(regex, [ --disable-regex omit regular expression interfaces],, enable_regex=yes) -AC_ARG_ENABLE(htmldoc, - [ --enable-htmldoc build HTML documentation as well as Info], - [if test "$enable_htmldoc" = "" || test "$enable_htmldoc" = y || test "$enable_htmldoc" = yes; then - htmldoc_enabled=yes - AC_PATH_PROG(TEXI2HTML, texi2html, not found) - if test "$TEXI2HTML" = "not found"; then - echo - echo Building HTML documentation requires the \`texi2html\' program, - echo which appears not to be present on your machine. - echo - echo \`texi2html\' is available from - echo 'http://www.mathematik.uni-kl.de/~obachman/Texi2html/.' - echo - echo In the meantime, to build the guile-doc distribution - echo without HTML enabled, please rerun \`./configure\' without - echo the \`--enable-htmldoc\' option. - exit -1 - fi - fi]) +AC_ARG_ENABLE([discouraged], + AC_HELP_STRING([--disable-discouraged],[omit discouraged features])) -AM_CONDITIONAL(HTMLDOC, test x$htmldoc_enabled = xyes) +if test "$enable_discouraged" = no; then + SCM_I_GSC_ENABLE_DISCOURAGED=0 +else + SCM_I_GSC_ENABLE_DISCOURAGED=1 +fi AC_ARG_ENABLE([deprecated], AC_HELP_STRING([--disable-deprecated],[omit deprecated features])) @@ -198,13 +195,6 @@ if test "$use_modules" != no; then AC_LIBOBJ([dynl]) fi -SCM_I_GSC_HAVE_ARRAYS=0 -if test "$enable_arrays" = yes; then - AC_LIBOBJ([ramap]) - AC_LIBOBJ([unif]) - SCM_I_GSC_HAVE_ARRAYS=1 -fi - if test "$enable_posix" = yes; then AC_LIBOBJ([filesys]) AC_LIBOBJ([posix]) @@ -257,12 +247,13 @@ AC_CHECK_SIZEOF(void *) AC_CHECK_SIZEOF(intptr_t) AC_CHECK_SIZEOF(uintptr_t) AC_CHECK_SIZEOF(ptrdiff_t) +AC_CHECK_SIZEOF(size_t) if test "$ac_cv_sizeof_long" -ne "$ac_cv_sizeof_void_p"; then AC_MSG_ERROR(sizes of long and void* are not identical) fi -if test "$ac_cv_sizeof_ptrdiff_t" -eq 0; then +if test "$ac_cv_sizeof_ptrdiff_t" -ne 0; then SCM_I_GSC_T_PTRDIFF='"ptrdiff_t"' else SCM_I_GSC_T_PTRDIFF='"long"' @@ -272,6 +263,8 @@ AC_SUBST([SCM_I_GSC_T_PTRDIFF]) AC_CHECK_HEADERS([stdint.h]) AC_CHECK_HEADERS([inttypes.h]) +AC_CHECK_SIZEOF(intmax_t) + SCM_I_GSC_NEEDS_STDINT_H=0 SCM_I_GSC_NEEDS_INTTYPES_H=0 @@ -338,61 +331,60 @@ fi # Try hard to find definitions for some required scm_t_*int* types. ### Required type scm_t_int8 -if test "$ac_cv_sizeof_char" -eq 1; then - SCM_I_GSC_T_INT8='"char"' -elif test "$scm_stdint_has_int8"; then +if test "$scm_stdint_has_int8"; then SCM_I_GSC_T_INT8='"int8_t"' SCM_I_GSC_NEEDS_STDINT_H=1 elif test "$scm_inttypes_has_int8"; then SCM_I_GSC_T_INT8='"int8_t"' SCM_I_GSC_NEEDS_INTTYPES_H=1 +elif test "$ac_cv_sizeof_char" -eq 1; then + SCM_I_GSC_T_INT8='"signed char"' else AC_MSG_ERROR([Can't find appropriate type for scm_t_int8.]) fi AC_SUBST([SCM_I_GSC_T_INT8]) ### Required type scm_t_uint8 -if test "$ac_cv_sizeof_unsigned_char" -eq 1; then - SCM_I_GSC_T_UINT8='"unsigned char"' -elif test "$scm_stdint_has_uint8"; then +if test "$scm_stdint_has_uint8"; then SCM_I_GSC_T_UINT8='"uint8_t"' SCM_I_GSC_NEEDS_STDINT_H=1 elif test "$scm_inttypes_has_uint8"; then SCM_I_GSC_T_UINT8='"uint8_t"' SCM_I_GSC_NEEDS_INTTYPES_H=1 +elif test "$ac_cv_sizeof_unsigned_char" -eq 1; then + SCM_I_GSC_T_UINT8='"unsigned char"' else AC_MSG_ERROR([Can't find appropriate type for scm_t_uint8.]) fi AC_SUBST([SCM_I_GSC_T_UINT8]) - ### Required type scm_t_int16 (ANSI C says int or short might work) -if test "$ac_cv_sizeof_int" -eq 2; then - SCM_I_GSC_T_INT16='"int"' -elif test "$ac_cv_sizeof_short" -eq 2; then - SCM_I_GSC_T_INT16='"short"' -elif test "$scm_stdint_has_int16"; then +if test "$scm_stdint_has_int16"; then SCM_I_GSC_T_INT16='"int16_t"' SCM_I_GSC_NEEDS_STDINT_H=1 elif test "$scm_inttypes_has_int16"; then SCM_I_GSC_T_INT16='"int16_t"' SCM_I_GSC_NEEDS_INTTYPES_H=1 +elif test "$ac_cv_sizeof_int" -eq 2; then + SCM_I_GSC_T_INT16='"int"' +elif test "$ac_cv_sizeof_short" -eq 2; then + SCM_I_GSC_T_INT16='"short"' else AC_MSG_ERROR([Can't find appropriate type for scm_t_int16.]) fi AC_SUBST([SCM_I_GSC_T_INT16]) ### Required type scm_t_uint16 (ANSI C says int or short might work) -if test "$ac_cv_sizeof_unsigned_int" -eq 2; then - SCM_I_GSC_T_UINT16='"unsigned int"' -elif test "$ac_cv_sizeof_unsigned_short" -eq 2; then - SCM_I_GSC_T_UINT16='"unsigned short"' -elif test "$scm_stdint_has_uint16"; then +if test "$scm_stdint_has_uint16"; then SCM_I_GSC_T_UINT16='"uint16_t"' SCM_I_GSC_NEEDS_STDINT_H=1 elif test "$scm_inttypes_has_uint16"; then SCM_I_GSC_T_UINT16='"uint16_t"' SCM_I_GSC_NEEDS_INTTYPES_H=1 +elif test "$ac_cv_sizeof_unsigned_int" -eq 2; then + SCM_I_GSC_T_UINT16='"unsigned int"' +elif test "$ac_cv_sizeof_unsigned_short" -eq 2; then + SCM_I_GSC_T_UINT16='"unsigned short"' else AC_MSG_ERROR([Can't find appropriate type for scm_t_uint16.]) fi @@ -400,36 +392,36 @@ AC_SUBST([SCM_I_GSC_T_UINT16]) ### Required type scm_t_int32 (ANSI C says int, short, or long might work) -if test "$ac_cv_sizeof_int" -eq 4; then - SCM_I_GSC_T_INT32='"int"' -elif test "$ac_cv_sizeof_long" -eq 4; then - SCM_I_GSC_T_INT32='"long"' -elif test "$ac_cv_sizeof_short" -eq 4; then - SCM_I_GSC_T_INT32='"short"' -elif test "$scm_stdint_has_int32"; then +if test "$scm_stdint_has_int32"; then SCM_I_GSC_T_INT32='"int32_t"' SCM_I_GSC_NEEDS_STDINT_H=1 elif test "$scm_inttypes_has_int32"; then SCM_I_GSC_T_INT32='"int32_t"' SCM_I_GSC_NEEDS_INTTYPES_H=1 +elif test "$ac_cv_sizeof_int" -eq 4; then + SCM_I_GSC_T_INT32='"int"' +elif test "$ac_cv_sizeof_long" -eq 4; then + SCM_I_GSC_T_INT32='"long"' +elif test "$ac_cv_sizeof_short" -eq 4; then + SCM_I_GSC_T_INT32='"short"' else AC_MSG_ERROR([Can't find appropriate type for scm_t_int32.]) fi AC_SUBST([SCM_I_GSC_T_INT32]) ### Required type scm_t_uint32 (ANSI C says int, short, or long might work) -if test "$ac_cv_sizeof_unsigned_int" -eq 4; then - SCM_I_GSC_T_UINT32='"unsigned int"' -elif test "$ac_cv_sizeof_unsigned_long" -eq 4; then - SCM_I_GSC_T_UINT32='"unsigned long"' -elif test "$ac_cv_sizeof_unsigned_short" -eq 4; then - SCM_I_GSC_T_UINT32='"unsigned short"' -elif test "$scm_stdint_has_uint32"; then +if test "$scm_stdint_has_uint32"; then SCM_I_GSC_T_UINT32='"uint32_t"' SCM_I_GSC_NEEDS_STDINT_H=1 elif test "$scm_inttypes_has_uint32"; then SCM_I_GSC_T_UINT32='"uint32_t"' SCM_I_GSC_NEEDS_INTTYPES_H=1 +elif test "$ac_cv_sizeof_unsigned_int" -eq 4; then + SCM_I_GSC_T_UINT32='"unsigned int"' +elif test "$ac_cv_sizeof_unsigned_long" -eq 4; then + SCM_I_GSC_T_UINT32='"unsigned long"' +elif test "$ac_cv_sizeof_unsigned_short" -eq 4; then + SCM_I_GSC_T_UINT32='"unsigned short"' else AC_MSG_ERROR([Can't find appropriate type for scm_t_uint32.]) fi @@ -438,7 +430,13 @@ AC_SUBST([SCM_I_GSC_T_UINT32]) ### Optional type scm_t_int64 (ANSI C says int, short, or long might work) ### Also try 'long long' and '__int64' if we have it. SCM_I_GSC_T_INT64=0 -if test "$ac_cv_sizeof_int" -eq 8; then +if test "$scm_stdint_has_int64"; then + SCM_I_GSC_T_INT64='"int64_t"' + SCM_I_GSC_NEEDS_STDINT_H=1 +elif test "$scm_inttypes_has_int64"; then + SCM_I_GSC_T_INT64='"int64_t"' + SCM_I_GSC_NEEDS_INTTYPES_H=1 +elif test "$ac_cv_sizeof_int" -eq 8; then SCM_I_GSC_T_INT64='"int"' elif test "$ac_cv_sizeof_long" -eq 8; then SCM_I_GSC_T_INT64='"long"' @@ -448,21 +446,22 @@ elif test "$ac_cv_sizeof_long_long" -eq 8; then SCM_I_GSC_T_INT64='"long long"' elif test "$ac_cv_sizeof___int64" -eq 8; then SCM_I_GSC_T_INT64='"__int64"' -elif test "$scm_stdint_has_int64"; then - SCM_I_GSC_T_INT64='"int64_t"' - SCM_I_GSC_NEEDS_STDINT_H=1 -elif test "$scm_inttypes_has_int64"; then - SCM_I_GSC_T_INT64='"int64_t"' - SCM_I_GSC_NEEDS_INTTYPES_H=1 else AC_MSG_ERROR([Can't find appropriate type for scm_t_int64.]) fi AC_SUBST([SCM_I_GSC_T_INT64]) + ### Optional type scm_t_uint64 (ANSI C says int, short, or long might work) ### Also try 'long long' and '__int64' if we have it. SCM_I_GSC_T_UINT64=0 -if test "$ac_cv_sizeof_unsigned_int" -eq 8; then +if test "$scm_stdint_has_uint64"; then + SCM_I_GSC_T_UINT64='"uint64_t"' + SCM_I_GSC_NEEDS_STDINT_H=1 +elif test "$scm_inttypes_has_uint64"; then + SCM_I_GSC_T_UINT64='"uint64_t"' + SCM_I_GSC_NEEDS_INTTYPES_H=1 +elif test "$ac_cv_sizeof_unsigned_int" -eq 8; then SCM_I_GSC_T_UINT64='"unsigned int"' elif test "$ac_cv_sizeof_unsigned_long" -eq 8; then SCM_I_GSC_T_UINT64='"unsigned long"' @@ -472,12 +471,6 @@ elif test "$ac_cv_sizeof_unsigned_long_long" -eq 8; then SCM_I_GSC_T_UINT64='"unsigned long long"' elif test "$ac_cv_sizeof_unsigned___int64" -eq 8; then SCM_I_GSC_T_UINT64='"unsigned __int64"' -elif test "$scm_stdint_has_uint64"; then - SCM_I_GSC_T_UINT64='"uint64_t"' - SCM_I_GSC_NEEDS_STDINT_H=1 -elif test "$scm_inttypes_has_uint64"; then - SCM_I_GSC_T_UINT64='"uint64_t"' - SCM_I_GSC_NEEDS_INTTYPES_H=1 else AC_MSG_ERROR([Can't find appropriate type for scm_t_uint64.]) fi @@ -534,7 +527,10 @@ AC_HEADER_DIRENT AC_HEADER_TIME AC_HEADER_SYS_WAIT -AC_CHECK_HEADERS([io.h libc.h limits.h malloc.h memory.h string.h \ +# Reasons for testing: +# fenv.h - available in C99, but not older systems +# +AC_CHECK_HEADERS([fenv.h io.h libc.h limits.h malloc.h memory.h string.h \ 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 \ @@ -583,23 +579,28 @@ if test "$MINGW32" = "yes" ; then fi AC_SUBST(EXTRA_DEFS) -# FIXME: check to see if we still need these. -#AC_SUBST(INCLTDL) -#AC_SUBST(LIBLTDL) - -AC_SUBST(DLPREOPEN) - # Reasons for testing: # crt_externs.h - Darwin specific # AC_CHECK_HEADERS([assert.h crt_externs.h]) # Reasons for testing: +# DINFINITY - OSF specific +# DQNAN - OSF specific +# (DINFINITY and DQNAN are actually global variables, not functions) +# fesetround - available in C99, but not older systems +# gmtime_r - recent posix, not on old systems +# readdir_r - recent posix, not on old systems +# sysconf - not on old systems # _NSGetEnviron - Darwin specific # -AC_CHECK_FUNCS([ctermid ftime fchown getcwd geteuid gettimeofday lstat mkdir mknod nice readlink rename rmdir select setegid seteuid setlocale setpgid setsid sigaction siginterrupt strftime strptime symlink sync 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 unsetenv _NSGetEnviron]) +AC_CHECK_FUNCS([DINFINITY DQNAN ctermid fesetround ftime fchown getcwd geteuid gettimeofday gmtime_r lstat mkdir mknod nice readdir_r readlink rename rmdir select setegid seteuid setlocale setpgid setsid sigaction siginterrupt 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 unsetenv _NSGetEnviron]) -AC_CHECK_HEADERS(crypt.h sys/resource.h sys/file.h) +# Reasons for testing: +# netdb.h - not in mingw +# sys/param.h - not in mingw +# +AC_CHECK_HEADERS(crypt.h netdb.h sys/param.h sys/resource.h sys/file.h) AC_CHECK_FUNCS(chroot flock getlogin cuserid getpriority setpriority getpass sethostname gethostname) # crypt() may or may not be available, for instance in some countries there @@ -628,6 +629,15 @@ AC_TRY_LINK([#include ], [mpz_import (0, 0, 0, 0, 0, 0, 0);] , , [AC_MSG_ERROR([At least GNU MP 4.1 is required, see http://swox.com/gmp])]) +dnl i18n tests +#AC_CHECK_HEADERS([libintl.h]) +#AC_CHECK_FUNCS(gettext) +#if test $ac_cv_func_gettext = no; then +# AC_CHECK_LIB(intl, gettext) +#fi +#AC_CHECK_FUNCS([bindtextdomain textdomain]) +AM_GNU_GETTEXT([external], [need-ngettext]) + ### Some systems don't declare some functions. On such systems, we ### need to at least provide our own K&R-style declarations. @@ -646,10 +656,13 @@ AC_DEFUN([GUILE_FUNC_DECLARED], [ fi ]) -GUILE_FUNC_DECLARED(strptime, time.h) GUILE_FUNC_DECLARED(sleep, unistd.h) GUILE_FUNC_DECLARED(usleep, unistd.h) +AC_CHECK_DECLS([strptime],,, +[#define _GNU_SOURCE /* ask glibc to give strptime prototype */ +#include ]) + ### On some systems usleep has no return value. If it does have one, ### we'd like to return it; otherwise, we'll fake it. AC_CACHE_CHECK([return type of usleep], guile_cv_func_usleep_return_type, @@ -680,6 +693,15 @@ AC_CHECK_FUNCS(sethostent gethostent endhostent dnl inet_lnaof inet_makeaddr inet_netof hstrerror dnl inet_pton inet_ntop) +# struct sockaddr field sin_len is only present on BSD systems. +# On 4.4BSD apparently a #define SIN_LEN exists, but on other BSD systems +# (eg. FreeBSD 4.9) it doesn't and we must use this configure check +AC_CHECK_MEMBERS([struct sockaddr.sin_len],,, +[#ifdef HAVE_SYS_TYPES_H +#include +#endif +#include ]) + AC_MSG_CHECKING(for __libc_stack_end) AC_CACHE_VAL(guile_cv_have_libc_stack_end, [AC_TRY_LINK([#include @@ -755,6 +777,13 @@ if test $guile_cv_have_sin6_scope_id = yes; then [Define this if your IPv6 has sin6_scope_id in sockaddr_in6 struct.]) fi +# struct sockaddr_in6 field sin_len is only present on BSD systems +AC_CHECK_MEMBERS([struct sockaddr_in6.sin6_len],,, +[#ifdef HAVE_SYS_TYPES_H +#include +#endif +#include ]) + AC_MSG_CHECKING(whether localtime caches TZ) AC_CACHE_VAL(guile_cv_localtime_cache, [if test x$ac_cv_func_tzset = xyes; then @@ -844,15 +873,45 @@ AC_CHECK_HEADERS(floatingpoint.h ieeefp.h nan.h) # older systems # sincos - GLIBC extension # -AC_CHECK_FUNCS(asinh acosh atanh copysign finite isinf isnan sincos trunc) +AC_CHECK_FUNCS(asinh acosh atanh copysign finite sincos trunc) + +# C99 specifies isinf and isnan as macros. +# HP-UX provides only macros, no functions. +# glibc 2.3.2 provides both macros and functions. +# IRIX 6.5 and Solaris 8 only provide functions. +# +# The following tests detect isinf and isnan either as functions or as +# macros from . Plain AC_CHECK_FUNCS is insufficient, it doesn't +# use so doesn't detect on macro-only systems like HP-UX. +# +AC_MSG_CHECKING([for isinf]) +AC_LINK_IFELSE( +[#include +int main () { return (isinf(0.0) != 0); }], + [AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_ISINF, 1, + [Define to 1 if you have the `isinf' macro or function.])], + [AC_MSG_RESULT([no])]) +AC_MSG_CHECKING([for isnan]) +AC_LINK_IFELSE( +[#include +#ifdef __MINGW32__ +#define isnan _isnan +#endif +int main () { return (isnan(0.0) != 0); }], + [AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_ISNAN, 1, + [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. -# When testing for the presence of alloca, we need to add alloca.o -# explicitly to LIBOBJS to make sure that it is translated to -# `alloca.lo' for libtool later on. This can and should be done more cleanly. AC_FUNC_ALLOCA if test "$ALLOCA" = "alloca.o" then - AC_LIBOBJ([alloca]) + AC_ERROR([No native alloca found.]) fi AC_CHECK_MEMBERS([struct stat.st_rdev]) @@ -943,17 +1002,12 @@ AC_ARG_WITH(threads, [ --with-threads thread interface], case "$with_threads" in "yes" | "pthread" | "pthreads" | "pthread-threads" | "") - AC_CHECK_LIB(pthread, main, - LIBS="-lpthread $LIBS" + ACX_PTHREAD(CC="$PTHREAD_CC" + LIBS="$PTHREAD_LIBS $LIBS" SCM_I_GSC_USE_PTHREAD_THREADS=1 with_threads="pthreads", with_threads="null") - if test $GCC = yes; then - AC_DEFINE(_THREAD_SAFE, 1, - [Use thread safe versions of GNU Libc functions.]) - fi - AC_MSG_CHECKING(if pthread_mutexattr_settype is declared) AC_CACHE_VAL(guile_cv_mutexattr_settype_declared, [AC_TRY_COMPILE([#include ], @@ -1105,26 +1159,24 @@ AC_SUBST(GUILE_VERSION) ####################################################################### # library versioning -AC_SUBST(LIBQTHREADS_INTERFACE_CURRENT) -AC_SUBST(LIBQTHREADS_INTERFACE_REVISION) -AC_SUBST(LIBQTHREADS_INTERFACE_AGE) -AC_SUBST(LIBQTHREADS_INTERFACE) - AC_SUBST(LIBGUILE_INTERFACE_CURRENT) AC_SUBST(LIBGUILE_INTERFACE_REVISION) AC_SUBST(LIBGUILE_INTERFACE_AGE) AC_SUBST(LIBGUILE_INTERFACE) +AC_SUBST(LIBGUILE_SRFI_SRFI_1_MAJOR) AC_SUBST(LIBGUILE_SRFI_SRFI_1_INTERFACE_CURRENT) AC_SUBST(LIBGUILE_SRFI_SRFI_1_INTERFACE_REVISION) AC_SUBST(LIBGUILE_SRFI_SRFI_1_INTERFACE_AGE) AC_SUBST(LIBGUILE_SRFI_SRFI_1_INTERFACE) +AC_SUBST(LIBGUILE_SRFI_SRFI_4_MAJOR) AC_SUBST(LIBGUILE_SRFI_SRFI_4_INTERFACE_CURRENT) AC_SUBST(LIBGUILE_SRFI_SRFI_4_INTERFACE_REVISION) AC_SUBST(LIBGUILE_SRFI_SRFI_4_INTERFACE_AGE) AC_SUBST(LIBGUILE_SRFI_SRFI_4_INTERFACE) +AC_SUBST(LIBGUILE_SRFI_SRFI_13_14_MAJOR) AC_SUBST(LIBGUILE_SRFI_SRFI_13_14_INTERFACE_CURRENT) AC_SUBST(LIBGUILE_SRFI_SRFI_13_14_INTERFACE_REVISION) AC_SUBST(LIBGUILE_SRFI_SRFI_13_14_INTERFACE_AGE) @@ -1132,9 +1184,11 @@ AC_SUBST(LIBGUILE_SRFI_SRFI_13_14_INTERFACE) ####################################################################### -dnl Tell guile-config what flags guile users should link against. -GUILE_LIBS="$LDFLAGS $THREAD_LIBS_INSTALLED $LIBS" +dnl Tell guile-config what flags guile users should compile and link with. +GUILE_LIBS="$LDFLAGS $LIBS" +GUILE_CFLAGS="$PTHREAD_CFLAGS" AC_SUBST(GUILE_LIBS) +AC_SUBST(GUILE_CFLAGS) AC_SUBST(AWK) AC_SUBST(LIBLOBJS) @@ -1150,9 +1204,9 @@ AC_SUBST(top_srcdir_absolute) # Additional SCM_I_GSC definitions are above. AC_SUBST([SCM_I_GSC_GUILE_DEBUG]) AC_SUBST([SCM_I_GSC_GUILE_DEBUG_FREELIST]) +AC_SUBST([SCM_I_GSC_ENABLE_DISCOURAGED]) AC_SUBST([SCM_I_GSC_ENABLE_DEPRECATED]) AC_SUBST([SCM_I_GSC_ENABLE_ELISP]) -AC_SUBST([SCM_I_GSC_HAVE_ARRAYS]) AC_SUBST([SCM_I_GSC_STACK_GROWS_UP]) AC_SUBST([SCM_I_GSC_C_INLINE]) AC_CONFIG_FILES([libguile/gen-scmconfig.h]) @@ -1183,8 +1237,6 @@ AC_CONFIG_FILES([ lang/elisp/Makefile lang/elisp/internals/Makefile lang/elisp/primitives/Makefile - libguile-ltdl/Makefile - libguile-ltdl/upstream/Makefile libguile/Makefile oop/Makefile oop/goops/Makefile