From b8f5e0707f454ff8d9e87c65aa058847f587be34 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Sun, 16 Jun 2013 23:31:41 -0500 Subject: update build rules: remove now-unneeded build dependencies for libindicator, gtk, gnome-settings-daemon-dev, libupower-glib, libdbus-1-dev --- configure.ac | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 0601c16..c6cc8e0 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,9 @@ AC_INIT([indicator-power], - [12.10.6], + [13.10.0], [http://bugs.launchpad.net/indicator-power], [indicator-power], [http://launchpad.net/indicator-power]) +AC_COPYRIGHT([Copyright 2011-2013 Canonical]) AC_PREREQ([2.64]) @@ -29,25 +30,20 @@ LT_INIT ########################### # Dependencies ########################### + GLIB_REQUIRED_VERSION=2.35.4 GIO_REQUIRED_VERSION=2.26 -GTK_REQUIRED_VERSION=3.0 -INDICATOR_REQUIRED_VERSION=0.3.90 -UPOWER_REQUIRED_VERSION=0.9.5 +GIO_UNIX_REQUIRED_VERSION=2.26 GSD_REQUIRED_VERSION=3.1.4 -PKG_CHECK_MODULES([UPOWER],[upower-glib >= UPOWER_REQUIRED_VERSION]) - -PKG_CHECK_MODULES([INDICATOR],[glib-2.0 >= $GLIB_REQUIRED_VERSION - gio-2.0 >= $GIO_REQUIRED_VERSION - gtk+-3.0 >= $GTK_REQUIRED_VERSION - indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION -]) -PKG_CHECK_MODULES([GSD],[gnome-settings-daemon >= $GSD_REQUIRED_VERSION]) +PKG_CHECK_MODULES([SERVICE_DEPS],[glib-2.0 >= $GLIB_REQUIRED_VERSION + gio-2.0 >= $GIO_REQUIRED_VERSION + gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION]) ########################### # GSETTINGS ########################### + GLIB_GSETTINGS ########################### @@ -126,13 +122,14 @@ AC_DEFUN([AC_DEFINE_PATH], [ # Internationalization ########################### -IT_PROG_INTLTOOL([0.41.0]) +IT_PROG_INTLTOOL([0.50.0]) AM_GNU_GETTEXT([external]) AM_GNU_GETTEXT_VERSION([0.17]) AC_SUBST([GETTEXT_PACKAGE],[${PACKAGE_TARNAME}]) AC_DEFINE([GETTEXT_PACKAGE],[PACKAGE_TARNAME],[Define to the gettext package name.]) +AC_DEFINE_PATH([GNOMELOCALEDIR],"${datadir}/locale",[locale directory]) ########################### # Files -- cgit v1.2.3 From 9990582a27a15942c6f4183b844cf532e217c788 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Mon, 17 Jun 2013 18:01:04 -0500 Subject: remove the gtest-xorg dependency, we're no longer using gui elements in the tests --- configure.ac | 1 - 1 file changed, 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index c6cc8e0..5e29f36 100644 --- a/configure.ac +++ b/configure.ac @@ -57,7 +57,6 @@ AC_ARG_ENABLE([tests], if test "x$enable_tests" != "xno"; then m4_include([m4/gtest.m4]) CHECK_GTEST - CHECK_XORG_GTEST if test "x$enable_tests" = "xauto"; then enable_tests=${have_gtest} elif test "x$enable_tests" = "xyes" && test "x$have_gtest" != "xyes"; then -- cgit v1.2.3 From 8e052aeeb9498bc693306771e0dfbbdfda8d70e7 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Tue, 18 Jun 2013 20:59:56 -0500 Subject: remove INDICATORDIR and INDICATORICONSDIR from configure.ac --- configure.ac | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 5e29f36..20462fa 100644 --- a/configure.ac +++ b/configure.ac @@ -89,18 +89,6 @@ AC_ARG_ENABLE([localinstall], [with_localinstall=$enableval], [with_localinstall=no]) -########################### -# Indicator Info -########################### - -AS_IF([test "x$with_localinstall" = "xyes"], - [INDICATORDIR="${libdir}/indicators3/2/" - INDICATORICONSDIR="${datadir}/indicator-applet/icons/"], - [INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3-0.4` - INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator3-0.4`]) -AC_SUBST(INDICATORDIR) -AC_SUBST(INDICATORICONSDIR) - ############################## # Custom Junk ############################## -- cgit v1.2.3 From f566ca0df0de10f82601d7fad7fd438c8f6963e3 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 19 Jun 2013 00:29:55 -0500 Subject: add a dbus service file for indicator-power... --- configure.ac | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 20462fa..84e9423 100644 --- a/configure.ac +++ b/configure.ac @@ -89,6 +89,15 @@ AC_ARG_ENABLE([localinstall], [with_localinstall=$enableval], [with_localinstall=no]) +########################### +# DBus Service Info +########################### + +AS_IF([test "x$with_localinstall" = "xyes"], + [DBUSSERVICEDIR="${datadir}/dbus-1/services/"], + [DBUSSERVICEDIR=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1`]) +AC_SUBST(DBUSSERVICEDIR) + ############################## # Custom Junk ############################## -- cgit v1.2.3 From eeb91e4b337a67c1656751942905129033c5a885 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 19 Jun 2013 07:29:43 -0500 Subject: in configure.ac, add AM_PROG_AR to silence an autotools warning caused by the temporary static libraries created in src/ --- configure.ac | 1 + 1 file changed, 1 insertion(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 84e9423..aa1cc12 100644 --- a/configure.ac +++ b/configure.ac @@ -21,6 +21,7 @@ AM_SILENT_RULES([yes]) AC_PROG_CC AM_PROG_CC_C_O AC_PROG_CXX +AM_PROG_AR # Initialize libtool LT_PREREQ([2.2.6]) -- cgit v1.2.3