From 4d2b723c0c6095e07cdbd908971edcfc37128920 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 6 Dec 2010 09:09:01 -0600 Subject: Dropping dbus-glib and checking for a GIO version --- configure.ac | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 03eeae4..1d60bbe 100644 --- a/configure.ac +++ b/configure.ac @@ -39,6 +39,7 @@ AC_CONFIG_MACRO_DIR(m4) GTK_REQUIRED_VERSION=2.18 GTK3_REQUIRED_VERSION=2.91 +GIO_REQUIRED_VERSION=2.26 INDICATOR_REQUIRED_VERSION=0.3.5 DBUSMENUGTK_REQUIRED_VERSION=0.2.2 DBUS_GLIB_REQUIRED_VERSION=0.82 @@ -50,8 +51,8 @@ AC_ARG_WITH([gtk], [with_gtk=2]) AS_IF([test "x$with_gtk" = x3], [PKG_CHECK_MODULES(LIBRARAY, gtk+-3.0 >= $GTK3_REQUIRED_VERSION + gio-2.0 >= $GIO_REQUIRED_VERSION indicator3 >= $INDICATOR_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION dbusmenu-gtk3 >= $DBUSMENUGTK_REQUIRED_VERSION) AC_SUBST(LIBRARY_CFLAGS) AC_SUBST(LIBRARY_LIBS) @@ -59,8 +60,8 @@ AS_IF([test "x$with_gtk" = x3], ], [test "x$with_gtk" = x2], [PKG_CHECK_MODULES(LIBRARY, gtk+-2.0 >= $GTK_REQUIRED_VERSION + gio-2.0 >= $GIO_REQUIRED_VERSION indicator >= $INDICATOR_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION) AC_SUBST(LIBRARY_CFLAGS) AC_SUBST(LIBRARY_LIBS) -- cgit v1.2.3 From c7539b525cd880a8853e8ec9f2ed2b3812bdccc4 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 7 Dec 2010 22:19:35 -0600 Subject: Switching to the new dbusmenu API --- configure.ac | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 1d60bbe..48bd53a 100644 --- a/configure.ac +++ b/configure.ac @@ -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 +DBUSMENUGTK_REQUIRED_VERSION=0.3.90 DBUS_GLIB_REQUIRED_VERSION=0.82 AC_ARG_WITH([gtk], @@ -50,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 - gio-2.0 >= $GIO_REQUIRED_VERSION - indicator3 >= $INDICATOR_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 + glib-2.0 >= $GLIB_REQUIRED_VERSION gio-2.0 >= $GIO_REQUIRED_VERSION indicator >= $INDICATOR_REQUIRED_VERSION - dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION) + dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION) AC_SUBST(LIBRARY_CFLAGS) AC_SUBST(LIBRARY_LIBS) ], @@ -217,4 +220,5 @@ Libappindicator Configuration: Prefix: $prefix Indicator Dir: $INDICATORDIR GTK+ Version: $with_gtk + Library CFlags: $LIBRARY_CFLAGS ]) -- cgit v1.2.3 From 02fba603a52ee6c65c5f583071788f8017f8f7de Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 8 Dec 2010 09:34:56 -0600 Subject: Cleaning up configure.ac --- configure.ac | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 48bd53a..7b192ca 100644 --- a/configure.ac +++ b/configure.ac @@ -64,7 +64,7 @@ AS_IF([test "x$with_gtk" = x3], [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 + indicator >= $INDICATOR_REQUIRED_VERSION dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION) AC_SUBST(LIBRARY_CFLAGS) AC_SUBST(LIBRARY_LIBS) @@ -220,5 +220,4 @@ Libappindicator Configuration: Prefix: $prefix Indicator Dir: $INDICATORDIR GTK+ Version: $with_gtk - Library CFlags: $LIBRARY_CFLAGS ]) -- cgit v1.2.3 From 4a94c8c8c2756fb91164b35ecc767a90f1c61a25 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 8 Dec 2010 10:03:10 -0600 Subject: Adding a build for dbus-glib for tests so that we can pass them unmodified. --- configure.ac | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 7b192ca..30b2279 100644 --- a/configure.ac +++ b/configure.ac @@ -73,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 ########################### -- cgit v1.2.3