diff options
| author | Ted Gould <ted@canonical.com> | 2009-08-04 10:27:08 +0100 |
|---|---|---|
| committer | Ted Gould <ted@canonical.com> | 2009-08-04 10:27:08 +0100 |
| commit | 5909ee4172e2913f7ef65b4632c4a283431adae4 (patch) | |
| tree | 977b8970244ec952fc55ddaf7a9cb9aec8e794e9 /configure.ac | |
| parent | 064740bd411abe73a67a9c75f469f04d8259afdb (diff) | |
| parent | 63ed0ba9f0de5d60f31e5c52849cb6fb7a070cd9 (diff) | |
| download | libayatana-indicator-5909ee4172e2913f7ef65b4632c4a283431adae4.tar.gz libayatana-indicator-5909ee4172e2913f7ef65b4632c4a283431adae4.tar.bz2 libayatana-indicator-5909ee4172e2913f7ef65b4632c4a283431adae4.zip | |
* Merging in upstream code to split out libindicate-gtk
* debian/control:
* Changing the version number of libindcate to 2 to match
the .so numbering.
* Creating packages for libindicate-gtk
* Added libindicate-gtk-dev.install and libindicate-gtk0.install
for the new library.
* Renamed libindicate1.install to libindicate2.install to match
the package name change.
* Modified libindicate-dev to be more specific about the header
files that it grabs.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 29 |
1 files changed, 26 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 939accd..471512f 100644 --- a/configure.ac +++ b/configure.ac @@ -7,6 +7,7 @@ AM_CONFIG_HEADER(config.h) AM_INIT_AUTOMAKE(indicator-applet, 0.2.0dev) AM_MAINTAINER_MODE +m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES]) IT_PROG_INTLTOOL([0.35.0]) AC_ISC_POSIX @@ -22,7 +23,7 @@ AC_CONFIG_MACRO_DIR([m4]) # Libindicate versioning ########################### -LIBINDICATE_CURRENT=1 +LIBINDICATE_CURRENT=2 LIBINDICATE_REVISION=0 LIBINDICATE_AGE=0 @@ -31,6 +32,18 @@ AC_SUBST(LIBINDICATE_REVISION) AC_SUBST(LIBINDICATE_AGE) ########################### +# Libindicate versioning +########################### + +LIBINDICATEGTK_CURRENT=0 +LIBINDICATEGTK_REVISION=0 +LIBINDICATEGTK_AGE=0 + +AC_SUBST(LIBINDICATEGTK_CURRENT) +AC_SUBST(LIBINDICATEGTK_REVISION) +AC_SUBST(LIBINDICATEGTK_AGE) + +########################### # Dependencies ########################### @@ -49,17 +62,25 @@ AM_GCONF_SOURCE_2 GLIB_REQUIRED_VERSION=2.18 GIO_REQUIRED_VERSION=2.18 -GDK_PIXBUF_REQUIRED_VERSION=2.12 XML_REQUIRED_VERSION=2.6 PKG_CHECK_MODULES(LIBINDICATE, glib-2.0 >= $GLIB_REQUIRED_VERSION gio-2.0 >= $GIO_REQUIRED_VERSION - gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED_VERSION dbus-glib-1 >= $DBUS_REQUIRED_VERSION libxml-2.0 >= $XML_REQUIRED_VERSION) AC_SUBST(LIBINDICATE_CFLAGS) AC_SUBST(LIBINDICATE_LIBS) +GDK_PIXBUF_REQUIRED_VERSION=2.12 + +PKG_CHECK_MODULES(LIBINDICATEGTK, glib-2.0 >= $GLIB_REQUIRED_VERSION + gio-2.0 >= $GIO_REQUIRED_VERSION + gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED_VERSION + gtk+-2.0 >= $GTK_REQUIRED_VERSION + dbus-glib-1 >= $DBUS_REQUIRED_VERSION) +AC_SUBST(LIBINDICATEGTK_CFLAGS) +AC_SUBST(LIBINDICATEGTK_LIBS) + ########################### # GObject Introspection ########################### @@ -161,6 +182,8 @@ Makefile src/Makefile libindicate/Makefile libindicate/indicate.pc +libindicate-gtk/Makefile +libindicate-gtk/indicate-gtk.pc libindicator/Makefile libindicator/indicator.pc examples/Makefile |