X-Git-Url: http://git.hcoop.net/bpt/guile.git/blobdiff_plain/ac3260868a2e0ec0d62aaec55fd52ee76436003a..f1ca69a6bfd07852f14fe3e799b54ca63bb3f5bd:/configure.in diff --git a/configure.in b/configure.in index a246876a0..b489b0e66 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ dnl define(GUILE_CONFIGURE_COPYRIGHT,[[ -Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. +Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GUILE @@ -20,8 +20,8 @@ General Public License for more details. You should have received a copy of the GNU General Public License along with GUILE; see the file COPYING. If not, write to the -Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. ]]) @@ -69,7 +69,10 @@ AM_PROG_CC_STDC AC_LIBTOOL_DLOPEN AC_PROG_LIBTOOL -AC_LIB_LTDL +AC_CHECK_LIB([ltdl], [lt_dlinit], , + [AC_MSG_ERROR([libltdl not found. See README.])]) + +AC_SUBST(DLPREOPEN) AC_CHECK_PROG(have_makeinfo, makeinfo, yes, no) AM_CONDITIONAL(HAVE_MAKEINFO, test "$have_makeinfo" = yes) @@ -190,13 +193,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]) @@ -524,6 +520,9 @@ AC_SUBST([SCM_I_GSC_T_UINTMAX]) AC_SUBST([SCM_I_GSC_NEEDS_STDINT_H]) AC_SUBST([SCM_I_GSC_NEEDS_INTTYPES_H]) +AC_CHECK_TYPE(socklen_t, int) +AC_CHECK_TYPE(struct ip_mreq) + AC_HEADER_STDC AC_HEADER_DIRENT AC_HEADER_TIME @@ -575,18 +574,9 @@ if test "$MINGW32" = "yes" ; then AC_DEFINE(USE_DLL_IMPORT, 1, [Define if you need additional CPP macros on Win32 platforms.]) fi - if test x"$enable_ltdl_install" = x"yes" ; then - INCLTDL="-DLIBLTDL_DLL_IMPORT $INCLTDL" - fi 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 # @@ -630,21 +620,21 @@ AC_SEARCH_LIBS(crypt, crypt, dnl GMP tests AC_CHECK_LIB([gmp], [__gmpz_init], , - [AC_MSG_ERROR([GNU MP not found, see http://swox.com/gmp])]) + [AC_MSG_ERROR([GNU MP not found, see README])]) # mpz_import is a macro so we need to include 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])]) + [AC_MSG_ERROR([At least GNU MP 4.1 is required, see README])]) 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]) +#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. @@ -999,10 +989,8 @@ fi SCM_I_GSC_USE_PTHREAD_THREADS=0 SCM_I_GSC_USE_NULL_THREADS=0 -SCM_I_GSC_USE_COOP_THREADS=0 AC_SUBST([SCM_I_GSC_USE_PTHREAD_THREADS]) AC_SUBST([SCM_I_GSC_USE_NULL_THREADS]) -AC_SUBST([SCM_I_GSC_USE_COOP_THREADS]) ### What thread package has the user asked for? AC_ARG_WITH(threads, [ --with-threads thread interface], @@ -1015,48 +1003,12 @@ case "$with_threads" in SCM_I_GSC_USE_PTHREAD_THREADS=1 with_threads="pthreads", with_threads="null") - - AC_MSG_CHECKING(if pthread_mutexattr_settype is declared) - AC_CACHE_VAL(guile_cv_mutexattr_settype_declared, - [AC_TRY_COMPILE([#include ], - [int pthread_mutexattr_settype (int, int);], - guile_cv_mutexattr_settype_declared=no, - guile_cv_mutexattr_settype_declared=yes)]) - AC_MSG_RESULT($guile_cv_mutexattr_settype_declared) - if test $guile_cv_mutexattr_settype_declared = yes; then - AC_DEFINE(SCM_MUTEXATTR_SETTYPE_DECLARED, 1, - [Define if pthread.h declares pthread_mutexattr_settype.]) - fi - - AC_MSG_CHECKING(how to get a fast mutex) - AC_CACHE_VAL(guile_cv_have_mutex_fast, - [AC_TRY_COMPILE([#include ], - [int a = PTHREAD_MUTEX_ADAPTIVE_NP;], - guile_cv_have_mutex_fast=PTHREAD_MUTEX_ADAPTIVE_NP, - guile_cv_have_mutex_fast=none)]) - AC_MSG_RESULT($guile_cv_have_mutex_fast) - if test ! $guile_cv_have_mutex_fast = none; then - AC_DEFINE_UNQUOTED(SCM_MUTEX_FAST, $guile_cv_have_mutex_fast, - [The mutex kind enum for fast mutexes.]) - fi - - AC_MSG_CHECKING(how to get a recursive mutex) - AC_CACHE_VAL(guile_cv_have_mutex_recursive, - [AC_TRY_COMPILE([#include ], - [int a = PTHREAD_MUTEX_RECURSIVE_NP;], - guile_cv_have_mutex_recursive=PTHREAD_MUTEX_RECURSIVE_NP) - if test -z "$guile_cv_have_mutex_recursive"; then - AC_TRY_COMPILE([#include ], - [int a = PTHREAD_MUTEX_RECURSIVE;], - guile_cv_have_mutex_recursive=PTHREAD_MUTEX_RECURSIVE, - guile_cv_have_mutex_recursive=none) - fi]) - AC_MSG_RESULT($guile_cv_have_mutex_recursive) - if test ! $guile_cv_have_mutex_recursive = none; then - AC_DEFINE_UNQUOTED(SCM_MUTEX_RECURSIVE, $guile_cv_have_mutex_recursive, - [The mutex kind enum for recursive mutexes.]) - fi - + + old_CFLAGS="$CFLAGS" + CFLAGS="$PTHREAD_CFLAGS $CFLAGS" + AC_CHECK_FUNCS(pthread_attr_getstack) + CFLAGS="$old_CFLAGS" + # On Solaris, sched_yield lives in -lrt. AC_SEARCH_LIBS(sched_yield, rt) @@ -1190,6 +1142,12 @@ AC_SUBST(LIBGUILE_SRFI_SRFI_13_14_INTERFACE_REVISION) AC_SUBST(LIBGUILE_SRFI_SRFI_13_14_INTERFACE_AGE) AC_SUBST(LIBGUILE_SRFI_SRFI_13_14_INTERFACE) +AC_SUBST(LIBGUILE_SRFI_SRFI_60_MAJOR) +AC_SUBST(LIBGUILE_SRFI_SRFI_60_INTERFACE_CURRENT) +AC_SUBST(LIBGUILE_SRFI_SRFI_60_INTERFACE_REVISION) +AC_SUBST(LIBGUILE_SRFI_SRFI_60_INTERFACE_AGE) +AC_SUBST(LIBGUILE_SRFI_SRFI_60_INTERFACE) + ####################################################################### dnl Tell guile-config what flags guile users should compile and link with. @@ -1215,7 +1173,6 @@ 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]) @@ -1229,7 +1186,6 @@ AC_CONFIG_FILES([ doc/r5rs/Makefile doc/ref/Makefile doc/tutorial/Makefile - emacs/Makefile examples/Makefile examples/box-dynamic-module/Makefile examples/box-dynamic/Makefile @@ -1241,13 +1197,10 @@ AC_CONFIG_FILES([ guile-config/Makefile ice-9/Makefile ice-9/debugger/Makefile - ice-9/debugger/breakpoints/Makefile lang/Makefile 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