autoconf: add support for --with-murphy

diff --git a/Makefile.am b/Makefile.am
index b41e175..346b2bf 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,6 +5,16 @@ SUBDIRS = pkgconfig-arm
 endif
 SUBDIRS += init
 
+if MURPHY_SUPPORT
+EXTRA_SOURCES =
+EXTRA_CFLAGS  = -DMURPHY_SUPPORT
+EXTRA_LIBS    =
+else
+EXTRA_SOURCES = avsys-audio-alsa.c avsys-audio-ascenario.c
+EXTRA_CFLAGS  = $(ASCN_CFLAGS)
+EXTRA_LIBS    = $(ASCN_LIBS)
+endif
+
 lib_LTLIBRARIES = libavsysaudio.la
 
 includelibavsysaudiodir = $(includedir)/avsystem
@@ -19,9 +29,8 @@ libavsysaudio_la_SOURCES = avsys-common.c \
                         avsys-audio-handle.c \
                         avsys-audio-shm.c \
                         avsys-audio-sync.c \
-                        avsys-audio-alsa.c \
                         avsys-audio.c \
-                        avsys-audio-ascenario.c \
+                        $(EXTRA_SOURCES) \
                         avsys-audio-path.c \
                         avsys-audio-pactrl.c
 
@@ -32,11 +41,8 @@ libavsysaudio_la_LDFLAGS = -Wl,-init, __init_module
 libavsysaudio_la_LDFLAGS += -Wl,-fini, __fini_module -version-info 0:1:0
 
 libavsysaudio_la_SOURCES += avsys-audio-pasimple.c
-libavsysaudio_la_CFLAGS += $(PASIMPLE_CFLAGS) $(PA_CFLAGS)
-libavsysaudio_la_LIBADD += $(PASIMPLE_LIBS) $(PA_LIBS)
-
-libavsysaudio_la_CFLAGS += $(ASCN_CFLAGS)
-libavsysaudio_la_LIBADD += $(ASCN_LIBS)
+libavsysaudio_la_CFLAGS += $(PASIMPLE_CFLAGS) $(PA_CFLAGS) $(EXTRA_CFLAGS)
+libavsysaudio_la_LIBADD += $(PASIMPLE_LIBS) $(PA_LIBS) $(EXTRA_LIBS)
 
 
 if IS_SDK

diff --git a/avsys-audio-path.c b/avsys-audio-path.c
index 7b37ae2..d173619 100644 (file)
--- a/avsys-audio-path.c
+++ b/avsys-audio-path.c
@@ -38,8 +38,11 @@
 #include "avsys-common.h"
 #include "avsys-audio-handle.h"
 #include "avsys-audio-logical-volume.h"
+
+#ifndef MURPHY_SUPPORT
 #include "avsys-audio-alsa.h"
 #include "avsys-audio-ascenario.h"
+#endif
 
 #define EXPORT_API __attribute__((__visibility__("default")))
 

diff --git a/configure.ac b/configure.ac
index 0b681de..1e2d4c5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -44,10 +44,6 @@ AC_ARG_ENABLE(audiotest, AC_HELP_STRING([--enable-audiotest], [build audio test
 AM_CONDITIONAL([WITH_AUDIOTEST], [test "x$WITH_AUDIOTEST" = "xyes"])
 
 # Checks for libraries.
-PKG_CHECK_MODULES(ALSA, alsa >= 1.0.15)
-AC_SUBST(ALSA_CFLAGS)
-AC_SUBST(ALSA_LIBS)
-
 PKG_CHECK_MODULES(EXIF, libexif)
 AC_SUBST(EXIF_CFLAGS)
 AC_SUBST(EXIF_LIBS)
@@ -67,9 +63,27 @@ PKG_CHECK_MODULES(PA, libpulse)
 AC_SUBST(PA_CFLAGS)
 AC_SUBST(PA_LIBS)
 
-PKG_CHECK_MODULES(ASCN, libascenario)
-AC_SUBST(ASCN_CFLAGS)
-AC_SUBST(ASCN_LIBS)
+# check for Murphy support
+AC_ARG_WITH([murphy],
+            [AS_HELP_STRING([--with-murphy],
+                            [use pulseaudio-module-murphy-ivi for routing])],
+            [],
+            [with_murphy=no]
+)
+
+AS_IF([ test x$with_murphy = xno ],
+      [ PKG_CHECK_MODULES(ALSA, alsa >= 1.0.15)
+        AC_SUBST(ALSA_CFLAGS)
+        AC_SUBST(ALSA_LIBS)
+
+        PKG_CHECK_MODULES(ASCN, libascenario)
+        AC_SUBST(ASCN_CFLAGS)
+        AC_SUBST(ASCN_LIBS)
+       ]
+)
+
+AM_CONDITIONAL(MURPHY_SUPPORT, [ test x$with_murphy = "xyes" ])
+
 
 PKG_CHECK_MODULES(INIPARSER, iniparser)
 AC_SUBST(INIPARSER_CFLAGS)
@@ -94,13 +108,13 @@ AC_TYPE_SIGNAL
 AC_CHECK_FUNCS([memset select])
 
 AC_CONFIG_FILES([
-Makefile
-pkgconfig-arm/Makefile
-pkgconfig-arm/avsystem.pc
-pkgconfig-arm/avsysaudio.pc
-pkgconfig-i386/Makefile
-pkgconfig-i386/avsystem.pc
-pkgconfig-i386/avsysaudio.pc
-init/Makefile
+        Makefile
+        pkgconfig-arm/Makefile
+        pkgconfig-arm/avsystem.pc
+        pkgconfig-arm/avsysaudio.pc
+        pkgconfig-i386/Makefile
+        pkgconfig-i386/avsystem.pc
+        pkgconfig-i386/avsysaudio.pc
+        init/Makefile
 ])
 AC_OUTPUT