diff options
| author | Ken VanDine <ken.vandine@canonical.com> | 2011-07-07 11:37:27 -0400 |
|---|---|---|
| committer | Bazaar Package Importer <james.westby@ubuntu.com> | 2011-07-07 11:37:27 -0400 |
| commit | e4ac5bce9c3329811115715d4a4366864f5d5e7a (patch) | |
| tree | 04373b8ab4574edfabb5020cd976dc2dc4022088 /configure.ac | |
| parent | 1f4af1902d3de115a0e0bf9ce3fd6f5e829fed18 (diff) | |
| parent | 754649716f175cabcbc6175a5f0a8cd248edff83 (diff) | |
| download | ayatana-indicator-sound-e4ac5bce9c3329811115715d4a4366864f5d5e7a.tar.gz ayatana-indicator-sound-e4ac5bce9c3329811115715d4a4366864f5d5e7a.tar.bz2 ayatana-indicator-sound-e4ac5bce9c3329811115715d4a4366864f5d5e7a.zip | |
* New upstream release.
- libindicator scroll signals (LP: #804618)
- metadatawidget collapse (LP: #806439)
* debian/control
- Bumped build depends for libindicator to 0.3.90
* debian/patches/gtk3_define.patch
- dropped
* configure.ac
- Fixup pkgconfig check for libindicator-0.4
* debian/rules
- Added autoreconf.mk
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 44 |
1 files changed, 25 insertions, 19 deletions
diff --git a/configure.ac b/configure.ac index bfc86f8..184de39 100644 --- a/configure.ac +++ b/configure.ac @@ -1,10 +1,10 @@ -AC_INIT(indicator-sound, 0.7.2, conor.curran@canonical.com) +AC_INIT(indicator-sound, 0.7.3, conor.curran@canonical.com) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-sound, 0.7.2) +AM_INIT_AUTOMAKE(indicator-sound, 0.7.3) AM_MAINTAINER_MODE @@ -48,36 +48,42 @@ DBUSMENUGLIB_REQUIRED_VERSION=0.3.101 GIO_2_0_REQUIRED_VERSION=2.25.13 LIBNOTIFY_REQUIRED_VERSION=0.7.0 +PKG_CHECK_MODULES(PULSEAUDIO, libpulse-mainloop-glib >= $PULSE_AUDIO_REQUIRED_VERSION + gio-unix-2.0) +AC_SUBST(PULSEAUDIO_CFLAGS) +AC_SUBST(PULSEAUDIO_LIBS) + AS_IF([test "x$with_gtk" = x3], [PKG_CHECK_MODULES(APPLET, gtk+-3.0 >= $GTK3_REQUIRED_VERSION - indicator3 >= $INDICATOR_REQUIRED_VERSION + indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION libido3-0.1 >= $INDICATOR_DISPLAY_OBJECTS libnotify >= $LIBNOTIFY_REQUIRED_VERSION) + + PKG_CHECK_MODULES(SOUNDSERVICE, dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION + indicator3-0.4 + gee-1.0 + gio-unix-2.0 + libxml-2.0) ], [test "x$with_gtk" = x2], [PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION - indicator >= $INDICATOR_REQUIRED_VERSION + indicator-0.4 >= $INDICATOR_REQUIRED_VERSION dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS libnotify >= $LIBNOTIFY_REQUIRED_VERSION) + + PKG_CHECK_MODULES(SOUNDSERVICE, dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION + indicator-0.4 + gee-1.0 + gio-unix-2.0 + libxml-2.0) ], [AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])] ) AC_SUBST(APPLET_CFLAGS) AC_SUBST(APPLET_LIBS) - -PKG_CHECK_MODULES(PULSEAUDIO, libpulse-mainloop-glib >= $PULSE_AUDIO_REQUIRED_VERSION - gio-unix-2.0) -AC_SUBST(PULSEAUDIO_CFLAGS) -AC_SUBST(PULSEAUDIO_LIBS) - -PKG_CHECK_MODULES(SOUNDSERVICE, dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION - indicator3 >= $INDICATOR_REQUIRED_VERSION - gee-1.0 - gio-unix-2.0 - libxml-2.0) AC_SUBST(SOUNDSERVICE_CFLAGS) AC_SUBST(SOUNDSERVICE_LIBS) @@ -109,12 +115,12 @@ AS_IF([test "x$with_localinstall" = "xyes"], ], [AS_IF([test "x$with_gtk" = "x2"], [ - INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator` - INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator` + INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator-0.4` + INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator-0.4` ], [ - INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3` - INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator3` + INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3-0.4` + INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator3-0.4` ])]) AC_SUBST(INDICATORDIR) AC_SUBST(INDICATORICONSDIR) |