changeset in /hg/pulseaudio: merged branches

[Omair Majid]

changeset 6d8250e41a44 in /hg/pulseaudio
details: http://icedtea.classpath.org/hg/pulseaudio?cmd=changeset;node=6d8250e41a44
description:
	merged branches

diffstat:

3 files changed, 20 insertions(+), 3 deletions(-)
ChangeLog              |    5 +++++
configure.ac           |   14 +++++++++++++-
src/native/Makefile.am |    4 ++--

diffs (50 lines):

diff -r 3a4ea335aefc -r 6d8250e41a44 ChangeLog
--- a/ChangeLog	Mon Aug 11 14:34:54 2008 -0400
+++ b/ChangeLog	Mon Aug 11 14:40:43 2008 -0400
@@ -1,3 +1,8 @@ 2008-08-11  Joshua Sumali  <jsumali at redh
+2008-08-11  Joshua Sumali  <jsumali at redhat.com>
+
+	* configure.ac: Add check for libpulse.
+	* src/native/Makefile.am: Use flags from PKG_CHECK_MODULES.
+
 2008-08-11  Joshua Sumali  <jsumali at redhat.com>
 
 	* src/native/Makefile.am: Add flags to link against pulseaudio.
diff -r 3a4ea335aefc -r 6d8250e41a44 configure.ac
--- a/configure.ac	Mon Aug 11 14:34:54 2008 -0400
+++ b/configure.ac	Mon Aug 11 14:40:43 2008 -0400
@@ -1,7 +1,19 @@ AC_INIT([pulseaudio],[0.1],[omajid at redha
-AC_INIT([pulseaudio],[0.1],[omajid at redhat.com])
+AC_INIT([pulseaudio-java],[0.1],[omajid at redhat.com])
 AM_INIT_AUTOMAKE
 AC_PROG_CC
 AC_PROG_LIBTOOL
+
+dnl Check for pulseaudio libraries.
+PKG_CHECK_MODULES(LIBPULSE,libpulse,[LIBPULSE_FOUND=yes]
+    ,[LIBPULSE_FOUND=no])
+if test "x${LIBPULSE_FOUND}" = xno
+then
+  AC_MSG_ERROR([Could not find pulseaudio libraries - \
+  Try installing pulseaudio-libs-devel.])
+fi
+AC_SUBST(LIBPULSE_CFLAGS)
+AC_SUBST(LIBPULSE_LIBS)
+
 AC_CONFIG_FILES([
 Makefile
 src/native/Makefile
diff -r 3a4ea335aefc -r 6d8250e41a44 src/native/Makefile.am
--- a/src/native/Makefile.am	Mon Aug 11 14:34:54 2008 -0400
+++ b/src/native/Makefile.am	Mon Aug 11 14:40:43 2008 -0400
@@ -12,8 +12,8 @@ libpulse_java_la_SOURCES = \
 	org_classpath_icedtea_pulseaudio_Operation.h \
 	org_classpath_icedtea_pulseaudio_Operation.c
 
-AM_CFLAGS = -g -Wall -Werror $(PLATFORM_FLAGS) -D_REENTRANT 
-AM_LDFLAGS = -g -Wall -Werror -lpulse
+AM_CFLAGS = -g -Wall -Werror $(PLATFORM_FLAGS) $(LIBPULSE_CFLAGS)
+AM_LDFLAGS = -g -Wall -Werror $(LIBPULSE_LIBS)
 
 PLATFORM_FLAGS = -DWITH_32BIT_PLATFORM