[gnome-settings-daemon] datetime: Fix build requirements
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-settings-daemon] datetime: Fix build requirements
- Date: Mon, 14 Nov 2011 18:52:38 +0000 (UTC)
commit 0098c1d7b92d3296fe7659c5f9099e6444dde9d2
Author: Bastien Nocera <hadess hadess net>
Date: Mon Nov 14 18:51:55 2011 +0000
datetime: Fix build requirements
configure.ac | 4 ++--
plugins/datetime/Makefile.am | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 1479ff3..949bbaa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -304,7 +304,7 @@ dnl ==============================================
PKG_CHECK_MODULES(UPOWER, upower-glib >= 0.9.1 libcanberra-gtk3)
# ---------------------------------------------------------------------------
-# PolicyKit
+# PolicyKit for the date & time mechanism
# ---------------------------------------------------------------------------
POLKIT_REQUIRED=0.97
@@ -324,7 +324,7 @@ if test "x$enable_polkit" = "xno" ; then
HAVE_POLKIT=no
else
HAVE_POLKIT=no
- PKG_CHECK_MODULES(POLKIT, polkit-gobject-1 >= $POLKIT_REQUIRED dbus-1 >= $DBUS_REQUIRED, HAVE_POLKIT=yes, HAVE_POLKIT=no)
+ PKG_CHECK_MODULES(POLKIT, polkit-gobject-1 >= $POLKIT_REQUIRED dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION, HAVE_POLKIT=yes, HAVE_POLKIT=no)
if test "x$enable_polkit" = "xyes" -a "x$HAVE_POLKIT" = "xno" ; then
AC_MSG_ERROR(PolicyKit support explicity enabled but not available)
diff --git a/plugins/datetime/Makefile.am b/plugins/datetime/Makefile.am
index 69032fb..fdbf0e0 100644
--- a/plugins/datetime/Makefile.am
+++ b/plugins/datetime/Makefile.am
@@ -37,11 +37,11 @@ if HAVE_POLKIT
BUILT_SOURCES = gsd-datetime-mechanism-glue.h
endif
-AM_CFLAGS = $(PLUGIN_CFLAGS) $(SETTINGS_PLUGIN_CFLAGS) $(POLKIT_CFLAGS)
-gsd_datetime_mechanism_LDADD = $(POLKIT_LIBS) $(SETTINGS_PLUGIN_LIBS)
+AM_CFLAGS = $(POLKIT_CFLAGS)
+gsd_datetime_mechanism_LDADD = $(POLKIT_LIBS)
test_system_timezone_SOURCES = test-system-timezone.c system-timezone.c system-timezone.h
-test_system_timezone_LDADD = $(POLKIT_LIBS) $(SETTINGS_PLUGIN_LIBS)
+test_system_timezone_LDADD = $(POLKIT_LIBS)
if HAVE_POLKIT
dbus_services_DATA = $(dbus_services_in_files:.service.in=.service)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]