[gnome-games] Remove obsolete GTK version check from the build summary, we only support GTK3

[Robert Ancell <rancell src gnome org>]

commit 26c3147ad990702abf7d5279d0f27652c528152b
Author: Robert Ancell <robert ancell canonical com>
Date:   Fri Dec 30 16:30:52 2011 +1100

    Remove obsolete GTK version check from the build summary, we only support GTK3

 configure.in                 |   57 ++++++++---------------------------------
 libgames-support/Makefile.am |    4 +-
 2 files changed, 13 insertions(+), 48 deletions(-)
---
diff --git a/configure.in b/configure.in
index 7186d0b..f488b9a 100644
--- a/configure.in
+++ b/configure.in
@@ -248,28 +248,6 @@ if test "$with_platform" = "gnome"; then
   AC_DEFINE([HAVE_GNOME],[1],[Define if GNOME support is enabled])
 fi
 
-# Check which gtk+ major version to use
-
-AC_MSG_CHECKING([which gtk+ version to compile against])
-AC_ARG_WITH([gtk],
-  [AS_HELP_STRING([--with-gtk=3.0],[which gtk+ version to compile against (default: 3.0)])],
-  [case "$with_gtk" in
-     3.0) ;;
-     [0-9].0) AC_MSG_ERROR([unsupported gtk version $with_gtk specified]) ;;
-     *) AC_MSG_ERROR([invalid gtk version specified]) ;;
-   esac],
-  [with_gtk=3.0])
-AC_MSG_RESULT([$with_gtk])
-
-case "$with_gtk" in
-  3.0) GTK_API_VERSION=3.0
-       GTK_API_MAJOR_VERSION=3
-       ;;
-esac
-
-AC_SUBST([GTK_API_VERSION])
-AC_SUBST([GTK_API_MAJOR_VERSION])
-
 # Win32 platform
 
 AC_CANONICAL_HOST
@@ -322,14 +300,9 @@ fi
 
 PYGOBJECT_REQUIRED=2.28.3
 
-case "$with_gtk" in
-  3.0) GTK_REQUIRED=2.91.7
-       RSVG_REQUIRED=2.32.0
-       LIBCANBERRA_GTK_REQUIRED=0.26
-       LIBCANBERRA_GTK_PKGS="libcanberra-gtk3 >= $LIBCANBERRA_GTK_REQUIRED"
-       ;;
-esac
-
+GTK_REQUIRED=2.91.7
+RSVG_REQUIRED=2.32.0
+LIBCANBERRA_GTK_REQUIRED=0.26
 GCONF_REQUIRED=2.0
 GIO_REQUIRED=2.25.7
 GSTREAMER_REQUIRED=0.10.11
@@ -349,7 +322,7 @@ PKG_CHECK_MODULES([GOBJECT],[gobject-2.0])
 AC_SUBST([GOBJECT_CFLAGS])
 AC_SUBST([GOBJECT_LIBS])
 
-PKG_CHECK_MODULES([GTK],[gtk+-$GTK_API_VERSION >= $GTK_REQUIRED])
+PKG_CHECK_MODULES([GTK],[gtk+-3.0 >= $GTK_REQUIRED])
 AC_SUBST([GTK_CFLAGS])
 AC_SUBST([GTK_LIBS])
 
@@ -463,13 +436,9 @@ if test "$need_clutter" = "yes"; then
   AC_SUBST([CLUTTER_CFLAGS])
   AC_SUBST([CLUTTER_LIBS])
 
-  case "$with_gtk" in
-    3.0) CLUTTER_GTK_API_VERSION=1.0
-         CLUTTER_GTK_REQUIRED=0.91.6
-         ;;
-  esac
+  CLUTTER_GTK_REQUIRED=0.91.6
 
-  PKG_CHECK_MODULES([CLUTTER_GTK],[clutter-gtk-$CLUTTER_GTK_API_VERSION >= $CLUTTER_GTK_REQUIRED])
+  PKG_CHECK_MODULES([CLUTTER_GTK],[clutter-gtk-1.0 >= $CLUTTER_GTK_REQUIRED])
   AC_SUBST([CLUTTER_GTK_CFLAGS])
   AC_SUBST([CLUTTER_GTK_LIBS])
 fi
@@ -506,7 +475,7 @@ AM_CONDITIONAL([WITH_GTHREAD],[test "$need_gthread" = "yes"])
 # libcanberra
 
 if test "$enable_sound" = "yes"; then
-  PKG_CHECK_MODULES([CANBERRA_GTK],[$LIBCANBERRA_GTK_PKGS],[],
+  PKG_CHECK_MODULES([CANBERRA_GTK],[libcanberra-gtk3 >= $LIBCANBERRA_GTK_REQUIRED],[],
     [AC_MSG_ERROR([Sound support was requested, but libcanberra-gtk not found.])])
 
   AC_DEFINE([ENABLE_SOUND],[1],[Define if sound support is enabled])
@@ -519,13 +488,10 @@ AM_CONDITIONAL([ENABLE_SOUND],[test "$enable_sound" = "yes"])
 SMCLIENT_PKGS=
 if test "$allow_smclient" = "yes"; then
   AC_MSG_CHECKING([for GDK target])
-  case "$with_gtk" in
-    3.0) for target in $($PKG_CONFIG --variable targets gdk-$GTK_API_VERSION); do
-           GDK_TARGET="$target"
-           break
-         done
-         ;;
-  esac
+  for target in $($PKG_CONFIG --variable targets gdk-3.0); do
+    GDK_TARGET="$target"
+    break
+  done
   AC_MSG_RESULT([$GDK_TARGET])
 
   case "$GDK_TARGET" in
@@ -930,7 +896,6 @@ fi
 echo "
     Games to be compiled:  ${gamelist}
 
-    GTK+ API version:      ${GTK_API_VERSION}
     Help method:           ${with_help_method} ${with_help_file_format}
     Using SM Client:       ${with_smclient}
     Using RSVG:            ${have_rsvg}
diff --git a/libgames-support/Makefile.am b/libgames-support/Makefile.am
index 4234a24..ed2b224 100644
--- a/libgames-support/Makefile.am
+++ b/libgames-support/Makefile.am
@@ -194,12 +194,12 @@ GnomeGamesSupport-1.0.gir: $(INTROSPECTION_SCANNER) libgames-support-gi.la $(lib
 	--namespace GnomeGamesSupport --nsversion=1.0 \
 	--identifier-prefix=Games --symbol-prefix=games_ --accept-unprefixed \
 	--add-include-path=$(srcdir) --add-include=path=. \
-	--include=Gtk-$(GTK_API_VERSION) \
+	--include=Gtk-3.0 \
 	--library=games-support-gi \
 	--libtool="$(LIBTOOL)" \
 	--output $@ \
 	--pkg gobject-2.0 \
-	--pkg gtk+-$(GTK_API_VERSION) \
+	--pkg gtk+-3.0 \
 	--warn-all \
 	-I$(top_srcdir) \
 	-I$(top_builddir) \