diff options
| author | Ken VanDine <ken.vandine@canonical.com> | 2011-07-07 15:37:26 -0400 |
|---|---|---|
| committer | Ken VanDine <ken.vandine@canonical.com> | 2011-07-07 15:37:26 -0400 |
| commit | 4fe864d53eea581c95685e31a4372a83f87fce55 (patch) | |
| tree | bea6d34e86a2f4f4dd91a2fac0f1c862c0069f81 /configure.ac | |
| parent | fbe33a6d8e37468d5f01c5747c9ccb1763208db6 (diff) | |
| parent | 14f54b95128ac1d17d1c7aa8b2bcf46853fff3d5 (diff) | |
| download | ayatana-indicator-sound-4fe864d53eea581c95685e31a4372a83f87fce55.tar.gz ayatana-indicator-sound-4fe864d53eea581c95685e31a4372a83f87fce55.tar.bz2 ayatana-indicator-sound-4fe864d53eea581c95685e31a4372a83f87fce55.zip | |
Import upstream version 0.7.3
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac index bfc86f8..e6642f8 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) |