* configure.in: Do not call AC_LIBLTDL_INSTALLABLE. Use

AC_CHECK_LIB instead. Do not subst LTDLINCL and LIBLTDL.  Do not
add "-DLIBLTDL_DLL_IMPORT" on MINGW32.

* Makefile.am (SUBDIRS): Removed libltdl.

* README: Talk about required external packages.

* autogen.sh: Do not call libtoolize.

diff --git a/Makefile.am b/Makefile.am
index ad4d1bf..a86cd70 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,7 @@
 
 AUTOMAKE_OPTIONS = 1.5
 
-SUBDIRS = oop libltdl libguile ice-9 guile-config guile-readline       \
+SUBDIRS = oop libguile ice-9 guile-config guile-readline       \
          scripts srfi doc examples test-suite benchmark-suite lang am  \
          emacs
 

diff --git a/README b/README
index c5deda0..5f8194f 100644 (file)
--- a/README
+++ b/README
@@ -27,12 +27,13 @@ Generic instructions for configuring and compiling Guile can be found
 in the INSTALL file.  Guile specific information and configure options
 can be found below, including instructions for installing SLIB.
 
-Guile can use a number of external packages such as `readline' when
-they are available.  Guile expects to be able to find these packages
-in the default compiler setup, it does not try to make any special
-arrangements itself.  For example, for the `readline' package, Guile
-expects to be able to find the include file <readline/readline.h>,
-without passing any special `-I' options to the compiler.
+Guile requires a few external packages and can optionally use a number
+of external packages such as `readline' when they are available.
+Guile expects to be able to find these packages in the default
+compiler setup, it does not try to make any special arrangements
+itself.  For example, for the `readline' package, Guile expects to be
+able to find the include file <readline/readline.h>, without passing
+any special `-I' options to the compiler.
 
 If you installed an external package, and you used the --prefix
 installation option to install it somewhere else than /usr/local, you
@@ -46,6 +47,21 @@ you install gcc and the package; you need to use the
 more details.
 
 
+Required External Packages ================================================
+
+Guile requires the following external packages:
+
+  - GNU MP, at least version 4.1
+
+    GNU MP is used for bignum arithmetic.  It is available from
+    http://swox.com/gmp
+
+  - libltdl from libtool, at least from libtool version 1.5.6
+
+    libltdl is used for loading extensions at run-time.  It is
+    available from http://www.gnu.org/software/libtool/
+
+
 Special Instructions For Some Systems =====================================
 
 We would like Guile to build on all systems using the simple

diff --git a/autogen.sh b/autogen.sh
index a9b432f..90dc480 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -37,7 +37,6 @@ $mscripts/render-bugs > BUGS
 ######################################################################
 ### update infrastructure
 
-libtoolize --force --copy --ltdl  # autoreconf doesn't seem to update libltdl/
 autoreconf -i --force --verbose
 
 echo "guile-readline..."

diff --git a/configure.in b/configure.in
index 5f33345..e0d722e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -47,7 +47,6 @@ AH_TOP(/*GUILE_CONFIGURE_COPYRIGHT*/)
 #
 #--------------------------------------------------------------------
 
-AC_CONFIG_SUBDIRS(libltdl)
 AC_CONFIG_SUBDIRS(guile-readline)
 
 #--------------------------------------------------------------------
@@ -69,12 +68,11 @@ AC_MINIX
 AM_PROG_CC_STDC
 
 AC_LIBTOOL_DLOPEN
-AC_LIBLTDL_INSTALLABLE
 AC_PROG_LIBTOOL
+AC_CHECK_LIB([ltdl], [lt_dlinit], ,
+  [AC_MSG_ERROR([libltdl not found.  See README.])])
 
 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)
@@ -573,9 +571,6 @@ 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)
 
@@ -622,12 +617,12 @@ 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 <gmp.h>
 AC_TRY_LINK([#include <gmp.h>],
             [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])