b713b7f3a8cca75e6681edced081fe0c97c5bbf4
[gentoo.git] /
1 From 90195c0c2e3f45a355286f1640c2f0020a5556b8 Mon Sep 17 00:00:00 2001
2 From: raveit65 <chat-to-me@raveit.de>
3 Date: Fri, 17 Jun 2016 20:34:06 +0200
4 Subject: [PATCH] configure: fix build with libappindicator3
5
6 ---
7  configure.ac | 14 +++++++++-----
8  1 file changed, 9 insertions(+), 5 deletions(-)
9
10 diff --git a/configure.ac b/configure.ac
11 index 9b27671..a11bfdc 100644
12 --- a/configure.ac
13 +++ b/configure.ac
14 @@ -63,6 +63,8 @@ dnl ==============================================
15  dnl Check GTK+ API version
16  dnl ==============================================
17  
18 +APPINDICATOR_REQUIRED=0.0.13
19 +
20  AC_MSG_CHECKING([which gtk+ version to compile against])
21  AC_ARG_WITH([gtk],
22    [AS_HELP_STRING([--with-gtk=2.0|3.0],[which gtk+ version to compile against (default: 2.0)])],
23 @@ -80,6 +82,7 @@ case "$with_gtk" in
24         LIBCANBERRA_API_VERSION=
25         LIBUNIQUE_API_VERSION=1.0
26         ENGINES_FOLDER="engines"
27 +       APPINDICATOR_API_VERSION=
28         ;;
29    3.0) GTK_API_VERSION=3.0
30         GTK_REQUIRED=3.0.0
31 @@ -87,6 +90,7 @@ case "$with_gtk" in
32         LIBCANBERRA_API_VERSION=3
33         LIBUNIQUE_API_VERSION=3.0
34         ENGINES_FOLDER="theming-engines"
35 +       APPINDICATOR_API_VERSION=3
36         ;;
37  esac
38  AC_SUBST(GTK_API_VERSION)
39 @@ -101,7 +105,7 @@ AM_CONDITIONAL(HAVE_LIBCANBERRA_GTK, test "x$CANBERRA_GTK" = "x1")
40  AM_CONDITIONAL(HAVE_TYPING_BREAK, test "x$TYPING_BREAK" = xtyping-break)
41  
42  dnl app indicator
43 -APPINDICATOR_REQUIRED=0.0.7
44 +APPINDICATOR_PKG=appindicator$APPINDICATOR_API_VERSION-0.1
45  
46  AC_ARG_ENABLE(appindicator,
47                          AS_HELP_STRING([--enable-appindicator[=@<:@no/auto/yes@:>@]],[Build support for application indicators ]),
48 @@ -109,16 +113,16 @@ AC_ARG_ENABLE(appindicator,
49                          [enable_appindicator="auto"])
50  
51  if test x$enable_appindicator = xauto ; then
52 -        PKG_CHECK_EXISTS([appindicator-0.1 >= $APPINDICATOR_REQUIRED],
53 +        PKG_CHECK_EXISTS([$APPINDICATOR_PKG >= $APPINDICATOR_REQUIRED],
54                           enable_appindicator="yes",
55                           enable_appindicator="no")
56  fi
57  
58  if test x$enable_appindicator = xyes ; then
59 -        PKG_CHECK_EXISTS([appindicator-0.1 >= $APPINDICATOR_REQUIRED],,
60 +        PKG_CHECK_EXISTS([$APPINDICATOR_PKG >= $APPINDICATOR_REQUIRED],,
61                           AC_MSG_ERROR([appindicator-0.1 is not installed]))
62          PKG_CHECK_MODULES(APP_INDICATOR,
63 -                        appindicator-0.1 >= $APPINDICATOR_REQUIRED)
64 +                        $APPINDICATOR_PKG >= $APPINDICATOR_REQUIRED)
65          AC_SUBST(APP_INDICATOR_CFLAGS)
66          AC_SUBST(APP_INDICATOR_LIBS)
67          AC_DEFINE(HAVE_APP_INDICATOR, 1, [Have AppIndicator])