[SCM] geos branch, upstream, updated. upstream/3.3.2-56-g722309c

[Francesco Paolo Lovergine]

The following commit has been merged in the upstream branch:
commit 4460d055f078fb73ee4246789c93573dedfc54c2
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Wed May 25 15:02:37 2011 +0200

    Overriding CXX in order to try forcing -fpermissive for true.

diff --git a/debian/rules b/debian/rules
index 0e93c13..539a537 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,7 +25,8 @@ else
 $(info Guessed geos version is $(VER))
 endif
 
-CFLAGS = -Wall -g -fpermissive
+CFLAGS = -Wall -g
+CXX = g++ -fpermissive
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
@@ -53,7 +54,7 @@ ifneq "$(wildcard /usr/share/misc/config.guess)" ""
 	mv config.guess config.guess.bak
 	cp -f /usr/share/misc/config.guess config.guess
 endif
-	CFLAGS="$(CFLAGS)" ./configure \
+	CXX="$(CXX)" CFLAGS="$(CFLAGS)" ./configure \
         --host=$(DEB_HOST_GNU_TYPE) \
         --build=$(DEB_BUILD_GNU_TYPE) \
         --enable-ruby \
@@ -69,7 +70,7 @@ build: build-arch build-indep
 build-arch: build-arch-stamp
 build-arch-stamp:  config.status
 	# Add here commands to compile the arch part of the package.
-	CFLAGS="$(CFLAGS)" $(MAKE)
+	CXX="$(CXX)" CFLAGS="$(CFLAGS)" $(MAKE)
 	touch $@
 
 build-indep: build-indep-stamp

-- 
Geometry engine for Geographic Information Systems