diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rwxr-xr-x | bootstrap.sh | 9 | ||||
| -rw-r--r-- | configure.ac | 38 | ||||
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rw-r--r-- | src/modules/module-detect.c | 2 | ||||
| -rw-r--r-- | src/pulsecore/resampler.c | 2 |
6 files changed, 38 insertions, 16 deletions
diff --git a/Makefile.am b/Makefile.am index f4dd99890..8735d312b 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/bootstrap.sh b/bootstrap.sh index 6698f68b6..4ca2b339e 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 8e926f32e..be79759cb 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], @@ -237,9 +237,32 @@ 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 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. +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_dladvise_init], [LIBLTDL=-lltdl], [LIBLTDL=])], + [LIBLTDL=]) + +AS_IF([test "x$LIBLTDL" = "x"], + [AC_MSG_ERROR([Unable to find libltdl.])]) +AC_SUBST([LIBLTDL]) #### Determine build environment #### @@ -443,14 +466,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) #### @@ -1174,7 +1189,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 b59e50ae7..24623d3fd 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) \ diff --git a/src/modules/module-detect.c b/src/modules/module-detect.c index 1616d47c8..9ed262db4 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 6b3836e11..ff87284a4 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 |