gnome-games r7594 - in branches/gnome-2-22: . libgames-support

[chpe svn gnome org]

Author: chpe
Date: Tue Apr  8 22:58:06 2008
New Revision: 7594
URL: http://svn.gnome.org/viewvc/gnome-games?rev=7594&view=rev

Log:
	* configure.in: Make maemo4 the default for --with-platform=hildon,
	and fix the required gtk version. Define GLIB_GENMARSHAL_INTERNAL to
	--internal only for non-hildon platforms.
	* libgames-support/Makefile.am: Use GLIB_GENMARSHAL_INTERNAL instead
	of literal --internal since hildon breaks on it.

Modified:
   branches/gnome-2-22/ChangeLog
   branches/gnome-2-22/configure.in
   branches/gnome-2-22/libgames-support/Makefile.am

Modified: branches/gnome-2-22/configure.in
==============================================================================
--- branches/gnome-2-22/configure.in	(original)
+++ branches/gnome-2-22/configure.in	Tue Apr  8 22:58:06 2008
@@ -210,9 +210,10 @@
   # "maemo" is Maemo 4.x
   AC_MSG_CHECKING([for which platform variant to build])
   AC_ARG_WITH([platform-variant],
-    [AS_HELP_STRING([--with-platform-variant=maemo|maemo3|mid (default: maemo3)])],
+    [AS_HELP_STRING([--with-platform-variant=maemo3|maemo4|mid (default: maemo4)])],
     [case "$withval" in
-       maemo|maemo3|mid) ;;
+       maemo4|maemo3|mid) ;;
+       maemo) with_platform_variant=maemo4 ;;
        *) AC_MSG_ERROR([unknown platform variant "$withval"]) ;;
      esac],
     [with_platform_variant=maemo3])
@@ -290,6 +291,8 @@
 
 if test "$with_platform" = "hildon" -a "$with_platform_variant" = "maemo3"; then
 GTK_REQUIRED=2.6.0
+elif test "$with_platform" = "hildon"; then
+GTK_REQUIRED=2.10.0
 else
 GTK_REQUIRED=2.12.0
 fi
@@ -476,6 +479,14 @@
 
 AC_PATH_PROG([GLIB_GENMARSHAL],[glib-genmarshal])
 
+# Maemo's (OS2007 & OS2008) glib-genmarshal breaks on --internal
+if test "$with_platform" = "hildon"; then
+  GLIB_GENMARSHAL_INTERNAL=
+else
+  GLIB_GENMARSHAL_INTERNAL="--internal"
+fi
+AC_SUBST([GLIB_GENMARSHAL_INTERNAL])
+
 # *************
 # Check for GGZ
 # *************

Modified: branches/gnome-2-22/libgames-support/Makefile.am
==============================================================================
--- branches/gnome-2-22/libgames-support/Makefile.am	(original)
+++ branches/gnome-2-22/libgames-support/Makefile.am	Tue Apr  8 22:58:06 2008
@@ -186,11 +186,11 @@
 games-marshal.c: stamp-games-marshal.c
 	@true
 stamp-games-marshal.c: games-marshal.list Makefile
-	$(GLIB_GENMARSHAL) --prefix=games_marshal $< --header --body --internal > games-marshal.c \
+	$(GLIB_GENMARSHAL) --prefix=games_marshal $< --header --body $(GLIB_GENMARSHAL_INTERNAL) > games-marshal.c \
 	&& echo timestamp > $(@F)
 
 games-marshal.h: stamp-games-marshal.h
 	@true
 stamp-games-marshal.h: games-marshal.list Makefile
-	$(GLIB_GENMARSHAL) --prefix=games_marshal $< --header --internal > games-marshal.h \
+	$(GLIB_GENMARSHAL) --prefix=games_marshal $< --header $(GLIB_GENMARSHAL_INTERNAL) > games-marshal.h \
 	&& echo timestamp > $(@F)