summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2007-09-27 21:47:01 +0200
committerLennart Poettering <lennart@poettering.net>2007-09-27 21:47:01 +0200
commit2bbc77c90483855da33ac2bc40c704d99ad7b570 (patch)
treef625162be2ba75b16a0d87e446cbd26cdd999686
parent3e993f7213455e6cb0259aebfe6f808d2efff73e (diff)
parent28d28609936bed81ea89676f89313a596dd5e331 (diff)
Merge branch 'master' of ssh://rootserver/home/lennart/git/public/libflashsupport
-rw-r--r--configure.ac6
1 files changed, 5 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index af311ad..d4a815e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,7 +71,11 @@ fi
PKG_PROG_PKG_CONFIG
-if test -d ../pulseaudio ; then
+if test x"$PULSEAUDIO_SOURCES" != x ; then
+ PULSE_CFLAGS="-I${PULSEAUDIO_SOURCES}/src"
+ PULSE_LIBS="-L${PULSEAUDIO_SOURCES}/src/.libs -lpulse"
+ echo "*** Using manually configured PA instance in ${PULSEAUDIO_SOURCES} ***"
+elif test -d ../pulseaudio ; then
PULSE_CFLAGS='-I$(top_srcdir)/../pulseaudio/src'
PULSE_LIBS='-L$(top_srcdir)/../pulseaudio/src/.libs -lpulse'
echo "*** Found pulseaudio in ../pulseaudio, using that version ***"