From 8e0c8e17e0138afa7757a1bdf8edd6f2c7b47a14 Mon Sep 17 00:00:00 2001 From: Monsta Date: Wed, 30 Sep 2015 10:14:28 +0300 Subject: configure.ac: make GTK+3 build support appindicator too --- configure.ac | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index ebeb2cf..3287f31 100644 --- a/configure.ac +++ b/configure.ac @@ -139,9 +139,11 @@ AC_MSG_RESULT([$with_gtk]) case "$with_gtk" in 2.0) GTK_API_VERSION=2.0 GTK_REQUIRED=2.24.0 + APPINDICATOR_API_VERSION= ;; 3.0) GTK_API_VERSION=3.0 GTK_REQUIRED=3.0.0 + APPINDICATOR_API_VERSION=3 ;; esac AC_SUBST(GTK_API_VERSION) @@ -167,6 +169,8 @@ AC_ARG_ENABLE([accountsservice], AM_CONDITIONAL([HAVE_ACCOUNTSSERVICE], [test "x$enable_accountsservice" = xyes]) # Application indicator +APPINDICATOR_PKG=appindicator$APPINDICATOR_API_VERSION-0.1 + AC_ARG_ENABLE([appindicator], AS_HELP_STRING([--enable-appindicator[=@<:@no/auto/yes@:>@]],[Build support for application indicators]), [enable_appindicator=$enableval], @@ -174,14 +178,14 @@ AC_ARG_ENABLE([appindicator], if test "x$enable_appindicator" = "xauto"; then - PKG_CHECK_EXISTS(appindicator-0.1 >= $APPINDICATOR_REQUIRED, + PKG_CHECK_EXISTS($APPINDICATOR_PKG >= $APPINDICATOR_REQUIRED, [enable_appindicator="yes"], [enable_appindicator="no"]) fi if test "x$enable_appindicator" = "xyes"; then PKG_CHECK_MODULES(APPINDICATOR, - [appindicator-0.1 >= $APPINDICATOR_REQUIRED], + [$APPINDICATOR_PKG >= $APPINDICATOR_REQUIRED], [AC_DEFINE(HAVE_APPINDICATOR, 1, [Have AppIndicator])]) fi -- cgit v1.2.1