Remove support for internal distributing and bundling of libltdl.

Standing to what the libtool documentation says, the LTDL_INIT macro and
the related configure options are only useful when intending to distribute
libltdl, and is superfluous if the system copy were always to be used.

Which makes it very easy to just drop the internal copy and use the system
library, just do it like any other library lacking pkg-config files to
identify its presence.

If this tries to build against an older libtool version it might fail at
link time, so for now this is not an user-proof solution. But it at least
should provide a working environment for packagers.
This commit is contained in:
Diego E. 'Flameeyes' Pettenò 2009-01-22 16:37:40 +01:00
parent 7c7133e09d
commit c65d3a9fb0
3 changed files with 22 additions and 5 deletions

View file

@ -18,7 +18,7 @@
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = bootstrap.sh LICENSE GPL LGPL doxygen/Makefile.am doxygen/Makefile.in doxygen/doxygen.conf.in README todo EXTRA_DIST = bootstrap.sh LICENSE GPL LGPL doxygen/Makefile.am doxygen/Makefile.in doxygen/doxygen.conf.in README todo
SUBDIRS = libltdl src doxygen man po SUBDIRS = src doxygen man po
MAINTAINERCLEANFILES = MAINTAINERCLEANFILES =
noinst_DATA = noinst_DATA =

View file

@ -237,9 +237,28 @@ AS_IF([test "$pulseaudio_cv__Bool" = "yes"], [
#### libtool stuff #### #### libtool stuff ####
LT_PREREQ(2.2) LT_PREREQ(2.2)
LT_CONFIG_LTDL_DIR([libltdl])
LT_INIT([dlopen win32-dll disable-static]) LT_INIT([dlopen win32-dll disable-static])
LTDL_INIT([convenience recursive])
dnl Unfortunately, even up to libtool 2.2.6a there is no way to know
dnl exactly which version of libltdl is present in the system, so we
dnl just assume that it's a working version as long as we have the
dnl library and the header files.
dnl
dnl Check the header files first since the system may have a
dnl libltdl.so for runtime, but no headers, and we want to bail out as
dnl soon as possible.
dnl
dnl We don't need any special variable for this though, since the user
dnl can give the proper place to find libltdl through the standard
dnl variables like LDFLAGS and CPPFLAGS.
AC_CHECK_HEADER([ltdl.h],
[AC_CHECK_LIB([ltdl], [lt_dlopen], [LIBLTDL=-lltdl], [LIBLTDL=])],
[LIBLTDL=])
AS_IF([test "x$LIBLTDL" = "x"],
[AC_MSG_ERROR([Unable to find libltdl.])])
AC_SUBST([LIBLTDL])
#### Determine build environment #### #### Determine build environment ####
@ -1174,7 +1193,6 @@ AM_CONDITIONAL([FORCE_PREOPEN], [test "x$FORCE_PREOPEN" = "xyes"])
AC_CONFIG_FILES([ AC_CONFIG_FILES([
Makefile Makefile
libltdl/Makefile
src/Makefile src/Makefile
man/Makefile man/Makefile
libpulse.pc libpulse.pc

View file

@ -60,7 +60,6 @@ AM_CFLAGS = \
-I$(top_builddir)/src/modules/alsa \ -I$(top_builddir)/src/modules/alsa \
-I$(top_srcdir)/src/modules/raop \ -I$(top_srcdir)/src/modules/raop \
$(PTHREAD_CFLAGS) -D_POSIX_PTHREAD_SEMANTICS \ $(PTHREAD_CFLAGS) -D_POSIX_PTHREAD_SEMANTICS \
$(LTDLINCL) \
$(LIBSAMPLERATE_CFLAGS) \ $(LIBSAMPLERATE_CFLAGS) \
$(LIBSNDFILE_CFLAGS) \ $(LIBSNDFILE_CFLAGS) \
$(LIBSPEEX_CFLAGS) \ $(LIBSPEEX_CFLAGS) \