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

[Karl Goetz]

The following commit has been merged in the master branch:
commit 37cac3ee584fc63326d900a60981e049c5ba0d8c
Author: Karl Goetz <karl at kgoetz.id.au>
Date:   Fri Nov 27 22:04:52 2009 +1030

    * Remove calls for --without-zlib, upstream ./configure no longer
    	recognises it.

diff --git a/debian/rules b/debian/rules
index 1599bcb..efc6c40 100755
--- a/debian/rules
+++ b/debian/rules
@@ -56,8 +56,7 @@ build-xaw3d:
 	mkdir build-xaw3d
 	(cd build-xaw3d && 	\
 	 ../configure $(COMMON_CONFIG) --disable-server --enable-client=xaw \
-	 	--with-xaw3d --without-zlib \
-		--without-ggz-client --without-ggz-server && \
+	 	--with-xaw3d --without-ggz-client --without-ggz-server && \
 	$(MAKE) CFLAGS="$(CFLAGS)")
 
 	touch build-xaw3d-stamp
@@ -72,7 +71,7 @@ build-gtk:
 	mkdir build-gtk
 	(cd build-gtk && \
 	../configure $(COMMON_CONFIG) --disable-server --enable-client=gtk-2.0 \
-		--without-zlib --without-ggz-server --enable-noregistry && \
+		--without-ggz-server --enable-noregistry && \
 	$(MAKE) CFLAGS="$(CFLAGS)")
 	
 	touch build-gtk-stamp
@@ -87,7 +86,7 @@ build-sdl:
 	mkdir build-sdl
 	(cd build-sdl && \
 	../configure $(COMMON_CONFIG) --disable-server --enable-client=sdl \
-		--without-zlib --without-ggz-client --without-ggz-server && \
+		--without-ggz-client --without-ggz-server && \
 	$(MAKE) CFLAGS="$(CFLAGS)")
 	
 	touch build-sdl-stamp

-- 
Civilization turn-based strategy game