From 1ff030a2b103dfe68a8de8259c33808bc011d941 Mon Sep 17 00:00:00 2001 From: ZenWalker Date: Mon, 29 Aug 2016 02:12:19 +0200 Subject: Port from libunique to GApplication and GtkApplication applet-main.c: gtk2 and gtk3 Port to Gapplication based on this gnome-media commits: https://github.com/GNOME/gnome-media/commit/7b5a8127cea09779dd172b0b7598d2ad03b2e47b https://github.com/GNOME/gnome-media/commit/7283e156e0ea1b2d19292a97104b3ad49fc9e693 dialog-main.c: gtk3 Port to Gapplication and GtkApplication I did this implementation Fixes #77 --- configure.ac | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 9d1b3e1..94d4543 100644 --- a/configure.ac +++ b/configure.ac @@ -61,7 +61,6 @@ case "$with_gtk" in 3.0) GTK_API_VERSION=3.0 GTK_REQUIRED_VERSION=3.0.0 CANBERRA_API_VERSION=3 - UNIQUE_API_VERSION=3.0 ;; esac @@ -71,16 +70,29 @@ dnl======================================================================= dnl Check for the volume control modules dnl======================================================================= -PKG_CHECK_MODULES(VOLUME_CONTROL, - gobject-2.0 >= $GLIB_REQUIRED_VERSION - gtk+-$GTK_API_VERSION >= $GTK_REQUIRED_VERSION - gio-2.0 >= $GIO_REQUIRED_VERSION - libcanberra-gtk$CANBERRA_API_VERSION >= $CANBERRA_REQUIRED_VERSION - unique-$UNIQUE_API_VERSION - libxml-2.0 - mate-desktop-2.0 >= $MATE_DESKTOP_REQUIRED_VERSION - libmatemixer >= $MATE_MIXER_REQUIRED_VERSION -) +AS_IF([test "$GTK_API_VERSION" = "3.0"], [ + PKG_CHECK_MODULES(VOLUME_CONTROL, + gobject-2.0 >= $GLIB_REQUIRED_VERSION + gtk+-$GTK_API_VERSION >= $GTK_REQUIRED_VERSION + gio-2.0 >= $GIO_REQUIRED_VERSION + libcanberra-gtk$CANBERRA_API_VERSION >= $CANBERRA_REQUIRED_VERSION + libxml-2.0 + mate-desktop-2.0 >= $MATE_DESKTOP_REQUIRED_VERSION + libmatemixer >= $MATE_MIXER_REQUIRED_VERSION + ) +], [ + PKG_CHECK_MODULES(VOLUME_CONTROL, + gobject-2.0 >= $GLIB_REQUIRED_VERSION + gtk+-$GTK_API_VERSION >= $GTK_REQUIRED_VERSION + gio-2.0 >= $GIO_REQUIRED_VERSION + libcanberra-gtk$CANBERRA_API_VERSION >= $CANBERRA_REQUIRED_VERSION + unique-$UNIQUE_API_VERSION + libxml-2.0 + mate-desktop-2.0 >= $MATE_DESKTOP_REQUIRED_VERSION + libmatemixer >= $MATE_MIXER_REQUIRED_VERSION + ) +]) + AC_SUBST(VOLUME_CONTROL_CFLAGS) AC_SUBST(VOLUME_CONTROL_LIBS) -- cgit v1.2.1