From 67d73a0c2d945833224894e679d182911e7e5867 Mon Sep 17 00:00:00 2001 From: Ismo Puustinen Date: Mon, 30 Sep 2013 12:27:09 +0300 Subject: [PATCH] build: added AUL support for resource-asm. Change-Id: I836e25ea38a1d319863d47b114865639a5ce315e --- configure.ac | 9 +++++++++ packaging/murphy.spec | 1 + src/Makefile.am | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index ac916d1..a781c38 100644 --- a/configure.ac +++ b/configure.ac @@ -524,6 +524,15 @@ if test "$enable_resource_asm" != "no"; then fi AC_SUBST(AUDIO_SESSION_MANAGER_CFLAGS) AC_SUBST(AUDIO_SESSION_MANAGER_LIBS) + + # check for AUL + PKG_CHECK_MODULES(AUL, aul, [have_aul=yes], [have_aul=no]) + if test "$have_aul" = "no" -a "$enable_aul" = "yes"; then + AC_MSG_ERROR([AUL development headers not found.]) + fi + AC_SUBST(AUL_CFLAGS) + AC_SUBST(AUL_LIBS) + enable_resource_asm="$have_resource_asm" else AC_MSG_NOTICE([Audio Session Manager support is disabled.]) diff --git a/packaging/murphy.spec b/packaging/murphy.spec index 88169f0..fbe45fd 100644 --- a/packaging/murphy.spec +++ b/packaging/murphy.spec @@ -67,6 +67,7 @@ BuildRequires: pkgconfig(ofono) %endif %if %{?_with_audiosession:1}%{!?_with_audiosession:0} BuildRequires: pkgconfig(audio-session-mgr) +BuildRequires: pkgconfig(aul) %endif %if %{?_with_websockets:1}%{!?_with_websockets:0} BuildRequires: libwebsockets-devel diff --git a/src/Makefile.am b/src/Makefile.am index 3f9bd3d..bcb1a98 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1550,8 +1550,8 @@ endif # Audio Session Manager plugin RESOURCE_ASM_PLUGIN_SOURCES = plugins/plugin-resource-asm.c -RESOURCE_ASM_PLUGIN_CFLAGS = $(AUDIO_SESSION_MANAGER_CFLAGS) -RESOURCE_ASM_PLUGIN_LIBS = # no library support needed +RESOURCE_ASM_PLUGIN_CFLAGS = $(AUDIO_SESSION_MANAGER_CFLAGS) $(AUL_CFLAGS) +RESOURCE_ASM_PLUGIN_LIBS = $(AUL_LIBS) if RESOURCE_ASM_ENABLED -- 2.7.4