[SCM] spatialite branch, master, updated. debian/3.0.0_beta20110817-3-17-g802a17b

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit 1fa43ae799d36b92f0f82cb9f6c22eed59c578be
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Mon Feb 27 12:29:23 2012 +0100

    Avoid relinking with the C++ binding for Geos.

diff --git a/debian/changelog b/debian/changelog
index bc17a4c..ce5e595 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,8 +11,11 @@ spatialite (3.0.1-1) unstable; urgency=low
     that should allow a more smooth upgrade with new splitted packages.
   * Force Geos 3.3+ use for a working test suite.
   * Policy bumped to 3.9.3. No changes required.
+  * Added a patch 05-dont_relink.patch to avoid (superfluous) relinking against
+    the C++ geos library. It now causes a failure at configuration time
+    because the C/C++ libraries are now splitted.
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Mon, 27 Feb 2012 11:30:25 +0100
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Mon, 27 Feb 2012 12:26:08 +0100
 
 spatialite (3.0.0~beta20110817-3) unstable; urgency=low
 
diff --git a/debian/patches/05-dont_relink.patch b/debian/patches/05-dont_relink.patch
new file mode 100644
index 0000000..916722d
--- /dev/null
+++ b/debian/patches/05-dont_relink.patch
@@ -0,0 +1,44 @@
+Index: spatialite/configure
+===================================================================
+--- spatialite.orig/configure	2012-02-23 13:42:29.000000000 +0100
++++ spatialite/configure	2012-02-27 12:25:37.000000000 +0100
+@@ -17201,7 +17201,7 @@
+     ac_res="none required"
+   else
+     ac_res=-l$ac_lib
+-    LIBS="-l$ac_lib -lm -lgeos $ac_func_search_save_LIBS"
++    LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+   fi
+   if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_search_GEOSTopologyPreserveSimplify=$ac_res
+@@ -17271,7 +17271,7 @@
+     ac_res="none required"
+   else
+     ac_res=-l$ac_lib
+-    LIBS="-l$ac_lib -lm -lgeos $ac_func_search_save_LIBS"
++    LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+   fi
+   if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_search_GEOSCoveredBy=$ac_res
+Index: spatialite/configure.ac
+===================================================================
+--- spatialite.orig/configure.ac	2012-02-23 13:42:29.000000000 +0100
++++ spatialite/configure.ac	2012-02-27 12:25:14.000000000 +0100
+@@ -124,7 +124,7 @@
+ if test x"$enable_geos" != "xno"; then
+   OMIT_GEOS_FLAGS=
+   AC_CHECK_HEADERS(geos_c.h,, [AC_MSG_ERROR([cannot find geos_c.h, bailing out])])
+-  AC_SEARCH_LIBS(GEOSTopologyPreserveSimplify,geos_c,,AC_MSG_ERROR(['libgeos_c' is required but it doesn't seem to be installed on this system.]),-lm -lgeos)
++  AC_SEARCH_LIBS(GEOSTopologyPreserveSimplify,geos_c,,AC_MSG_ERROR(['libgeos_c' is required but it doesn't seem to be installed on this system.]),)
+   #-----------------------------------------------------------------------
+   #   --enable-geosadvanced
+   #
+@@ -133,7 +133,7 @@
+ 	  [], [geosadvanced=yes])
+   if test x"$enable_geosadvanced" != "xno"; then
+ 	  GEOSADVANCED_FLAGS=-DGEOS_ADVANCED
+-	  AC_SEARCH_LIBS(GEOSCoveredBy,geos_c,,AC_MSG_ERROR([obsolete 'libgeos_c' (< v.3.3.0). please retry specifying: --disable-geosadvanced.]),-lm -lgeos)
++	  AC_SEARCH_LIBS(GEOSCoveredBy,geos_c,,AC_MSG_ERROR([obsolete 'libgeos_c' (< v.3.3.0). please retry specifying: --disable-geosadvanced.]),)
+   else
+ 	  GEOSADVANCED_FLAGS=
+   fi
diff --git a/debian/patches/series b/debian/patches/series
index fa482c6..ecda345 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 00-add_automake_foreign.patch
 04-fix_missing_define.patch
+05-dont_relink.patch

-- 
geospatial extension for SQLite