diff options
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | configure.ac | 47 | ||||
| -rw-r--r-- | man/Makefile.am | 8 | ||||
| -rw-r--r-- | mate-volume-control/src/gvc-speaker-test.c | 4 |
4 files changed, 28 insertions, 34 deletions
diff --git a/Makefile.am b/Makefile.am index 33548b4..531c8f1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,9 +6,8 @@ if HAVE_SOUND_THEME SUBDIRS += sound-theme endif -if HAVE_PULSEAUDIO +# m-v-c depends on sound-theme, if enabled, so add here to SUBDIRS SUBDIRS += mate-volume-control -endif DISTCHECK_CONFIGURE_FLAGS = \ --disable-scrollkeeper \ diff --git a/configure.ac b/configure.ac index b1ff545..655b9a0 100644 --- a/configure.ac +++ b/configure.ac @@ -42,8 +42,8 @@ AC_TYPE_SIZE_T AC_PROG_GCC_TRADITIONAL AC_FUNC_MMAP -GLIB_REQUIRED_VERSION=2.18.2 -GIO_REQUIRED_VERSION=2.25.0 +GLIB_REQUIRED_VERSION=2.36.0 +GIO_REQUIRED_VERSION=2.36.0 PA_REQUIRED_VERSION=0.9.16 CANBERRA_REQUIRED_VERSION=0.13 MATE_DESKTOP_REQUIRED_VERSION=1.9.1 @@ -98,7 +98,25 @@ AC_SUBST(SOUNDTHEME_CFLAGS) AC_SUBST(SOUNDTHEME_LIBS) dnl======================================================================= -dnl Check for the new volume control modules +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 +) + +AC_SUBST(VOLUME_CONTROL_CFLAGS) +AC_SUBST(VOLUME_CONTROL_LIBS) + +dnl======================================================================= +dnl Check for PulseAudio optional dependency dnl======================================================================= AC_ARG_ENABLE([pulseaudio], @@ -117,24 +135,6 @@ if test "x$enable_pulseaudio" != "xno"; then fi if test "x$have_pulseaudio" = "xyes" ; then - 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 - ) - - AC_SUBST(VOLUME_CONTROL_CFLAGS) - AC_SUBST(VOLUME_CONTROL_LIBS) - - if $PKG_CONFIG --atleast-version 2.26 glib-2.0; then - VOLUME_CONTROL_CFLAGS="$VOLUME_CONTROL_CFLAGS -DG_CONST_RETURN=const" - fi - AC_DEFINE(HAVE_PULSEAUDIO, [], [Define if we have pulseaudio]) fi else @@ -145,7 +145,9 @@ AC_SUBST(HAVE_PULSEAUDIO) AC_SUBST(PULSEAUDIO_CFLAGS) AC_SUBST(PULSEAUDIO_LIBS) - +dnl======================================================================= +dnl GLib +dnl======================================================================= GLIB_GSETTINGS @@ -268,4 +270,5 @@ echo " Compiler: ${CC} CFLAGS: ${CFLAGS} GTK+ API version: ${GTK_API_VERSION} + PulseAudio: ${have_pulseaudio} " diff --git a/man/Makefile.am b/man/Makefile.am index b5c7763..e64b78a 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -1,7 +1,3 @@ -man_MANS = mate-volume-control.1 +man_MANS = mate-volume-control.1 mate-volume-control-applet.1 -if HAVE_PULSEAUDIO -man_MANS += mate-volume-control-applet.1 -endif - -EXTRA_DIST = mate-volume-control.1 mate-volume-control-applet.1 +EXTRA_DIST = $(man_MANS) diff --git a/mate-volume-control/src/gvc-speaker-test.c b/mate-volume-control/src/gvc-speaker-test.c index d43b6cf..0f6c9e7 100644 --- a/mate-volume-control/src/gvc-speaker-test.c +++ b/mate-volume-control/src/gvc-speaker-test.c @@ -29,10 +29,6 @@ #include <canberra.h> #include <libmatemixer/matemixer.h> -#ifdef HAVE_PULSEAUDIO -#include <pulse/pulseaudio.h> -#endif - #include "gvc-speaker-test.h" #include "mvc-helpers.h" |