Mercurial > hg > pulseaudio
changeset 58:6d8250e41a44
merged branches
| author | Omair Majid <omajid@redhat.com> |
|---|---|
| date | Mon, 11 Aug 2008 14:40:43 -0400 |
| parents | 3a4ea335aefc (current diff) 6191e870eef3 (diff) |
| children | 03d5da3409ac |
| files | src/native/Makefile.am |
| diffstat | 3 files changed, 20 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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@redhat.com> + + * configure.ac: Add check for libpulse. + * src/native/Makefile.am: Use flags from PKG_CHECK_MODULES. + 2008-08-11 Joshua Sumali <jsumali@redhat.com> * src/native/Makefile.am: Add flags to link against pulseaudio.
--- 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@redhat.com]) +AC_INIT([pulseaudio-java],[0.1],[omajid@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
--- 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 @@ 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