diff options
| author | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2011-07-02 05:31:37 +0200 |
|---|---|---|
| committer | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2011-07-02 05:31:37 +0200 |
| commit | 53d9d91cee9213f6858176a00f99d656cb115c4b (patch) | |
| tree | 3409aa846bf15b7468e8b877be8ff8728eff9bc4 | |
| parent | f11a6bb0c8bc68d0a6972e94140f7b5d96881dba (diff) | |
| download | ayatana-indicator-sound-53d9d91cee9213f6858176a00f99d656cb115c4b.tar.gz ayatana-indicator-sound-53d9d91cee9213f6858176a00f99d656cb115c4b.tar.bz2 ayatana-indicator-sound-53d9d91cee9213f6858176a00f99d656cb115c4b.zip | |
Compile under gtk+-2.0
We need to properly check for indicator/indicator3 also for
soundservice, to make this compile with gtk+-3
| -rw-r--r-- | configure.ac | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index bfc86f8..e18ae22 100644 --- a/configure.ac +++ b/configure.ac @@ -48,12 +48,23 @@ 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 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 + 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 @@ -61,23 +72,18 @@ AS_IF([test "x$with_gtk" = x3], 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 + 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) |