From 484079b4061417c109412be824bbadfea71d6110 Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Thu, 26 May 2011 13:32:22 -0400 Subject: use indicator3 path if using gtk3 --- configure.ac | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index d29a293..fe60d2a 100644 --- a/configure.ac +++ b/configure.ac @@ -93,9 +93,12 @@ AC_ARG_ENABLE(localinstall, AS_HELP_STRING([--enable-localinstall], [install all if test "x$with_localinstall" = "xyes"; then INDICATORDIR="${libdir}/indicators/2/" INDICATORICONSDIR="${datadir}/libindicate/icons/" -else +elif test "x$with_gtk" = x2; then INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator` INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator` +else + INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3` + INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator3` fi AC_SUBST(INDICATORDIR) AC_SUBST(INDICATORICONSDIR) -- cgit v1.2.3 From fc4bf64e283cc0d8961e551e620def2ca1d4e242 Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Thu, 26 May 2011 13:34:49 -0400 Subject: change to gtk3 by default --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index fe60d2a..c7be913 100644 --- a/configure.ac +++ b/configure.ac @@ -39,9 +39,9 @@ DBUS_GLIB_REQUIRED_VERSION=0.82 AC_ARG_WITH([gtk], [AS_HELP_STRING([--with-gtk], - [Which version of gtk to use @<:@default=2@:>@])], + [Which version of gtk to use @<:@default=3@:>@])], [], - [with_gtk=2]) + [with_gtk=3]) AS_IF([test "x$with_gtk" = x3], [PKG_CHECK_MODULES(INDICATOR, gtk+-3.0 >= $GTK3_REQUIRED_VERSION gio-2.0 >= $GIO_REQUIRED_VERSION -- cgit v1.2.3 From 58f47563b83be3659f2ab12630d3a11d9c426768 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 22 Jun 2011 11:12:48 -0500 Subject: Making tests use proper version of libappindicator and cleaning up libappindicator usage to use the same enum headers. --- configure.ac | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index c7be913..12d87dd 100644 --- a/configure.ac +++ b/configure.ac @@ -37,6 +37,8 @@ DBUSMENUGTK_REQUIRED_VERSION=0.3.91 JSON_GLIB_REQUIRED_VERSION=0.7.6 DBUS_GLIB_REQUIRED_VERSION=0.82 +LIBAPPINDICATOR_REQUIRED_VERSION=0.2.9 + AC_ARG_WITH([gtk], [AS_HELP_STRING([--with-gtk], [Which version of gtk to use @<:@default=3@:>@])], @@ -49,8 +51,9 @@ AS_IF([test "x$with_gtk" = x3], json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION) - AC_SUBST(INDICATOR_CFLAGS) - AC_SUBST(INDICATOR_LIBS) + + PKG_CHECK_MODULES(APPINDICATOR, appindicator3-0.1 >= $LIBAPPINDICATOR_REQUIRED_VERSION) + AC_DEFINE(HAVE_GTK3, 1, [whether gtk3 is available]) ], [test "x$with_gtk" = x2], @@ -60,24 +63,19 @@ AS_IF([test "x$with_gtk" = x3], json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION) - AC_SUBST(INDICATOR_CFLAGS) - AC_SUBST(INDICATOR_LIBS) + + PKG_CHECK_MODULES(APPINDICATOR, appindicator3-0.1 >= $LIBAPPINDICATOR_REQUIRED_VERSION) ], [AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])] ) AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" = x3]) -LIBAPPINDICATOR_REQUIRED_VERSION=0.2.9 - -PKG_CHECK_MODULES(TEST, appindicator-0.1 >= $LIBAPPINDICATOR_REQUIRED_VERSION) - -AC_SUBST(TEST_CFLAGS) -AC_SUBST(TEST_LIBS) +AC_SUBST(INDICATOR_CFLAGS) +AC_SUBST(INDICATOR_LIBS) -APP_INDICATOR_INCLUDE_BASE=`$PKG_CONFIG --variable=includedir appindicator-0.1` -APP_INDICATOR_INCLUDE="$APP_INDICATOR_INCLUDE_BASE/libappindicator-0.1/" +AC_SUBST(APPINDICATOR_CFLAGS) +AC_SUBST(APPINDICATOR_LIBS) -AC_SUBST(APP_INDICATOR_INCLUDE) ########################### # Check to see if we're local -- cgit v1.2.3 From 58779f7506601ca54d4fffcee79c6a0172f3f4ce Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 22 Jun 2011 11:22:45 -0500 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 12d87dd..9b550aa 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,11 @@ -AC_INIT(indicator-application, 0.3.2, ted@canonical.com) +AC_INIT(indicator-application, 0.3.90, ted@canonical.com) AC_COPYRIGHT([Copyright 2009, 2010 Canonical]) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-application, 0.3.2) +AM_INIT_AUTOMAKE(indicator-application, 0.3.90) AM_MAINTAINER_MODE -- cgit v1.2.3