*** empty log message ***

[bpt/guile.git] / configure.in

diff --git a/configure.in b/configure.in
index 5a4195f..6c6d441 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -129,6 +129,10 @@ dnl a required part of the distribution.
 AC_DEFINE(DEBUG_EXTENSIONS)
 AC_DEFINE(READER_EXTENSIONS)
 
+AC_ARG_ENABLE(elisp,
+  [  --disable-elisp         omit Emacs Lisp support],,
+  enable_elisp=yes)
+
 dnl files which are destined for separate modules.
 
 if test "$enable_arrays" = yes; then
@@ -150,6 +154,10 @@ if test "$enable_debug_malloc" = yes; then
    LIBOBJS="$LIBOBJS debug-malloc.o"
 fi
 
+if test "$enable_elisp" = yes; then
+   AC_DEFINE(SCM_ENABLE_ELISP)
+fi
+
 #--------------------------------------------------------------------
 
 dnl Some more checks for Win32
@@ -231,7 +239,7 @@ dnl Check for Winsock and other functionality on Win32 (*not* CygWin)
 dnl
 EXTRA_DEFS=""
 if test "$MINGW32" = "yes" ; then
-    AC_CHECK_HEADER(winsock2.h, [AC_DEFINE([HAVE_WINSOCK2_H], 1, 
+    AC_CHECK_HEADER(winsock2.h, [AC_DEFINE([HAVE_WINSOCK2_H], 1,
       [Define if you have the <winsock2.h> header file.])])
     AC_CHECK_LIB(ws2_32, main)
     LIBOBJS="$LIBOBJS win32-uname.o win32-dirent.o"
@@ -243,6 +251,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)
 
@@ -265,6 +276,7 @@ if test "$use_modules" != no; then
     done
   fi
 fi
+
 AC_SUBST(INCLTDL)
 AC_SUBST(LIBLTDL)
 AC_SUBST(DLPREOPEN)
@@ -340,7 +352,12 @@ fi
 AC_MSG_CHECKING(whether uint32_t is defined)
 AC_CACHE_VAL(guile_cv_have_uint32_t,
   [AC_TRY_COMPILE([#include <sys/types.h>
-                  #include <netdb.h>],
+                  #if HAVE_STDINT_H
+                  #include <stdint.h>
+                   #endif
+                  #ifndef __MINGW32__
+                  #include <netdb.h>
+                  #endif],
                  [uint32_t a;],
                  guile_cv_have_uint32_t=yes, guile_cv_have_uint32_t=no)])
 AC_MSG_RESULT($guile_cv_have_uint32_t)
@@ -600,10 +617,6 @@ if test "${THREAD_PACKAGE}" != "" ; then
     AC_CHECK_LIB(pthread, main)
   fi
 fi
-AC_SUBST(LIBGUILEQTHREADS_INTERFACE_CURRENT)
-AC_SUBST(LIBGUILEQTHREADS_INTERFACE_REVISION)
-AC_SUBST(LIBGUILEQTHREADS_INTERFACE_AGE)
-AC_SUBST(LIBGUILEQTHREADS_INTERFACE)
 
 ## If we're using GCC, ask for aggressive warnings.
 case "$GCC" in
@@ -636,11 +649,31 @@ AC_SUBST(GUILE_MINOR_VERSION)
 AC_SUBST(GUILE_MICRO_VERSION)
 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_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_INTERFACE_CURRENT)
+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)
+
+#######################################################################
+
 dnl Tell guile-config what flags guile users should link against.
 GUILE_LIBS="$LDFLAGS $THREAD_LIBS_INSTALLED $LIBS"
 AC_SUBST(GUILE_LIBS)
@@ -650,16 +683,26 @@ AC_SUBST(LIBLOBJS)
 AC_SUBST(EXTRA_DOT_DOC_FILES)
 AC_SUBST(EXTRA_DOT_X_FILES)
 
+dnl See also top_builddir in info node: (libtool)AC_PROG_LIBTOOL
+top_builddir_absolute=`pwd`
+AC_SUBST(top_builddir_absolute)
+top_srcdir_absolute=`(cd $srcdir ; pwd)`
+AC_SUBST(top_srcdir_absolute)
+
 AC_CONFIG_FILES([
   Makefile
+  am/Makefile
   libguile/Makefile
   libguile/guile-snarf
   libguile/guile-doc-snarf
   libguile/guile-func-name-check
   libguile/guile-snarf-docs
-  libguile/guile-snarf-docs-texi
   libguile/version.h
   ice-9/Makefile
+  lang/Makefile
+  lang/elisp/Makefile
+  lang/elisp/internals/Makefile
+  lang/elisp/primitives/Makefile
   oop/Makefile
   oop/goops/Makefile
   scripts/Makefile
@@ -684,16 +727,17 @@ AC_CONFIG_FILES([
   examples/safe/Makefile
   test-suite/Makefile
   check-guile
-  guile-tools])
+  guile-tools
+  pre-inst-guile])
 
 AC_CONFIG_COMMANDS(default,
   [ chmod +x libguile/guile-snarf \
              libguile/guile-doc-snarf \
              libguile/guile-func-name-check \
              libguile/guile-snarf-docs \
-             libguile/guile-snarf-docs-texi \
              check-guile \
-             guile-tools])
+             guile-tools \
+             pre-inst-guile])
 
 AC_OUTPUT