* GUILE-VERSION: added defnitions for LIBGUILE_MAJOR_VERSION,

[bpt/guile.git] / configure.in

diff --git a/configure.in b/configure.in
index f1dedb2..aee5c83 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -52,6 +52,12 @@ AC_ARG_ENABLE(debug-freelist,
     AC_DEFINE(GUILE_DEBUG_FREELIST)
   fi)
 
+AC_ARG_ENABLE(debug-malloc,
+  [  --enable-debug-malloc      Include malloc debugging code],
+  if test "$enable_debug_malloc" = y || test "$enable_debug_malloc" = yes; then
+    AC_DEFINE(GUILE_DEBUG_MALLOC)
+  fi)
+
 AC_ARG_ENABLE(arrays,
   [  --disable-arrays        omit array and uniform array support],,
   enable_arrays=yes)
@@ -90,6 +96,10 @@ if test "$enable_networking" = yes; then
    AC_DEFINE(HAVE_NETWORKING)
 fi
 
+if test "$enable_debug_malloc" = yes; then
+   LIBOBJS="$LIBOBJS debug-malloc.o"
+fi
+
 #--------------------------------------------------------------------
 
 AC_LIBLTDL_CONVENIENCE
@@ -464,9 +474,14 @@ if test "${THREAD_PACKAGE}" != "" ; then
   ## Bring in scm_internal_select, if appropriate.
   if test $ac_cv_func_gettimeofday = yes &&
      test $ac_cv_func_select = yes; then
-    LIBOBJS="$LIBOBJS iselect.o"
     AC_DEFINE(GUILE_ISELECT, 1)
   fi
+
+  ## Workaround for linuxthreads (currently disabled)
+  if test $host_os = linux-gnu; then
+    AC_DEFINE(GUILE_PTHREAD_COMPAT, 1)
+    AC_CHECK_LIB(pthread, main)
+  fi
 fi
 
 ## If we're using GCC, ask for aggressive warnings.
@@ -490,6 +505,10 @@ LIBLOBJS="`echo ${LIBOBJS} | sed 's/\.o/.lo/g'`"
 AC_SUBST(GUILE_MAJOR_VERSION)
 AC_SUBST(GUILE_MINOR_VERSION)
 AC_SUBST(GUILE_VERSION)
+AC_SUBST(LIBGUILE_MAJOR_VERSION)
+AC_SUBST(LIBGUILE_MINOR_VERSION)
+AC_SUBST(LIBGUILE_REVISION_VERSION)
+AC_SUBST(LIBGUILE_VERSION)
 
 dnl Tell guile-config what flags guile users should link against.
 GUILE_LIBS="$LDFLAGS $THREAD_LIBS_INSTALLED $LIBS"
@@ -504,4 +523,4 @@ dnl Local Variables:
 dnl comment-start: "dnl "
 dnl comment-end: ""
 dnl comment-start-skip: "\\bdnl\\b\\s *"
-dnl 
+dnl End: