brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

configure: Check for new enough libcanberra

Browse Source 
The GNOME Shell jhbuild doesn't include libcanberra atm, so
if we find an old one (as is in F14) it will fail with a newer
GTK3.
This commit is contained in:
Colin Walters 2010-10-05 09:54:34 -04:00
parent cbedfd680f
commit dc7d323295
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.in
View File

@ -142,10 +142,12 @@ case "$with_gtk" in
2.0) GTK_API_VERSION=2.0 2.0) GTK_API_VERSION=2.0
GTK_MIN_VERSION=2.18 GTK_MIN_VERSION=2.18
CANBERRA_GTK=libcanberra-gtk CANBERRA_GTK=libcanberra-gtk
CANBERRA_GTK_VERSION=0.24
;; ;;
3.0) GTK_API_VERSION=3.0 3.0) GTK_API_VERSION=3.0
GTK_MIN_VERSION=2.90 GTK_MIN_VERSION=2.90.7
CANBERRA_GTK=libcanberra-gtk3 CANBERRA_GTK=libcanberra-gtk3
CANBERRA_GTK_VERSION=0.26
AC_DEFINE(USE_CAIRO_REGION, 1, [Use cairo_region_t instead of GdkRegion]) AC_DEFINE(USE_CAIRO_REGION, 1, [Use cairo_region_t instead of GdkRegion])
;; ;;
esac esac
@ -251,7 +253,7 @@ AC_MSG_CHECKING([libcanberra-gtk])
if test x$with_libcanberra = xno ; then if test x$with_libcanberra = xno ; then
AC_MSG_RESULT([disabled]) AC_MSG_RESULT([disabled])
else else
if $PKG_CONFIG --exists $CANBERRA_GTK; then if $PKG_CONFIG --exists $CANBERRA_GTK '>=' $CANBERRA_GTK_VERSION; then
have_libcanberra=yes have_libcanberra=yes
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
MUTTER_PC_MODULES="$MUTTER_PC_MODULES $CANBERRA_GTK" MUTTER_PC_MODULES="$MUTTER_PC_MODULES $CANBERRA_GTK"