aboutsummaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-12-08 15:31:12 -0600
committerTed Gould <ted@gould.cx>2010-12-08 15:31:12 -0600
commit36d0bc801369edb79da28871a00c3cc4ef9ee001 (patch)
tree4f4564ec0e42fb48365d876cbb689b377563bbb5 /configure.ac
parent3acbfb57c4800b7f8611d1ce5db391cad96f398b (diff)
parent0d8a2c601b50a1d9ce6ccd1140f624c84558cf9d (diff)
downloadlibayatana-appindicator-36d0bc801369edb79da28871a00c3cc4ef9ee001.tar.gz
libayatana-appindicator-36d0bc801369edb79da28871a00c3cc4ef9ee001.tar.bz2
libayatana-appindicator-36d0bc801369edb79da28871a00c3cc4ef9ee001.zip
* Upstream Merge
* Removing service, lib only * Switching from dbus-glib to GDBus
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac76
1 files changed, 30 insertions, 46 deletions
diff --git a/configure.ac b/configure.ac
index a35ca6f..3d906fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,11 @@
-AC_INIT(indicator-application, 0.2.90, ted@canonical.com)
+AC_INIT(libappindicator, 0.2.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.2.90)
+AM_INIT_AUTOMAKE(libappindicator, 0.2.90)
AM_MAINTAINER_MODE
@@ -39,9 +39,10 @@ AC_CONFIG_MACRO_DIR(m4)
GTK_REQUIRED_VERSION=2.18
GTK3_REQUIRED_VERSION=2.91
+GLIB_REQUIRED_VERSION=2.26
+GIO_REQUIRED_VERSION=2.26
INDICATOR_REQUIRED_VERSION=0.3.5
-DBUSMENUGTK_REQUIRED_VERSION=0.2.2
-JSON_GLIB_REQUIRED_VERSION=0.7.6
+DBUSMENUGTK_REQUIRED_VERSION=0.3.90
DBUS_GLIB_REQUIRED_VERSION=0.82
AC_ARG_WITH([gtk],
@@ -50,34 +51,44 @@ AC_ARG_WITH([gtk],
[],
[with_gtk=2])
AS_IF([test "x$with_gtk" = x3],
- [PKG_CHECK_MODULES(INDICATOR, gtk+-3.0 >= $GTK3_REQUIRED_VERSION
- indicator3 >= $INDICATOR_REQUIRED_VERSION
- json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
- dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
- dbusmenu-gtk3 >= $DBUSMENUGTK_REQUIRED_VERSION)
- AC_SUBST(INDICATOR_CFLAGS)
- AC_SUBST(INDICATOR_LIBS)
+ [PKG_CHECK_MODULES(LIBRARY, gtk+-3.0 >= $GTK3_REQUIRED_VERSION
+ glib-2.0 >= $GLIB_REQUIRED_VERSION
+ gio-2.0 >= $GIO_REQUIRED_VERSION
+ indicator3 >= $INDICATOR_REQUIRED_VERSION
+ dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION)
+ AC_SUBST(LIBRARY_CFLAGS)
+ AC_SUBST(LIBRARY_LIBS)
AC_DEFINE(HAVE_GTK3, 1, [whether gtk3 is available])
],
[test "x$with_gtk" = x2],
- [PKG_CHECK_MODULES(INDICATOR, gtk+-2.0 >= $GTK_REQUIRED_VERSION
- indicator >= $INDICATOR_REQUIRED_VERSION
- json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
- dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
- dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION)
- AC_SUBST(INDICATOR_CFLAGS)
- AC_SUBST(INDICATOR_LIBS)
+ [PKG_CHECK_MODULES(LIBRARY, gtk+-2.0 >= $GTK_REQUIRED_VERSION
+ glib-2.0 >= $GLIB_REQUIRED_VERSION
+ gio-2.0 >= $GIO_REQUIRED_VERSION
+ indicator >= $INDICATOR_REQUIRED_VERSION
+ dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION)
+ AC_SUBST(LIBRARY_CFLAGS)
+ AC_SUBST(LIBRARY_LIBS)
],
[AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])]
)
AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" = x3])
+PKG_CHECK_MODULES(TESTDEPS, dbus-glib-1)
+AC_SUBST(TESTDEPS_CFLAGS)
+AC_SUBST(TESTDEPS_LIBS)
+
###########################
# GObject Introspection
###########################
GOBJECT_INTROSPECTION_CHECK([0.6.7])
+PKG_CHECK_EXISTS([gobject-introspection-1.0 >= 0.10],
+ introspection_ten=yes,
+ introspection_ten=no)
+
+AM_CONDITIONAL(INTROSPECTION_TEN, [test "x$introspection_ten" = "xyes"])
+
###########################
# Vala API Generation
###########################
@@ -150,31 +161,6 @@ with_localinstall="no"
AC_ARG_ENABLE(localinstall, AS_HELP_STRING([--enable-localinstall], [install all of the files localy instead of system directories (for distcheck)]), with_localinstall=$enableval, with_localinstall=no)
###########################
-# Indicator Info
-###########################
-
-if test "x$with_localinstall" = "xyes"; then
- INDICATORDIR="${libdir}/indicators/2/"
- INDICATORICONSDIR="${datadir}/libindicate/icons/"
-else
- INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator`
- INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator`
-fi
-AC_SUBST(INDICATORDIR)
-AC_SUBST(INDICATORICONSDIR)
-
-###########################
-# DBus Service Info
-###########################
-
-if test "x$with_localinstall" = "xyes"; then
- DBUSSERVICEDIR="${datadir}/dbus-1/services/"
-else
- DBUSSERVICEDIR=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1`
-fi
-AC_SUBST(DBUSSERVICEDIR)
-
-###########################
# Python
###########################
@@ -219,7 +205,6 @@ bindings/mono/appindicator-sharp-0.1.pc
bindings/mono/examples/Makefile
bindings/mono/examples/indicator-example
bindings/python/Makefile
-data/Makefile
tests/Makefile
example/Makefile
docs/Makefile
@@ -234,9 +219,8 @@ docs/reference/libappindicator-docs.sgml
AC_MSG_NOTICE([
-Application Indicator Configuration:
+Libappindicator Configuration:
Prefix: $prefix
- Indicator Dir: $INDICATORDIR
GTK+ Version: $with_gtk
])