← Back to branch summary

~ubuntu-branches/ubuntu/vivid/indicator-application/vivid-proposed

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Bazaar Package Importer
  • Author(s): Ken VanDine, Ted Gould, Ken VanDine
  • Date: 2011-06-22 13:07:06 UTC
  • mfrom: (1.1.34 upstream)
  • Revision ID: james.westby@ubuntu.com-20110622130706-0yungcdx6prnhj5v
Tags: 0.3.90-0ubuntu1
[ Ted Gould ]
* New upstream release.
  * GTK3 Port

[ Ken VanDine ]
* debian/control
  - Bumped standards version to 3.9.2
  - Add new binary for indicator-application-gtk2 
  - Make indicator-application recommend indicator-application-gtk2 (until 
    unity can load gtk3 indicators)
  - indicator-application-gtk2 replaces indicator-application << 0.2.90
  - Added build depends for libdbusmenu-gtk3-dev, libindicator3-dev 
    and libappindicator3-dev
* debian/rules
  - build for both gtk2 and gtk3

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
1
1
 
2
 
AC_INIT(indicator-application, 0.3.2, ted@canonical.com)
 
2
AC_INIT(indicator-application, 0.3.90, ted@canonical.com)
3
3
AC_COPYRIGHT([Copyright 2009, 2010 Canonical])
4
4
 
5
5
AC_PREREQ(2.53)
6
6
 
7
7
AM_CONFIG_HEADER(config.h)
8
 
AM_INIT_AUTOMAKE(indicator-application, 0.3.2)
 
8
AM_INIT_AUTOMAKE(indicator-application, 0.3.90)
9
9
 
10
10
AM_MAINTAINER_MODE
11
11
 
37
37
JSON_GLIB_REQUIRED_VERSION=0.7.6
38
38
DBUS_GLIB_REQUIRED_VERSION=0.82
39
39
 
 
40
LIBAPPINDICATOR_REQUIRED_VERSION=0.2.9
 
41
 
40
42
AC_ARG_WITH([gtk],
41
43
  [AS_HELP_STRING([--with-gtk],
42
 
    [Which version of gtk to use @<:@default=2@:>@])],
 
44
    [Which version of gtk to use @<:@default=3@:>@])],
43
45
  [],
44
 
  [with_gtk=2])
 
46
  [with_gtk=3])
45
47
AS_IF([test "x$with_gtk" = x3],
46
48
        [PKG_CHECK_MODULES(INDICATOR,  gtk+-3.0 >= $GTK3_REQUIRED_VERSION
47
49
                                       gio-2.0 >= $GIO_REQUIRED_VERSION
49
51
                                       json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
50
52
                                       dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
51
53
                                       dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION)
52
 
         AC_SUBST(INDICATOR_CFLAGS)
53
 
         AC_SUBST(INDICATOR_LIBS)
 
54
 
 
55
         PKG_CHECK_MODULES(APPINDICATOR, appindicator3-0.1 >= $LIBAPPINDICATOR_REQUIRED_VERSION)
 
56
 
54
57
         AC_DEFINE(HAVE_GTK3, 1, [whether gtk3 is available])
55
58
        ],
56
59
      [test "x$with_gtk" = x2],
60
63
                                       json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
61
64
                                       dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
62
65
                                       dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION)
63
 
         AC_SUBST(INDICATOR_CFLAGS)
64
 
         AC_SUBST(INDICATOR_LIBS)
 
66
 
 
67
         PKG_CHECK_MODULES(APPINDICATOR, appindicator3-0.1 >= $LIBAPPINDICATOR_REQUIRED_VERSION)
65
68
        ],
66
69
      [AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])]
67
70
)
68
71
AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" = x3])
69
72
 
70
 
LIBAPPINDICATOR_REQUIRED_VERSION=0.2.9
71
 
 
72
 
PKG_CHECK_MODULES(TEST, appindicator-0.1 >= $LIBAPPINDICATOR_REQUIRED_VERSION)
73
 
 
74
 
AC_SUBST(TEST_CFLAGS)
75
 
AC_SUBST(TEST_LIBS)
76
 
 
77
 
APP_INDICATOR_INCLUDE_BASE=`$PKG_CONFIG --variable=includedir appindicator-0.1`
78
 
APP_INDICATOR_INCLUDE="$APP_INDICATOR_INCLUDE_BASE/libappindicator-0.1/"
79
 
 
80
 
AC_SUBST(APP_INDICATOR_INCLUDE)
 
73
AC_SUBST(INDICATOR_CFLAGS)
 
74
AC_SUBST(INDICATOR_LIBS)
 
75
 
 
76
AC_SUBST(APPINDICATOR_CFLAGS)
 
77
AC_SUBST(APPINDICATOR_LIBS)
 
78
 
81
79
 
82
80
###########################
83
81
# Check to see if we're local
93
91
if test "x$with_localinstall" = "xyes"; then
94
92
        INDICATORDIR="${libdir}/indicators/2/"
95
93
        INDICATORICONSDIR="${datadir}/libindicate/icons/"
96
 
else
 
94
elif test "x$with_gtk" = x2; then
97
95
        INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator`
98
96
        INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator`
 
97
else
 
98
        INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3`
 
99
        INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator3`
99
100
fi
100
101
AC_SUBST(INDICATORDIR)
101
102
AC_SUBST(INDICATORICONSDIR)