[gnome-settings-daemon] orientation: Add own pkg-config checks
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-settings-daemon] orientation: Add own pkg-config checks
- Date: Fri, 15 Jun 2012 10:51:52 +0000 (UTC)
commit 73ba576755c8718fc42cacec0a667ccacb7a745c
Author: Bastien Nocera <hadess hadess net>
Date: Fri Jun 15 11:47:02 2012 +0100
orientation: Add own pkg-config checks
configure.ac | 8 ++++++++
plugins/orientation/Makefile.am | 14 ++++++--------
2 files changed, 14 insertions(+), 8 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 803a4fc..45277c3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -195,6 +195,14 @@ dnl ---------------------------------------------------------------------------
PKG_CHECK_MODULES(XRANDR, [gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION upower-glib >= $UPOWER_REQUIRED_VERSION])
+dnl ---------------------------------------------------------------------------
+dnl - orientation plugin stuff
+dnl ---------------------------------------------------------------------------
+
+if test x$enable_gudev != xno; then
+ PKG_CHECK_MODULES(ORIENTATION, [gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION gudev-1.0])
+fi
+
# ---------------------------------------------------------------------------
# Power
# ---------------------------------------------------------------------------
diff --git a/plugins/orientation/Makefile.am b/plugins/orientation/Makefile.am
index 6448e91..b1f60e3 100644
--- a/plugins/orientation/Makefile.am
+++ b/plugins/orientation/Makefile.am
@@ -11,16 +11,15 @@ test_orientation_CFLAGS = \
-I$(top_srcdir)/gnome-settings-daemon \
-I$(top_srcdir)/plugins/common \
-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
- $(GNOME_DESKTOP_CFLAGS) \
- $(GUDEV_CFLAGS) \
+ $(ORIENTATION_CFLAGS) \
$(PLUGIN_CFLAGS) \
$(SETTINGS_PLUGIN_CFLAGS) \
$(AM_CFLAGS)
-test_orientation_LDADD = \
+test_orientation_LDADD = \
$(top_builddir)/gnome-settings-daemon/libgsd.la \
- $(top_builddir)/plugins/common/libcommon.la \
- $(GUDEV_LIBS) \
+ $(top_builddir)/plugins/common/libcommon.la \
+ $(ORIENTATION_LIBS) \
$(SETTINGS_PLUGIN_LIBS)
plugin_LTLIBRARIES = liborientation.la
@@ -41,8 +40,7 @@ liborientation_la_CPPFLAGS = \
liborientation_la_CFLAGS = \
$(PLUGIN_CFLAGS) \
- $(GUDEV_CFLAGS) \
- $(GNOME_DESKTOP_CFLAGS) \
+ $(ORIENTATION_CFLAGS) \
$(SETTINGS_PLUGIN_CFLAGS) \
$(AM_CFLAGS)
@@ -51,7 +49,7 @@ liborientation_la_LDFLAGS = \
liborientation_la_LIBADD = \
$(top_builddir)/plugins/common/libcommon.la \
- $(GUDEV_LIBS) \
+ $(ORIENTATION_LIBS) \
$(SETTINGS_PLUGIN_LIBS)
plugin_in_files = orientation.gnome-settings-plugin.in
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]