[SCM] Civilization turn-based strategy game branch, master, updated. debian/2.1.9-1-4-g436e504

[Clint Adams]

The following commit has been merged in the master branch:
commit bcc6a5fbebac7860884770c91955e39239876398
Author: Clint Adams <schizo at debian.org>
Date:   Mon Jun 22 22:50:50 2009 -0400

    Update 99_build_without_ggzd.diff.

diff --git a/debian/patches/99_build_without_ggzd.diff b/debian/patches/99_build_without_ggzd.diff
index 638bd15..0b1cf58 100644
--- a/debian/patches/99_build_without_ggzd.diff
+++ b/debian/patches/99_build_without_ggzd.diff
@@ -1,19 +1,8 @@
-diff -Nuar freeciv-2.1.5.orig/m4/ggz.m4 freeciv-2.1.5/m4/ggz.m4
---- freeciv-2.1.5.orig/m4/ggz.m4	2008-06-16 09:32:39.000000000 +0200
-+++ freeciv-2.1.5/m4/ggz.m4	2008-06-25 23:56:55.000000000 +0200
-@@ -52,9 +52,8 @@
- dnl   AC_GGZ_REMOVEDUPS - eliminate duplicate list elements
- dnl
- 
--# Version number of this script.
--# First part is upstream (ggz) version and second Freeciv modifications.
--# serial 0014.1
-+# Version number of this script
-+# serial 0015
- 
- dnl ------------------------------------------------------------------------
- dnl Find a directory containing a single file
-@@ -139,63 +138,62 @@
+Index: freeciv/m4/ggz.m4
+===================================================================
+--- freeciv.orig/m4/ggz.m4	2009-06-22 22:41:50.000000000 -0400
++++ freeciv/m4/ggz.m4	2009-06-22 22:48:34.000000000 -0400
+@@ -139,63 +139,62 @@
      [  ac_ggz_prefix="$withval"
      ])
  
@@ -63,6 +52,10 @@ diff -Nuar freeciv-2.1.5.orig/m4/ggz.m4 freeciv-2.1.5/m4/ggz.m4
 -    CPPFLAGS="$CPPFLAGS -I ${ac_ggz_prefix_incdir} -I /usr/local/include"
 -    LDFLAGS="$LDFLAGS -L${ac_ggz_prefix_libdir} -L/usr/local/lib"
 -  fi
+-
+-  save_cflags=$CFLAGS
+-  save_cxxflags=$CXXFLAGS
+-  if test "x$GCC" = xyes; then
 +if test "x${prefix}" = "xNONE"; then
 +   ac_ggz_prefix_incdir="${ac_default_prefix}/include"
 +   ac_ggz_prefix_libdir="${ac_default_prefix}/lib"
@@ -108,10 +101,7 @@ diff -Nuar freeciv-2.1.5.orig/m4/ggz.m4 freeciv-2.1.5/m4/ggz.m4
 +  CPPFLAGS="$CPPFLAGS -I ${ac_ggz_prefix_incdir} -I /usr/local/include"
 +  LDFLAGS="$LDFLAGS -L${ac_ggz_prefix_libdir} -L/usr/local/lib"
 +fi
- 
--  save_cflags=$CFLAGS
--  save_cxxflags=$CXXFLAGS
--  if test "x$GCC" = xyes; then
++
 +save_cflags=$CFLAGS
 +save_cxxflags=$CXXFLAGS
 +if test "x$GCC" = xyes; then
@@ -126,7 +116,7 @@ diff -Nuar freeciv-2.1.5.orig/m4/ggz.m4 freeciv-2.1.5/m4/ggz.m4
  	AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
  		[[#if defined(__SUNPRO_C) || (__SUNPRO_C >= 0x550)
  		#else
-@@ -205,10 +203,9 @@
+@@ -205,10 +204,9 @@
  		 save_cxxflags="$save_cxxflags -xchar=signed"],
  		[])
  
@@ -139,7 +129,7 @@ diff -Nuar freeciv-2.1.5.orig/m4/ggz.m4 freeciv-2.1.5/m4/ggz.m4
  ])
  
  dnl ------------------------------------------------------------------------
-@@ -535,7 +532,7 @@
+@@ -536,7 +534,7 @@
      AC_SUBST(GGZ_CONFIG)
      AC_SUBST(ggzexecmoddir)
      AC_SUBST(ggzdatadir)
@@ -148,7 +138,7 @@ diff -Nuar freeciv-2.1.5.orig/m4/ggz.m4 freeciv-2.1.5/m4/ggz.m4
      AC_DEFINE_UNQUOTED(GAMEDIR, "${libdir}/ggz", [Path where to install the games])
      AC_DEFINE_UNQUOTED(GGZDATADIR, "${datadir}/ggz", [Path where the games should look for their data files])
    else
-@@ -927,7 +924,7 @@
+@@ -928,7 +926,7 @@
  	  AC_MSG_RESULT([$have_ggzdconf (intentionally ignored)])
  	elif test "x$2" = "xforce"; then
  	  if test "x$ac_ggzd_confdir" = "x"; then
@@ -157,7 +147,7 @@ diff -Nuar freeciv-2.1.5.orig/m4/ggz.m4 freeciv-2.1.5/m4/ggz.m4
  	  else
  	    ggzdconfdir=$ac_ggzd_confdir
  	  fi
-@@ -948,9 +945,9 @@
+@@ -949,9 +947,9 @@
  			prefixed=1
  		fi
  	fi
@@ -170,7 +160,7 @@ diff -Nuar freeciv-2.1.5.orig/m4/ggz.m4 freeciv-2.1.5/m4/ggz.m4
  	else
  		AC_MSG_RESULT([$have_ggzdconf ($ggzdconfdir)])
  	fi
-@@ -960,7 +957,6 @@
+@@ -961,7 +959,6 @@
  	AC_SUBST(ggzdconfdir)
  
  	ggzddatadir=${datadir}/${PACKAGE}
@@ -178,7 +168,7 @@ diff -Nuar freeciv-2.1.5.orig/m4/ggz.m4 freeciv-2.1.5/m4/ggz.m4
  	AC_SUBST(ggzddatadir)
  
  	if test "x${libdir}" = 'x${exec_prefix}/lib'; then
-@@ -1018,7 +1014,7 @@
+@@ -1019,7 +1016,7 @@
        AC_GGZ_GGZDMOD([ggz_server="yes"], [ggz_server="no"])
      fi
      if test "$ggz_server" = "yes"; then
@@ -187,7 +177,7 @@ diff -Nuar freeciv-2.1.5.orig/m4/ggz.m4 freeciv-2.1.5/m4/ggz.m4
        AC_DEFINE(GGZ_SERVER, 1, [Server support for GGZ])
      else
        if test "$try_ggz_server" = "yes"; then
-@@ -1045,12 +1041,7 @@
+@@ -1046,12 +1043,7 @@
  AC_DEFUN([AC_GGZ_CHECK],
  [
    AC_GGZ_INIT([defaults])

-- 
Civilization turn-based strategy game