garnome r6265 - in trunk: . desktop/gnome-games desktop/gnome-games/files

[kbrae svn gnome org]

Author: kbrae
Date: Thu Jan 31 18:41:15 2008
New Revision: 6265
URL: http://svn.gnome.org/viewvc/garnome?rev=6265&view=rev

Log:
desktop/gnome-games: Add upstream patch for bug 513336, and some
pre-configure magic to regenerate configure.


Added:
   trunk/desktop/gnome-games/files/
   trunk/desktop/gnome-games/files/513336-configure.diff
Modified:
   trunk/ChangeLog
   trunk/desktop/gnome-games/Makefile
   trunk/desktop/gnome-games/checksums

Modified: trunk/desktop/gnome-games/Makefile
==============================================================================
--- trunk/desktop/gnome-games/Makefile	(original)
+++ trunk/desktop/gnome-games/Makefile	Thu Jan 31 18:41:15 2008
@@ -2,8 +2,14 @@
 GARVERSION = 2.21.90
 CATEGORIES = desktop
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2
+PATCHFILES = 513336-configure.diff
+# NOTE: autoconf 2.61 LIBDEPS and pre-configure target added for this
+#       upstream fix, should be removed with the patch.
 
-LIBDEPS = platform/libgnomeui desktop/librsvg freedesktop/rarian hacker-tools/gob2 freedesktop/avahi desktop/gnome-python-desktop
+LIBDEPS = platform/libgnomeui desktop/librsvg freedesktop/rarian \
+  hacker-tools/gob2 freedesktop/avahi desktop/gnome-python-desktop
+
+LIBDEPS += bootstrap/autoconf-2.61
 
 DESCRIPTION = gnome-games
 define BLURB
@@ -20,3 +26,9 @@
 #CONFIGURE_ARGS += --enable-omitgames=aisleriot
 
 include ../category.mk
+
+pre-configure:
+	@echo "   Regenerate configure..."
+	@cd $(WORKSRC); \
+	 rm -rf configure autom4te*.cache/; autoconf
+	@$(MAKECOOKIE)

Modified: trunk/desktop/gnome-games/checksums
==============================================================================
--- trunk/desktop/gnome-games/checksums	(original)
+++ trunk/desktop/gnome-games/checksums	Thu Jan 31 18:41:15 2008
@@ -1 +1,2 @@
 fccffd631122e6b1d7bcb4caf73af896  download/gnome-games-2.21.90.tar.bz2
+86c4cc6b0e554665a5838b0904c778e9  download/513336-configure.diff

Added: trunk/desktop/gnome-games/files/513336-configure.diff
==============================================================================
--- (empty file)
+++ trunk/desktop/gnome-games/files/513336-configure.diff	Thu Jan 31 18:41:15 2008
@@ -0,0 +1,37 @@
+--- trunk/configure.in	2008/01/31 08:19:56	7293
++++ trunk/configure.in	2008/01/31 12:00:32	7294
+@@ -146,10 +146,19 @@
+ 
+ AC_PROG_CC
+ AC_PROG_CPP
+-AC_PROG_CXX
+ AC_PROG_LN_S
+ AC_PROG_SED
+ 
++if test "$need_cxx" = "yes"; then
++  AC_PROG_CXX
++
++  # Check whether a C++ was found (AC_PROG_CXX sets $CXX to "g++" even when it
++  # doesn't exist)
++  AC_LANG_PUSH([C++])
++  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],[],[AC_MSG_ERROR([No C++ compiler found])])
++  AC_LANG_POP([C++])
++fi
++
+ # Run these before AC_PROG_LIBTOOL, else it bugs
+ AC_GGZ_INIT
+ AC_GGZ_PLATFORM_BASE
+@@ -159,13 +168,6 @@
+ 
+ AC_PROG_LIBTOOL
+ 
+-# See if C++ support is actually there
+-AC_CHECK_PROG([have_cxx],[$CXX],[yes],[no])
+-
+-if test "$need_cxx" = "yes" -a "$have_cxx" != "yes"; then
+-  AC_MSG_ERROR([No C++ compiler found; either install one or use --enable-omitgames=gnometris,blackjack])
+-fi
+-
+ GNOME_COMMON_INIT
+ GNOME_COMPILE_WARNINGS([maximum])
+ GNOME_CXX_WARNINGS([yes])