[gnome-settings-daemon] sound: Add pkg-config check for sound plugin's requirements



commit 73257c3f58e1aa5ac7487ecdf7bbe911a797a31e
Author: Bastien Nocera <hadess hadess net>
Date:   Mon Jul 2 15:05:02 2012 +0100

    sound: Add pkg-config check for sound plugin's requirements

 configure.ac              |    6 ++++++
 plugins/sound/Makefile.am |    4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 25c02e2..9a81e3e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -203,6 +203,12 @@ if test x$enable_gudev != xno; then
 	PKG_CHECK_MODULES(ORIENTATION, [gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION gudev-1.0])
 fi
 
+dnl ---------------------------------------------------------------------------
+dnl - sound plugin stuff
+dnl ---------------------------------------------------------------------------
+
+PKG_CHECK_MODULES(SOUND, [libpulse >= $PA_REQUIRED_VERSION $GUDEV_PKG libpulse-mainloop-glib >= $PA_REQUIRED_VERSION])
+
 # ---------------------------------------------------------------------------
 # Power
 # ---------------------------------------------------------------------------
diff --git a/plugins/sound/Makefile.am b/plugins/sound/Makefile.am
index d17b356..3197e24 100644
--- a/plugins/sound/Makefile.am
+++ b/plugins/sound/Makefile.am
@@ -17,7 +17,7 @@ libsound_la_CPPFLAGS = \
 libsound_la_CFLAGS = \
 	$(PLUGIN_CFLAGS)		\
 	$(SETTINGS_PLUGIN_CFLAGS) \
-	$(PULSE_CFLAGS)	\
+	$(SOUND_CFLAGS)	\
 	$(AM_CFLAGS)
 
 libsound_la_LDFLAGS = \
@@ -25,7 +25,7 @@ libsound_la_LDFLAGS = \
 
 libsound_la_LIBADD = \
 	$(SETTINGS_PLUGIN_LIBS)	\
-	$(PULSE_LIBS)
+	$(SOUND_LIBS)
 
 plugin_in_files = \
 	sound.gnome-settings-plugin.in



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]