build-sys: check and link against necessary murphy libraries.

diff --git a/configure.ac b/configure.ac
index 0a830a6..94491b1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -91,6 +91,13 @@ fi
 
 AC_SUBST(WARNING_CFLAGS)
 
+# Check for the necessary Murphy components.
+PKG_CHECK_MODULES(MURPHY_COMMON,    murphy-common)
+PKG_CHECK_MODULES(MURPHY_DBUS,      murphy-dbus)
+PKG_CHECK_MODULES(MURPHY_PULSE,     murphy-pulse)
+PKG_CHECK_MODULES(MURPHY_RESOURCE,  murphy-resource)
+PKG_CHECK_MODULES(MURPHY_BREEDLINE, breedline-murphy)
+
 # Check for PulseAudio.
 PKG_CHECK_MODULES(PULSE, libpulse >= 0.9.22)
 AC_SUBST(PULSE_CFLAGS)
@@ -212,3 +219,25 @@ echo "----- configuration -----"
 echo "Extra C warnings flags: $WARNING_CFLAGS"
 echo "D-Bus support: $enable_dbus"
 echo "Sphinx support: $enable_sphinx"
+
+if test "$DUMP_LIB_FLAGS" = "yes"; then
+    echo "MURPHY_COMMON:"
+    echo "  CFLAGS: $MURPHY_COMMON_CFLAGS"
+    echo "  LIBS  : $MURPHY_COMMON_LIBS"
+
+    echo "MURPHY_DBUS:"
+    echo "  CFLAGS: $MURPHY_DBUS_CFLAGS"
+    echo "  LIBS  : $MURPHY_DBUS_LIBS"
+
+    echo "MURPHY_PULSE:"
+    echo "  CFLAGS: $MURPHY_PULSE_CFLAGS"
+    echo "  LIBS  : $MURPHY_PULSE_LIBS"
+
+    echo "MURPHY_RESOURCE:"
+    echo "  CFLAGS: $MURPHY_RESOURCE_CFLAGS"
+    echo "  LIBS  : $MURPHY_RESOURCE_LIBS"
+
+    echo "MURPHY_BREEDLINE:"
+    echo "  CFLAGS: $MURPHY_BREEDLINE_CFLAGS"
+    echo "  LIBS  : $MURPHY_BREEDLINE_LIBS"
+fi

diff --git a/src/Makefile.am b/src/Makefile.am
index 311a393..89d887a 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -29,14 +29,18 @@ srs_daemon_SOURCES =                                \
 
 srs_daemon_CFLAGS =                            \
                $(AM_CFLAGS)                    \
+               $(MURPHY_PULSE_CFLAGS)          \
+               $(MURPHY_DBUS_CFLAGS)           \
+               $(MURPHY_COMMON_CFLAGS)         \
+               $(MURPHY_RESOURCE_CFLAGS)       \
                $(PULSE_CFLAGS)                 \
                $(DBUS_CFLAGS)
 
 srs_daemon_LDADD =                             \
-               ../src/libmurphy-pulse.la       \
-               ../src/libmurphy-dbus.la        \
-               ../src/libmurphy-common.la      \
-               ../src/libmurphy-resource.la    \
+               $(MURPHY_PULSE_LIBS)            \
+               $(MURPHY_DBUS_LIBS)             \
+               $(MURPHY_RESOURCE_LIBS)         \
+               $(MURPHY_COMMON_LIBS)           \
                $(PULSE_LIBS)                   \
                $(DBUS_LIBS)                    \
                -ldl
@@ -50,14 +54,17 @@ srs_client_SOURCES =                                \
 
 srs_client_CFLAGS =                            \
                $(AM_CFLAGS)                    \
+               $(MURPHY_PULSE_CFLAGS)          \
+               $(MURPHY_DBUS_CFLAGS)           \
+               $(MURPHY_BREEDLINE_CFLAGS)      \
+               $(MURPHY_COMMON_CFLAGS)         \
                $(DBUS_CFLAGS)
 
 srs_client_LDADD =                             \
-               ../src/libmurphy-pulse.la       \
-               ../src/libmurphy-dbus.la        \
-               ../src/libbreedline-murphy.la   \
-               ../src/libmurphy-common.la      \
-               ../src/libbreedline.la          \
+               $(MURPHY_PULSE_LIBS)            \
+               $(MURPHY_DBUS_LIBS)             \
+               $(MURPHY_BREEDLINE_LIBS)        \
+               $(MURPHY_COMMON_LIBS)           \
                $(PULSE_LIBS)                   \
                $(DBUS_LIBS)