mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-20 11:40:18 +02:00
Code Activity

* configure.in: Call AC_LIBLTDL_INSTALLABLE instead of

Browse source 
AC_LIB_LTDL.
(AC_CONFIG_SUBDIRS): Added libltdl.
(DLPREOPEN, LTDLINC, LIBLTDL): Moved AC_SUBST near other libtool
stuff.  Also subst LTDLINC instead of INCLTDL.
(AC_CONFIG_FILES): Removed libguile-ltdl/Makefile and
libguile-ltdl/upstream/Makefile.

* Makefile.am (SUBDIRS): Replaced libguile-ltdl with libltdl.
This commit is contained in:
Marius Vollmer 2004-10-22 13:01:32 +00:00
parent 77600f3e11
commit c62a2bb99f
2 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Makefile.am
View file

@ -21,8 +21,8 @@
AUTOMAKE_OPTIONS = 1.5
SUBDIRS = oop libguile-ltdl libguile ice-9 guile-config guile-readline \
scripts srfi doc examples test-suite benchmark-suite lang am \
SUBDIRS = oop libltdl libguile ice-9 guile-config guile-readline \
scripts srfi doc examples test-suite benchmark-suite lang am \
emacs
bin_SCRIPTS = guile-tools

15
configure.in
View file

@ -47,6 +47,7 @@ AH_TOP(/*GUILE_CONFIGURE_COPYRIGHT*/)
#
#--------------------------------------------------------------------
AC_CONFIG_SUBDIRS(libltdl)
AC_CONFIG_SUBDIRS(guile-readline)
#--------------------------------------------------------------------
@ -68,8 +69,12 @@ AC_MINIX
AM_PROG_CC_STDC
AC_LIBTOOL_DLOPEN
AC_LIBLTDL_INSTALLABLE
AC_PROG_LIBTOOL
AC_LIB_LTDL
AC_SUBST(DLPREOPEN)
AC_SUBST(LTDLINC)
AC_SUBST(LIBLTDL)
AC_CHECK_PROG(have_makeinfo, makeinfo, yes, no)
AM_CONDITIONAL(HAVE_MAKEINFO, test "$have_makeinfo" = yes)
@ -581,12 +586,6 @@ if test "$MINGW32" = "yes" ; then
fi
AC_SUBST(EXTRA_DEFS)
# FIXME: check to see if we still need these.
#AC_SUBST(INCLTDL)
#AC_SUBST(LIBLTDL)
AC_SUBST(DLPREOPEN)
# Reasons for testing:
# crt_externs.h - Darwin specific
#
@ -1246,8 +1245,6 @@ AC_CONFIG_FILES([
lang/elisp/Makefile
lang/elisp/internals/Makefile
lang/elisp/primitives/Makefile
libguile-ltdl/Makefile
libguile-ltdl/upstream/Makefile
libguile/Makefile
oop/Makefile
oop/goops/Makefile