diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2012-06-22 14:01:30 +0000 |
|---|---|---|
| committer | Tarmac <Unknown> | 2012-06-22 14:01:30 +0000 |
| commit | f2ace018e7bdc07b086780ca71833a913171a266 (patch) | |
| tree | 16d99770b1015e5b32b00001d5b4c610946b81de | |
| parent | ab3fc0e2f5b8c730e0694f1bf07a0709867a5683 (diff) | |
| parent | a6590cca4e5eea7c52df703751b08e7f85e10b3b (diff) | |
| download | ayatana-indicator-application-f2ace018e7bdc07b086780ca71833a913171a266.tar.gz ayatana-indicator-application-f2ace018e7bdc07b086780ca71833a913171a266.tar.bz2 ayatana-indicator-application-f2ace018e7bdc07b086780ca71833a913171a266.zip | |
remove gtk2 support. Fixes: https://bugs.launchpad.net/bugs/996607. Approved by Lars Uebernickel.
| -rw-r--r-- | configure.ac | 41 | ||||
| -rw-r--r-- | src/Makefile.am | 6 |
2 files changed, 8 insertions, 39 deletions
diff --git a/configure.ac b/configure.ac index 314111f..e91804d 100644 --- a/configure.ac +++ b/configure.ac @@ -29,8 +29,7 @@ PKG_PROG_PKG_CONFIG # Dependencies ########################### -GTK_REQUIRED_VERSION=2.18 -GTK3_REQUIRED_VERSION=2.91 +GTK_REQUIRED_VERSION=3.0.0 GIO_REQUIRED_VERSION=2.26 INDICATOR_REQUIRED_VERSION=0.3.5 DBUSMENUGTK_REQUIRED_VERSION=0.5.90 @@ -39,36 +38,13 @@ 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@:>@])], - [], - [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 - indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION - json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION) - - PKG_CHECK_MODULES(APPINDICATOR, appindicator3-0.1 >= $LIBAPPINDICATOR_REQUIRED_VERSION) - - AC_DEFINE(HAVE_GTK3, 1, [whether gtk3 is available]) - ], - [test "x$with_gtk" = x2], - [PKG_CHECK_MODULES(INDICATOR, gtk+-2.0 >= $GTK_REQUIRED_VERSION - gio-2.0 >= $GIO_REQUIRED_VERSION - indicator-0.4 >= $INDICATOR_REQUIRED_VERSION - json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION) - - PKG_CHECK_MODULES(APPINDICATOR, appindicator-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]) +PKG_CHECK_MODULES(INDICATOR, gtk+-3.0 >= $GTK_REQUIRED_VERSION + gio-2.0 >= $GIO_REQUIRED_VERSION + indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION + json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION + dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION + dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION) +PKG_CHECK_MODULES(APPINDICATOR, appindicator3-0.1 >= $LIBAPPINDICATOR_REQUIRED_VERSION) ########################### # gcov coverage reporting @@ -142,6 +118,5 @@ Application Indicator Configuration: Prefix: $prefix Indicator Dir: $INDICATORDIR - GTK+ Version: $with_gtk gcov: $use_gcov ]) diff --git a/src/Makefile.am b/src/Makefile.am index e445d78..1d8875e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,9 +1,3 @@ -if USE_GTK3 -VER=3 -else -VER= -endif - CLEANFILES = DISTCLEANFILES = BUILT_SOURCES = |