isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-16 21:34:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow building with Gtk+-3.0

Browse Source 
Add a configure switch to select the Gtk+ version to build with. The
default is to build against Gtk+-2.0 >= 2.18.

https://bugzilla.gnome.org/show_bug.cgi?id=622303
This commit is contained in:
Florian Müllner 2010-06-19 18:39:48 +02:00
parent e267a63330
commit 01447d94d1
2 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
configure.in
View File

@ -124,7 +124,30 @@ if test "x$GCC" = "xyes"; then
fi fi
changequote([,])dnl changequote([,])dnl
MUTTER_PC_MODULES='gtk+-2.0 >= 2.18 pango >= 1.2.0' AC_MSG_CHECKING([which gtk+ version to compile against])
AC_ARG_WITH([gtk],
AC_HELP_STRING([--with-gtk=2.0|3.0],
[which gtk+ version to compile against (default: 2)]),
[case "$with_gtk" in
2.0|3.0) ;;
*) AC_MSG_ERROR([invalid gtk+ version specified]);;
esac],
[with_gtk=2.0])
AC_MSG_RESULT([$with_gtk])
case "$with_gtk" in
2.0) GTK_API_VERSION=2.0
GTK_MIN_VERSION=2.18
CANBERRA_GTK=libcanberra-gtk
;;
3.0) GTK_API_VERSION=3.0
GTK_MIN_VERSION=2.90
CANBERRA_GTK=libcanberra-gtk3
;;
esac
MUTTER_PC_MODULES="gtk+-$GTK_API_VERSION >= $GTK_MIN_VERSION pango >= 1.2.0"
AC_SUBST(GTK_API_VERSION)
AC_ARG_ENABLE(gconf, AC_ARG_ENABLE(gconf,
AC_HELP_STRING([--disable-gconf], AC_HELP_STRING([--disable-gconf],
@ -184,8 +207,8 @@ AM_GLIB_GNU_GETTEXT
# GRegex requires Glib-2.14.0 # GRegex requires Glib-2.14.0
PKG_CHECK_MODULES(ALL, glib-2.0 >= 2.14.0) PKG_CHECK_MODULES(ALL, glib-2.0 >= 2.14.0)
# gtk_window_set_icon_name requires gtk2+-2.6.0 # gtk_window_set_icon_name requires gtk2+-2.6.0
PKG_CHECK_MODULES(MUTTER_MESSAGE, gtk+-2.0 >= 2.18) PKG_CHECK_MODULES(MUTTER_MESSAGE, gtk+-$GTK_API_VERSION >= $GTK_MIN_VERSION)
PKG_CHECK_MODULES(MUTTER_WINDOW_DEMO, gtk+-2.0 >= 2.18) PKG_CHECK_MODULES(MUTTER_WINDOW_DEMO, gtk+-$GTK_API_VERSION >= $GTK_MIN_VERSION)
# Unconditionally use this dir to avoid a circular dep with gnomecc # Unconditionally use this dir to avoid a circular dep with gnomecc
GNOME_KEYBINDINGS_KEYSDIR="${datadir}/gnome-control-center/keybindings" GNOME_KEYBINDINGS_KEYSDIR="${datadir}/gnome-control-center/keybindings"
@ -222,10 +245,10 @@ 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 libcanberra-gtk; then if $PKG_CONFIG --exists $CANBERRA_GTK; then
have_libcanberra=yes have_libcanberra=yes
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
MUTTER_PC_MODULES="$MUTTER_PC_MODULES libcanberra-gtk" MUTTER_PC_MODULES="$MUTTER_PC_MODULES $CANBERRA_GTK"
AC_DEFINE([HAVE_LIBCANBERRA], 1, [Building with libcanberra for playing sounds]) AC_DEFINE([HAVE_LIBCANBERRA], 1, [Building with libcanberra for playing sounds])
else else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
@ -545,7 +568,7 @@ fi
dnl ========================================================================== dnl ==========================================================================
echo " echo "
mutter-$VERSION: mutter-$VERSION (using gtk+-${GTK_API_VERSION}):
prefix: ${prefix} prefix: ${prefix}
source code location: ${srcdir} source code location: ${srcdir}

6
src/Makefile.am
View File

@ -211,11 +211,11 @@ Meta-$(api_version).gir: $(G_IR_SCANNER) mutter $(libmutterinclude_HEADERS) $(mu
--namespace=Meta \ --namespace=Meta \
--nsversion=$(api_version) \ --nsversion=$(api_version) \
--include=GObject-2.0 \ --include=GObject-2.0 \
--include=Gdk-2.0 \ --include=Gdk-@GTK_API_VERSION@ \
--include=Gtk-2.0 \ --include=Gtk-@GTK_API_VERSION@ \
--include=Clutter-1.0 \ --include=Clutter-1.0 \
--pkg=clutter-1.0 \ --pkg=clutter-1.0 \
--pkg=gtk+-2.0 \ --pkg=gtk+-@GTK_API_VERSION@ \
--include=xlib-2.0 \ --include=xlib-2.0 \
--include=xfixes-4.0 \ --include=xfixes-4.0 \
--program=$$pwd/mutter \ --program=$$pwd/mutter \