diff options
author | Ted Gould <ted@gould.cx> | 2010-12-08 15:19:44 -0600 |
---|---|---|
committer | Ted Gould <ted@gould.cx> | 2010-12-08 15:19:44 -0600 |
commit | 0d8a2c601b50a1d9ce6ccd1140f624c84558cf9d (patch) | |
tree | ba70d1960abc1fbf7892f1f870f47416cf13e3ee /configure.ac | |
parent | 6d73d549745eddea81b38c7effa0f48509fcbb8d (diff) | |
parent | 5b8d8f97aa46c2d56e7c4bbc244dafe378b60e8d (diff) | |
download | libayatana-appindicator-0d8a2c601b50a1d9ce6ccd1140f624c84558cf9d.tar.gz libayatana-appindicator-0d8a2c601b50a1d9ce6ccd1140f624c84558cf9d.tar.bz2 libayatana-appindicator-0d8a2c601b50a1d9ce6ccd1140f624c84558cf9d.zip |
Switching the library over to using GDBus
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index fd64573..3d906fe 100644 --- a/configure.ac +++ b/configure.ac @@ -39,8 +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 +DBUSMENUGTK_REQUIRED_VERSION=0.3.90 DBUS_GLIB_REQUIRED_VERSION=0.82 AC_ARG_WITH([gtk], @@ -49,19 +51,21 @@ AC_ARG_WITH([gtk], [], [with_gtk=2]) AS_IF([test "x$with_gtk" = x3], - [PKG_CHECK_MODULES(LIBRARAY, gtk+-3.0 >= $GTK3_REQUIRED_VERSION - indicator3 >= $INDICATOR_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - dbusmenu-gtk3 >= $DBUSMENUGTK_REQUIRED_VERSION) + [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(LIBRARY, gtk+-2.0 >= $GTK_REQUIRED_VERSION - indicator >= $INDICATOR_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - dbusmenu-gtk >= $DBUSMENUGTK_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) ], @@ -69,6 +73,10 @@ AS_IF([test "x$with_gtk" = x3], ) 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 ########################### |