From 78e082682d5d833fd271899b67d6a203acffa803 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gy=C3=B6rgy=20Ball=C3=B3?= Date: Wed, 23 Nov 2011 07:59:47 +0100 Subject: Make Control Center panel optional --- configure.ac | 55 +++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 39 insertions(+), 16 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 07f52d7..1b5dbf5 100644 --- a/configure.ac +++ b/configure.ac @@ -103,14 +103,34 @@ PKG_CHECK_MODULES(SERVICE, indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION gdk-3.0 >= GDK_REQUIRED_VERSION gconf-2.0 >= GCONF_REQUIRED_VERSION) -PKG_CHECK_MODULES(PREF, gio-2.0 >= $GIO_REQUIRED_VERSION - gtk+-3.0 >= $GTK3_REQUIRED_VERSION - json-glib-1.0 - libgnome-control-center - polkit-gobject-1) - -PKG_CHECK_MODULES(LIBMAP, gio-2.0 >= $GIO_REQUIRED_VERSION - gtk+-3.0 >= $GTK3_REQUIRED_VERSION) +########################### +# Control Center panel +########################### + +AC_ARG_WITH([ccpanel], + AS_HELP_STRING([--with-ccpanel], [enable Control Center panel]),, + with_ccpanel=auto) + +if test x"$with_ccpanel" != x"no" ; then + PKG_CHECK_MODULES(PREF, gio-2.0 >= $GIO_REQUIRED_VERSION + gtk+-3.0 >= $GTK3_REQUIRED_VERSION + json-glib-1.0 + libgnome-control-center + polkit-gobject-1, + [have_ccpanel=yes], + [have_ccpanel=no]) + if test x${have_ccpanel} = xyes; then + AC_DEFINE(HAVE_CCPANEL, 1, [Define to 1 to enable Control Center panel]) + PKG_CHECK_MODULES(LIBMAP, gio-2.0 >= $GIO_REQUIRED_VERSION + gtk+-3.0 >= $GTK3_REQUIRED_VERSION) + fi + if test x${with_ccpanel} = xyes && test x${have_ccpanel} = xno; then + AC_MSG_ERROR([Control Center panel configured but not found]) + fi +else + have_ccpanel=no +fi +AM_CONDITIONAL(BUILD_CCPANEL, test x${have_ccpanel} = xyes) ########################### # Grab the GSettings Macros @@ -151,16 +171,18 @@ AC_SUBST(INDICATORICONSDIR) # Control Center Info ########################### -AS_IF([test "x$with_localinstall" = "xyes"], - [ - CCPANELDIR="${libdir}/control-center-1/panels/" - ], +AS_IF([test "x$have_ccpanel" = "xyes"], [ - CCPANELDIR=`$PKG_CONFIG --variable=extensiondir libgnome-control-center` - ]) - -AC_SUBST(CCPANELDIR) + AS_IF([test "x$with_localinstall" = "xyes"], + [ + CCPANELDIR="${libdir}/control-center-1/panels/" + ], + [ + CCPANELDIR=`$PKG_CONFIG --variable=extensiondir libgnome-control-center` + ]) + AC_SUBST(CCPANELDIR) + ]) ########################### # DBus Service Info ########################### @@ -224,5 +246,6 @@ Date and Time Indicator Configuration: Prefix: $prefix Indicator Dir: $INDICATORDIR + CC Panel: $have_ccpanel CC Panel Dir: $CCPANELDIR ]) -- cgit v1.2.3 From 4b4a2a0b444d26303df7865cebb56bf942c6d022 Mon Sep 17 00:00:00 2001 From: Allan LeSage Date: Tue, 6 Dec 2011 18:43:35 -0600 Subject: Added coverage reporting via gcov config and targets. --- configure.ac | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 07f52d7..6b01de7 100644 --- a/configure.ac +++ b/configure.ac @@ -118,6 +118,16 @@ PKG_CHECK_MODULES(LIBMAP, gio-2.0 >= $GIO_REQUIRED_VERSION GLIB_GSETTINGS +########################### +# gcov coverage reporting +########################### + +m4_include([m4/gcov.m4]) +AC_TDD_GCOV +AC_SUBST(COVERAGE_CFLAGS) +AC_SUBST(COVERAGE_CXXFLAGS) +AC_SUBST(COVERAGE_LDFLAGS) + ########################### # Check to see if we're local ########################### @@ -225,4 +235,5 @@ Date and Time Indicator Configuration: Prefix: $prefix Indicator Dir: $INDICATORDIR CC Panel Dir: $CCPANELDIR + gcov: $use_gcov ]) -- cgit v1.2.3 From 49965d030fd65d3607ea0b611545163d45019852 Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Mon, 9 Jan 2012 12:09:20 +0000 Subject: use libtimezonemap --- configure.ac | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 07f52d7..9ba19bf 100644 --- a/configure.ac +++ b/configure.ac @@ -106,12 +106,10 @@ PKG_CHECK_MODULES(SERVICE, indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION PKG_CHECK_MODULES(PREF, gio-2.0 >= $GIO_REQUIRED_VERSION gtk+-3.0 >= $GTK3_REQUIRED_VERSION json-glib-1.0 + timezonemap libgnome-control-center polkit-gobject-1) -PKG_CHECK_MODULES(LIBMAP, gio-2.0 >= $GIO_REQUIRED_VERSION - gtk+-3.0 >= $GTK3_REQUIRED_VERSION) - ########################### # Grab the GSettings Macros ########################### @@ -206,7 +204,6 @@ AM_GLIB_GNU_GETTEXT AC_CONFIG_FILES([ Makefile -libmap/Makefile src/Makefile data/Makefile tests/Makefile -- cgit v1.2.3 From fe58c7854934c37a765b7c50721c4a7e7bda5aab Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Mon, 9 Jan 2012 14:06:50 +0100 Subject: and move TimezoneCompletion to libtimezonemap too --- configure.ac | 1 - 1 file changed, 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 9ba19bf..9966f72 100644 --- a/configure.ac +++ b/configure.ac @@ -105,7 +105,6 @@ PKG_CHECK_MODULES(SERVICE, indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION PKG_CHECK_MODULES(PREF, gio-2.0 >= $GIO_REQUIRED_VERSION gtk+-3.0 >= $GTK3_REQUIRED_VERSION - json-glib-1.0 timezonemap libgnome-control-center polkit-gobject-1) -- cgit v1.2.3 From d5ba046b47ad9818f8d22f0aac0efe7e625ceb96 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 31 Jan 2012 21:26:39 -0600 Subject: Updating dbusmenu-gtk to 0.5.90 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 07f52d7..32be68e 100644 --- a/configure.ac +++ b/configure.ac @@ -58,7 +58,7 @@ AC_ARG_WITH([gtk], INDICATOR_REQUIRED_VERSION=0.3.19 DBUSMENUGLIB_REQUIRED_VERSION=0.1.1 -DBUSMENUGTK_REQUIRED_VERSION=0.3.94 +DBUSMENUGTK_REQUIRED_VERSION=0.5.90 GIO_REQUIRED_VERSION=2.25.11 INDICATOR_DISPLAY_OBJECTS=0.2.2 GEOCLUE_REQUIRED_VERSION=0.12.0 -- cgit v1.2.3 From 59ade0a5dad1cb85f3576fc89c323a8baceb3a5e Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 17 Feb 2012 16:13:27 -0600 Subject: 0.3.90 --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index e548545..9ab4c38 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_INIT([indicator-datetime], - [0.3.1], + [0.3.90], [http://bugs.launchpad.net/indicator-datetime], [indicator-datetime], [http://launchpad.net/indicator-datetime]) @@ -12,7 +12,7 @@ AC_CONFIG_SRCDIR([configure.ac]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([build-aux]) -AM_INIT_AUTOMAKE([1.11 -Wall dist-xz]) +AM_INIT_AUTOMAKE([1.11 -Wall]) AM_MAINTAINER_MODE([enable]) AM_SILENT_RULES([yes]) -- cgit v1.2.3