From c65d3a9fb04d2c598b5c7fec3a060ec97eb778b9 Mon Sep 17 00:00:00 2001
From: "Diego E. 'Flameeyes' Pettenò" <flameeyes@gmail.com>
Date: Thu, 22 Jan 2009 16:37:40 +0100
Subject: 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.
---
 src/Makefile.am | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src')

diff --git a/src/Makefile.am b/src/Makefile.am
index 8d1271c3..d77f4dc1 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) \
-- 
cgit 


From 3e5d9fd37ab2ebe7160c7ebc4393b15ba68f28e8 Mon Sep 17 00:00:00 2001
From: "Diego E. 'Flameeyes' Pettenò" <flameeyes@gmail.com>
Date: Thu, 22 Jan 2009 23:38:07 +0100
Subject: Use #ifdef to avoid warning about undefined macro.

---
 src/modules/module-detect.c | 2 +-
 src/pulsecore/resampler.c   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/modules/module-detect.c b/src/modules/module-detect.c
index 1616d47c..9ed262db 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 6b3836e1..ff87284a 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
 
-- 
cgit