From 0b4a07fe824b474b58fc17150b3d7734c2dfd929 Mon Sep 17 00:00:00 2001 From: Janos kovacs Date: Wed, 25 Sep 2013 22:33:42 -0700 Subject: [PATCH] building+packaging: add aul support Change-Id: Iea952880c432e1ad1c332bcbb6f6b9452394df40 --- configure.ac | 5 +++++ murphy/Makefile.am | 7 +++++-- packaging/pulseaudio-module-murphy-ivi.spec | 2 ++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 2f72c66..997184f 100644 --- a/configure.ac +++ b/configure.ac @@ -83,6 +83,9 @@ PKG_CHECK_MODULES(LUA, lua >= 5.1.1) AC_SUBST(LUA_CFLAGS) AC_SUBST(LUA_LIBS) +PKG_CHECK_MODULES(AUL, aul) +AC_SUBST(AUL_CFLAGS) +AC_SUBST(AUL_LIBS) # D-Bus AC_ARG_WITH([dbus], @@ -234,6 +237,8 @@ echo " LUAUTILS_LIBS ${LUAUTILS_LIBS} LUA_CFLAGS: ${LUA_CFLAGS} LUA_LIBS: ${LUA_LIBS} + AUL_CFLAGS ${AUL_CFLAGS} + AUL_LIBS ${AUL_LIBS} murphyif enabled: $build_with_murphyif MURPHYIF_CFLAGS ${MURPHYIF_CFLAGS} MURPHYIF_LIBS ${MURPHYIF_LIBS} diff --git a/murphy/Makefile.am b/murphy/Makefile.am index de2b159..bf3df26 100644 --- a/murphy/Makefile.am +++ b/murphy/Makefile.am @@ -58,8 +58,11 @@ module_murphy_ivi_la_LDFLAGS = -module -avoid-version -Wl,--no-undefined module_murphy_ivi_la_LIBADD = $(AM_LIBADD) $(CONDITIONAL_LIBS) \ $(LIBPULSE_LIBS) $(PULSEDEVEL_LIBS) \ $(MURPHYCOMMON_LIBS) $(MURPHYDOMCTL_LIBS) \ - $(LUAUTILS_LIBS) $(LUA_LIBS) + $(LUAUTILS_LIBS) $(LUA_LIBS) \ + $(AUL_LIBS) module_murphy_ivi_la_CFLAGS = $(AM_CFLAGS) $(CONDITIONAL_CFLAGS) \ $(LIBPULSE_CFLAGS) $(PULSEDEVEL_CFLAGS) \ $(MURPHYCOMMON_CFLAGS) $(MURPHYDOMCTL_CFLAGS) \ - $(LUAUTILS_CFLAGS) $(LUA_CFLAGS) + $(LUAUTILS_CFLAGS) $(LUA_CFLAGS) \ + $(AUL_CFLAGS) + diff --git a/packaging/pulseaudio-module-murphy-ivi.spec b/packaging/pulseaudio-module-murphy-ivi.spec index 17defcf..c3e2af1 100644 --- a/packaging/pulseaudio-module-murphy-ivi.spec +++ b/packaging/pulseaudio-module-murphy-ivi.spec @@ -20,7 +20,9 @@ Buildrequires: pkgconfig(json) BuildRequires: config(pulseaudio) BuildRequires: pkgconfig(murphy-pulse) BuildRequires: murphy-pulse +BuildRequires: pkgconfig(aul) Requires: pulseaudio +Requires: aul Conflicts: pulseaudio-module-combine-sink Conflicts: pulseaudio-module-augment-properties -- 2.7.4