diff options
author | Ted Gould <ted@gould.cx> | 2011-01-13 10:11:17 -0600 |
---|---|---|
committer | Ted Gould <ted@gould.cx> | 2011-01-13 10:11:17 -0600 |
commit | b76ed9c7f918123610e5e56bb9cdd1025d34caa1 (patch) | |
tree | 0905e58eb310c29710bcf881ae87f72904f3f153 /configure.ac | |
parent | f0c24c976f319d0b087adc0c8bc694cf930aa30b (diff) | |
parent | 2cfbfcab8a2c73227619eb3cd7a79e1fe17a8b43 (diff) | |
download | libdbusmenu-b76ed9c7f918123610e5e56bb9cdd1025d34caa1.tar.gz libdbusmenu-b76ed9c7f918123610e5e56bb9cdd1025d34caa1.tar.bz2 libdbusmenu-b76ed9c7f918123610e5e56bb9cdd1025d34caa1.zip |
Import upstream version 0.3.91
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index 4a7bc86..f1920b9 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,11 @@ -AC_INIT(libdbusmenu, 0.3.90, ted@canonical.com) +AC_INIT(libdbusmenu, 0.3.91, ted@canonical.com) AC_COPYRIGHT([Copyright 2009,2010 Canonical]) AC_PREREQ(2.62) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(libdbusmenu, 0.3.90, [-Wno-portability]) +AM_INIT_AUTOMAKE(libdbusmenu, 0.3.91, [-Wno-portability]) AM_MAINTAINER_MODE @@ -41,12 +41,11 @@ GNOME_DOC_INIT # Dependencies - GLib ########################### -GLIB_REQUIRED_VERSION=2.18 -DBUS_REQUIRED_VERSION=0.76 +GLIB_REQUIRED_VERSION=2.26 XML_REQUIRED_VERSION=2.6 PKG_CHECK_MODULES(DBUSMENUGLIB, glib-2.0 >= $GLIB_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_REQUIRED_VERSION + gio-2.0 >= $GLIB_REQUIRED_VERSION libxml-2.0 >= $XML_REQUIRED_VERSION) AC_SUBST(DBUSMENUGLIB_CFLAGS) @@ -67,7 +66,6 @@ AC_ARG_WITH([gtk], AS_IF([test "x$with_gtk" = x3], [PKG_CHECK_MODULES(DBUSMENUGTK, gtk+-3.0 >= $GTK3_REQUIRED_VERSION glib-2.0 >= $GLIB_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_REQUIRED_VERSION libxml-2.0 >= $XML_REQUIRED_VERSION) AC_SUBST(DBUSMENUGTK_CFLAGS) AC_SUBST(DBUSMENUGTK_LIBS) @@ -76,7 +74,6 @@ AS_IF([test "x$with_gtk" = x3], [test "x$with_gtk" = x2], [PKG_CHECK_MODULES(DBUSMENUGTK, gtk+-2.0 >= $GTK_REQUIRED_VERSION glib-2.0 >= $GLIB_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_REQUIRED_VERSION libxml-2.0 >= $XML_REQUIRED_VERSION) AC_SUBST(DBUSMENUGTK_CFLAGS) AC_SUBST(DBUSMENUGTK_LIBS) @@ -116,6 +113,12 @@ AC_SUBST(DBUSMENUTESTS_LIBS) 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 ########################### @@ -123,10 +126,16 @@ GOBJECT_INTROSPECTION_CHECK([0.6.7]) AC_PATH_PROG([VALA_API_GEN], [vapigen]) ########################### +# XSLT Processor +########################### + +AC_PATH_PROG([XSLT_PROC], [xsltproc]) + +########################### # Lib versioning ########################### -LIBDBUSMENU_CURRENT=2 +LIBDBUSMENU_CURRENT=3 LIBDBUSMENU_REVISION=0 LIBDBUSMENU_AGE=0 @@ -162,14 +171,14 @@ AC_OUTPUT([ Makefile po/Makefile.in libdbusmenu-glib/Makefile -libdbusmenu-glib/dbusmenu-glib.pc +libdbusmenu-glib/dbusmenu-glib-0.4.pc libdbusmenu-gtk/Makefile -libdbusmenu-gtk/dbusmenu-gtk.pc -libdbusmenu-gtk/dbusmenu-gtk3.pc +libdbusmenu-gtk/dbusmenu-gtk-0.4.pc +libdbusmenu-gtk/dbusmenu-gtk3-0.4.pc tools/Makefile tools/testapp/Makefile tests/Makefile -tests/dbusmenu-jsonloader.pc +tests/dbusmenu-jsonloader-0.4.pc docs/Makefile docs/libdbusmenu-glib/Makefile docs/libdbusmenu-glib/reference/Makefile |