[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.13-370-g7bdbcd0
Lennart Poettering
gitmailer-noreply at 0pointer.de
Fri Jan 23 10:52:12 PST 2009
This is an automated email from the git hooks/post-receive script. It was
generated because of a push to the "PulseAudio Sound Server" repository.
The master branch has been updated
from 5cb29f3a606c8d5e66fea561b8a4ab1fe623a53d (commit)
- Log -----------------------------------------------------------------
7bdbcd0... drop --ltdl from the libtoolize invocation, since we don't ship ltdl anymore
f6fcbed... Merge commit 'flameeyes/flameeyes'
3e5d9fd... Use #ifdef to avoid warning about undefined macro.
a257448... Improve the ltdl discovery code by checking for libtool 2.x functions.
3293251... Move the safety check about pkg-config in bootstrap.sh.
1b20d28... Fix logic thinko.
c65d3a9... Remove support for internal distributing and bundling of libltdl.
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 2 +-
bootstrap.sh | 11 ++++++++++-
configure.ac | 38 ++++++++++++++++++++++++++------------
src/Makefile.am | 1 -
src/modules/module-detect.c | 2 +-
src/pulsecore/resampler.c | 2 +-
6 files changed, 39 insertions(+), 17 deletions(-)
-----------------------------------------------------------------------
commit c65d3a9fb04d2c598b5c7fec3a060ec97eb778b9
Author: Diego E. 'Flameeyes' Pettenò <flameeyes at gmail.com>
Date: Thu Jan 22 16:37:40 2009 +0100
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.
diff --git a/Makefile.am b/Makefile.am
index f4dd998..8735d31 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,7 +18,7 @@
ACLOCAL_AMFLAGS = -I m4
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 =
noinst_DATA =
diff --git a/configure.ac b/configure.ac
index 9912843..f659d49 100644
--- a/configure.ac
+++ b/configure.ac
@@ -237,9 +237,28 @@ AS_IF([test "$pulseaudio_cv__Bool" = "yes"], [
#### libtool stuff ####
LT_PREREQ(2.2)
-LT_CONFIG_LTDL_DIR([libltdl])
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 ####
@@ -1174,7 +1193,6 @@ AM_CONDITIONAL([FORCE_PREOPEN], [test "x$FORCE_PREOPEN" = "xyes"])
AC_CONFIG_FILES([
Makefile
-libltdl/Makefile
src/Makefile
man/Makefile
libpulse.pc
diff --git a/src/Makefile.am b/src/Makefile.am
index 8d1271c..d77f4dc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -60,7 +60,6 @@ AM_CFLAGS = \
-I$(top_builddir)/src/modules/alsa \
-I$(top_srcdir)/src/modules/raop \
$(PTHREAD_CFLAGS) -D_POSIX_PTHREAD_SEMANTICS \
- $(LTDLINCL) \
$(LIBSAMPLERATE_CFLAGS) \
$(LIBSNDFILE_CFLAGS) \
$(LIBSPEEX_CFLAGS) \
commit 1b20d287b9ff496a643c9256870c5cff0e3389f9
Author: Diego E. 'Flameeyes' Pettenò <flameeyes at gmail.com>
Date: Thu Jan 22 16:41:45 2009 +0100
Fix logic thinko.
diff --git a/configure.ac b/configure.ac
index f659d49..2b378c1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -105,7 +105,7 @@ dnl Check whether to build tests by default (as compile-test) or not
AC_ARG_ENABLE([default-build-tests],
AS_HELP_STRING([--disable-default-build-tests], [Build test programs only during make check]))
-AM_CONDITIONAL([BUILD_TESTS_DEFAULT], [test "x$enable_default_build_tests" = "xno"])
+AM_CONDITIONAL([BUILD_TESTS_DEFAULT], [test "x$enable_default_build_tests" != "xno"])
# Native atomic operation support
AC_ARG_ENABLE([atomic-arm-linux-helpers],
commit 3293251198effe635f4afa291b2f99219162db9d
Author: Diego E. 'Flameeyes' Pettenò <flameeyes at gmail.com>
Date: Thu Jan 22 16:52:41 2009 +0100
Move the safety check about pkg-config in bootstrap.sh.
Don't check twice for pkg-config during configure, since the undefined
macro would be possibly caused on a different system.
diff --git a/bootstrap.sh b/bootstrap.sh
index 6698f68..4ca2b33 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -40,6 +40,15 @@ run_versioned() {
set -ex
+# We check for this here, because if pkg-config is not found in the
+# system, it's likely that the pkg.m4 macro file is also not present,
+# which will make PKG_PROG_PKG_CONFIG be undefined and the generated
+# configure file faulty.
+if ! pkg-config --version &>/dev/null; then
+ echo "pkg-config is required to bootstrap this program" &>/dev/null
+ exit 1
+fi
+
if [ "x$1" = "xam" ] ; then
run_versioned automake "$VERSION" -a -c --foreign
./config.status
diff --git a/configure.ac b/configure.ac
index 2b378c1..11f9876 100644
--- a/configure.ac
+++ b/configure.ac
@@ -462,14 +462,6 @@ AC_SUBST(pulselocaledir)
#### pkg-config ####
-# Check for pkg-config manually first, as if its not installed the
-# PKG_PROG_PKG_CONFIG macro won't be defined.
-AC_CHECK_PROG(have_pkg_config, pkg-config, yes, no)
-
-if test x"$have_pkg_config" = "xno"; then
- AC_MSG_ERROR(pkg-config is required to install this program)
-fi
-
PKG_PROG_PKG_CONFIG
#### X11 (optional) ####
commit a257448ceb6c763e05bfbcdbd3c45dd61df95155
Author: Diego E. 'Flameeyes' Pettenò <flameeyes at gmail.com>
Date: Thu Jan 22 20:02:42 2009 +0100
Improve the ltdl discovery code by checking for libtool 2.x functions.
The lt_dladvise_* interfaces are implemented only in the 2.x series and are
not implemented in 1.4, so we can rely on their presence to know that the
version is good enough.
diff --git a/configure.ac b/configure.ac
index 11f9876..bc6c1ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -244,6 +244,10 @@ 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 As an extra safety device, check for lt_dladvise_init() which is
+dnl only implemented in libtool 2.x, and refine as we go if we have
+dnl refined requirements.
+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.
@@ -253,7 +257,7 @@ 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=])],
+ [AC_CHECK_LIB([ltdl], [lt_dladvise_init], [LIBLTDL=-lltdl], [LIBLTDL=])],
[LIBLTDL=])
AS_IF([test "x$LIBLTDL" = "x"],
commit 3e5d9fd37ab2ebe7160c7ebc4393b15ba68f28e8
Author: Diego E. 'Flameeyes' Pettenò <flameeyes at gmail.com>
Date: Thu Jan 22 23:38:07 2009 +0100
Use #ifdef to avoid warning about undefined macro.
diff --git a/src/modules/module-detect.c b/src/modules/module-detect.c
index 1616d47..9ed262d 100644
--- a/src/modules/module-detect.c
+++ b/src/modules/module-detect.c
@@ -239,7 +239,7 @@ int pa__init(pa_module*m) {
#ifdef HAVE_ALSA
if ((n = detect_alsa(m->core, just_one)) <= 0)
#endif
-#if HAVE_OSS
+#ifdef HAVE_OSS
if ((n = detect_oss(m->core, just_one)) <= 0)
#endif
#ifdef HAVE_SOLARIS
diff --git a/src/pulsecore/resampler.c b/src/pulsecore/resampler.c
index 6b3836e..ff87284 100644
--- a/src/pulsecore/resampler.c
+++ b/src/pulsecore/resampler.c
@@ -25,7 +25,7 @@
#include <string.h>
-#if HAVE_LIBSAMPLERATE
+#ifdef HAVE_LIBSAMPLERATE
#include <samplerate.h>
#endif
commit f6fcbed6d0fd04308341fa27465284212143824b
Merge: 5cb29f3... 3e5d9fd...
Author: Lennart Poettering <lennart at poettering.net>
Date: Fri Jan 23 19:46:52 2009 +0100
Merge commit 'flameeyes/flameeyes'
commit 7bdbcd0da82104e678d66ba68b27c7ce946712a8
Author: Lennart Poettering <lennart at poettering.net>
Date: Fri Jan 23 19:50:47 2009 +0100
drop --ltdl from the libtoolize invocation, since we don't ship ltdl anymore
diff --git a/bootstrap.sh b/bootstrap.sh
index 4ca2b33..e64f342 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -66,7 +66,7 @@ else
test "x$LIBTOOLIZE" = "x" && LIBTOOLIZE=libtoolize
intltoolize --copy --force --automake
- "$LIBTOOLIZE" -c --force --ltdl --recursive
+ "$LIBTOOLIZE" -c --force
run_versioned aclocal "$VERSION" -I m4
run_versioned autoconf 2.63 -Wall
run_versioned autoheader 2.63
--
hooks/post-receive
PulseAudio Sound Server
More information about the pulseaudio-commits
mailing list