mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-30 06:50:31 +02:00
Code Activity

Use `have-lib' when checking for libltdl.

Browse source 
Suggested by primus <rprimus@gmail.com>.

* configure.ac: Use `AC_LIB_HAVE_LINKFLAGS' when checking for libltdl.

* libguile/Makefile.am (libguile_@GUILE_EFFECTIVE_VERSION@_la_LIBADD):
  Add $(LTLIBLTDL).

* README: Update to make it clear that libgc and libffi don't have a
  `--with-XXX-prefix' option.
This commit is contained in:
Ludovic Courtès 2010-09-06 22:49:24 +02:00
parent 2ee073587a
commit 18f2d5aa4d
3 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
README
View file

@ -35,11 +35,13 @@ Guile depends on the following external libraries.
- libunistring - libunistring
- libgc - libgc
- libffi - libffi
It will also use the libreadline library if it is available. For each It will also use the libreadline library if it is available.
of these there is a corresponding --with-XXX-prefix option that you
can use when invoking ./configure, if you have these libraries There is a corresponding `--with-XXX-prefix' option for each of these
installed in a location other than the standard places (/usr and libraries (except for libgc and libffi which use `pkg-config', see
/usr/local). below) that you can use when invoking ./configure, if you have these
libraries installed in a location other than the standard places (/usr
and /usr/local).
These options are provided by the Gnulib `havelib' module, and details These options are provided by the Gnulib `havelib' module, and details
of how they work are documented in `Searching for Libraries' in the of how they work are documented in `Searching for Libraries' in the

11
configure.ac
View file

@ -74,10 +74,13 @@ AM_PROG_CC_C_O
AC_LIBTOOL_DLOPEN AC_LIBTOOL_DLOPEN
AC_PROG_LIBTOOL AC_PROG_LIBTOOL
AC_CHECK_LIB([ltdl], [lt_dlinit], ,
[AC_MSG_ERROR([libltdl not found. See README.])]) dnl Check for libltdl.
AC_CHECK_HEADER([ltdl.h], [], AC_LIB_HAVE_LINKFLAGS([ltdl], [], [#include <ltdl.h>],
[AC_MSG_ERROR([<ltdl.h> not found. See README.])]) [lt_dlopenext ("foo");])
if text "x$HAVE_LIBLTDL" != "xyes"; then
AC_MSG_ERROR([GNU libltdl (Libtool) not found, see README.])
fi
AC_CHECK_PROG(have_makeinfo, makeinfo, yes, no) AC_CHECK_PROG(have_makeinfo, makeinfo, yes, no)
AM_CONDITIONAL(HAVE_MAKEINFO, test "$have_makeinfo" = yes) AM_CONDITIONAL(HAVE_MAKEINFO, test "$have_makeinfo" = yes)

2
libguile/Makefile.am
View file

@ -446,7 +446,7 @@ noinst_HEADERS += vm-engine.c vm-i-system.c vm-i-scheme.c vm-i-loader.c
libguile_@GUILE_EFFECTIVE_VERSION@_la_DEPENDENCIES = @LIBLOBJS@ libguile_@GUILE_EFFECTIVE_VERSION@_la_DEPENDENCIES = @LIBLOBJS@
libguile_@GUILE_EFFECTIVE_VERSION@_la_LIBADD = \ libguile_@GUILE_EFFECTIVE_VERSION@_la_LIBADD = \
@LIBLOBJS@ $(gnulib_library) $(LTLIBGMP) \ @LIBLOBJS@ $(gnulib_library) $(LTLIBGMP) $(LTLIBLTDL) \
$(LTLIBUNISTRING) $(LTLIBICONV) $(LTLIBINTL) $(LTLIBUNISTRING) $(LTLIBICONV) $(LTLIBINTL)
libguile_@GUILE_EFFECTIVE_VERSION@_la_LDFLAGS = \ libguile_@GUILE_EFFECTIVE_VERSION@_la_LDFLAGS = \
@LTLIBINTL@ $(LIBFFI_LIBS) $(INET_NTOP_LIB) $(INET_PTON_LIB) \ @LTLIBINTL@ $(LIBFFI_LIBS) $(INET_NTOP_LIB) $(INET_PTON_LIB) \