2002-01-28 Stefan Jahn <stefan@lkcc.org>

[bpt/guile.git] / configure.in

diff --git a/configure.in b/configure.in
index 01f5b65..4607b4d 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
@@ -157,7 +165,7 @@ AC_CYGWIN
 AC_MINGW32
 AC_LIBTOOL_WIN32_DLL
 
-AC_LIBLTDL_CONVENIENCE
+AC_LIBLTDL_INSTALLABLE
 AC_CONFIG_SUBDIRS(libltdl)
 
 AC_PROG_INSTALL
@@ -172,12 +180,21 @@ AC_MINIX
 AM_PROG_CC_STDC
 AM_PROG_LIBTOOL
 
+AC_CHECK_PROG(have_makeinfo, makeinfo, yes, no)
+AM_CONDITIONAL(HAVE_MAKEINFO, test "$have_makeinfo" = yes)
+
 AC_C_CONST
 AC_C_INLINE
 AC_C_BIGENDIAN
 
+if test "$ac_cv_c_inline" != no; then
+  AC_DEFINE(HAVE_INLINE)
+fi
+
+AC_CHECK_SIZEOF(short)
 AC_CHECK_SIZEOF(int)
 AC_CHECK_SIZEOF(long)
+AC_CHECK_SIZEOF(size_t)
 
 dnl Check for integral types that can represent the range of pointers.
 dnl If these types don't exist on this platform, they are replaced by
@@ -185,17 +202,10 @@ dnl "unsigned long" and "long", respectively.
 
 AC_CHECK_HEADERS(stdint.h)
 AC_CHECK_HEADERS(inttypes.h)
-AC_CHECK_TYPES([uintptr_t, ptrdiff_t])
-
-AC_CACHE_CHECK([for long longs], scm_cv_long_longs,
-              AC_TRY_COMPILE(,
-                             [long long a],
-                             scm_cv_long_longs=yes,
-                             scm_cv_long_longs=no))
-if test "$scm_cv_long_longs" = yes; then
-  AC_DEFINE(HAVE_LONG_LONGS)
-  AC_CHECK_SIZEOF(long long)
-fi
+AC_CHECK_SIZEOF(uintptr_t)
+AC_CHECK_SIZEOF(ptrdiff_t)
+
+AC_CHECK_SIZEOF(long long)
 
 AC_CHECK_SIZEOF(void *)
 
@@ -233,7 +243,10 @@ if test "$MINGW32" = "yes" ; then
       [Define if you have the <winsock2.h> header file.])])
     AC_CHECK_LIB(ws2_32, main)
     LIBOBJS="$LIBOBJS win32-uname.o win32-dirent.o"
-    if test $enable_shared = yes ; then
+    if test "$enable_networking" = yes ; then
+      LIBOBJS="$LIBOBJS win32-socket.o"
+    fi
+    if test "$enable_shared" = yes ; then
       EXTRA_DEFS="-DSCM_IMPORT"
       AC_DEFINE(USE_DLL_IMPORT, 1,
         [Define if you need additional CPP macros on Win32 platforms.])
@@ -335,7 +348,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)
@@ -655,6 +673,10 @@ AC_CONFIG_FILES([
   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