[Guile-commits] 01/03: Replace libltdl with gmodule-2.0 in build

[Mike Gran]

mike121 pushed a commit to branch wip-replace-ltdl-with-gmodule
in repository guile.

commit 8c451ec2dd78399a0655c2d40855a5aa426892ab
Author: Mike Gran <address@hidden>
AuthorDate: Tue Mar 24 12:13:54 2020 -0700

    Replace libltdl with gmodule-2.0 in build
    
    * configure.ac: remove ltdl
      (GMODULE_CFLAGS, GMODULE_LIBS): new
    * libguile/Makefile.am: remove ltdl flags and libs, add gmodule
    * libguile/dynl.c: remove ltdl.h, add gmodule.h
---
 configure.ac         | 13 ++++++-------
 libguile/Makefile.am |  4 ++--
 libguile/dynl.c      |  2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/configure.ac b/configure.ac
index 3e96094..c20d560 100644
--- a/configure.ac
+++ b/configure.ac
@@ -105,13 +105,6 @@ AC_PROG_LIBTOOL
 
 AM_CONDITIONAL([HAVE_SHARED_LIBRARIES], [test "x$enable_shared" = "xyes"])
 
-dnl Check for libltdl.
-AC_LIB_HAVE_LINKFLAGS([ltdl], [], [#include <ltdl.h>],
-  [lt_dlopenext ("foo");])
-if test "x$HAVE_LIBLTDL" != "xyes"; then
-  AC_MSG_ERROR([GNU libltdl (Libtool) not found, see README.])
-fi
-
 AC_CHECK_PROG(have_makeinfo, makeinfo, yes, no)
 AM_CONDITIONAL(HAVE_MAKEINFO, test "$have_makeinfo" = yes)
 
@@ -690,6 +683,12 @@ PKG_CHECK_MODULES(LIBFFI, libffi)
 AC_SUBST(LIBFFI_CFLAGS)
 AC_SUBST(LIBFFI_LIBS)
 
+dnl GModule is needed for dynamic loading of modules
+PKG_CHECK_MODULES([GMODULE], [gmodule-2.0])
+AC_SUBST([GMODULE_CFLAGS])
+AC_SUBST([GMODULE_LIBS])
+
+
 dnl figure out approriate ffi type for size_t
 AC_CHECK_SIZEOF(size_t)
 AC_CHECK_SIZEOF(ssize_t)
diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index d4cfec7..f3ee5d2 100644
--- a/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@ -38,7 +38,7 @@ DEFAULT_INCLUDES =
 ## building.  Also look for Gnulib headers in `lib'.
 AM_CPPFLAGS = -DBUILDING_LIBGUILE=1 -I$(top_srcdir) -I$(top_builddir) \
              -I$(top_srcdir)/lib -I$(top_builddir)/lib -iquote$(builddir) \
-             $(LIBFFI_CFLAGS)
+             $(LIBFFI_CFLAGS) $(GMODULE_CFLAGS)
 
 if ENABLE_JIT
 AM_CPPFLAGS += -I$(top_srcdir)/libguile/lightening
@@ -546,7 +546,7 @@ noinst_HEADERS += vm-engine.c
 libguile_@GUILE_EFFECTIVE_VERSION@_la_DEPENDENCIES = @LIBLOBJS@
 
 libguile_@GUILE_EFFECTIVE_VERSION@_la_LIBADD =         \
-  @LIBLOBJS@ $(gnulib_library) $(LTLIBGMP) $(LTLIBLTDL)
+  @LIBLOBJS@ $(gnulib_library) $(LTLIBGMP) $(GMODULE_LIBS)
 
 # Libtool version info.
 version_info = 
@LIBGUILE_INTERFACE_CURRENT@:@LIBGUILE_INTERFACE_REVISION@:@LIBGUILE_INTERFACE_AGE@
diff --git a/libguile/dynl.c b/libguile/dynl.c
index e9c03e9..48d6e35 100644
--- a/libguile/dynl.c
+++ b/libguile/dynl.c
@@ -33,7 +33,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <ltdl.h>
+#include <gmodule.h>
 
 #include "deprecation.h"
 #include "dynwind.h"