From 7193d3854f481a460313027e8da8b804c122635d Mon Sep 17 00:00:00 2001 From: Regina Obe Date: Mon, 16 Apr 2018 07:54:21 +0000 Subject: [PATCH] Drop support in configure for PostgreSQL < 9.4 and GEOS < 3.5 References #4096 git-svn-id: http://svn.osgeo.org/postgis/trunk@16539 b70326c6-7e19-0410-871a-916f4a2858ee --- NEWS | 3 ++- README.postgis | 2 +- configure.ac | 17 +++++++---------- doc/installation.xml | 6 +++--- doc/postgis.xml | 2 +- 5 files changed, 14 insertions(+), 16 deletions(-) diff --git a/NEWS b/NEWS index 37bc20978..dde995ba9 100644 --- a/NEWS +++ b/NEWS @@ -20,6 +20,7 @@ PostGIS 2.5.0 - #3893, raster support functions can only be loaded in the same schema with core PostGIS functions. - #4035, remove dummy pgis_abs type from aggregate/collect routines. + - #4069, drop support for GEOS < 3.5 and PostgreSQL < 9.4 * Enhancements and Fixes* - #3944, Update to EPSG register v9.2 (Even Rouault) @@ -54,7 +55,7 @@ PostGIS 2.5.0 - #4038, ST_Subdivide now selects pivot for geometry split that reuses input vertices. ST_ClipByBox2D is stubbed with ST_Intersection because of robustness issues. (Darafei Praliaskouski) - - #4025, #4032 Fixed precision issue in ST_ClosestPointOfApproach, + - #4025, #4032 Fixed precision issue in ST_ClosestPointOfApproach, ST_DistanceCPA, and ST_CPAWithin (Paul Ramsey, Darafei Praliaskouski) diff --git a/README.postgis b/README.postgis index 9efd9335f..7d7727a40 100644 --- a/README.postgis +++ b/README.postgis @@ -31,7 +31,7 @@ Directory structure:: REQUIREMENTS ------------ -PostGIS is compatible with PostgreSQL 9.6 and above. +PostGIS is compatible with PostgreSQL 9.4 and above. You *must* have the full PostgreSQL - including server headers - installed for this to work. diff --git a/configure.ac b/configure.ac index c02178726..baeb6b155 100644 --- a/configure.ac +++ b/configure.ac @@ -457,15 +457,12 @@ if test "x$LIBLWGEOM_ONLY" = "xno"; then PGSQL_SHAREDIR=`"$PG_CONFIG" --sharedir` AC_MSG_RESULT([checking PostgreSQL version... $PGSQL_FULL_VERSION]) - dnl Ensure that we are using PostgreSQL >= 9.3 - if test $POSTGIS_PGSQL_VERSION -lt 93; then - AC_MSG_ERROR([PostGIS requires PostgreSQL >= 9.3]) + dnl Ensure that we are using PostgreSQL >= 9.4 + if test $POSTGIS_PGSQL_VERSION -lt 94; then + AC_MSG_ERROR([PostGIS requires PostgreSQL >= 9.4]) fi - HAVE_BRIN=no - if test $POSTGIS_PGSQL_VERSION -gt 94; then - HAVE_BRIN=yes - fi + HAVE_BRIN=yes dnl Note: We don't need the server-side LDFLAGS or CPPFLAGS because we get these from PGXS @@ -680,10 +677,10 @@ GEOS_NUMERIC_PATCH_VERSION=`printf "%02d" $GEOS_PATCH_VERSION` GEOS_NUMERIC_MINOR_VERSION=`printf "%02d" $GEOS_MINOR_VERSION` GEOS_NUMERIC_VERSION="$GEOS_MAJOR_VERSION$GEOS_NUMERIC_MINOR_VERSION$GEOS_NUMERIC_PATCH_VERSION" -dnl Ensure that we are using GEOS >= 3.4.0 +dnl Ensure that we are using GEOS >= 3.5.0 AC_MSG_RESULT([checking GEOS version... $GEOS_FULL_VERSION]) -if test ! "$GEOS_NUMERIC_VERSION" -ge 30400; then - AC_MSG_ERROR([PostGIS requires GEOS >= 3.4.0]) +if test ! "$GEOS_NUMERIC_VERSION" -ge 30500; then + AC_MSG_ERROR([PostGIS requires GEOS >= 3.5.0]) fi dnl Extract the linker and include flags diff --git a/doc/installation.xml b/doc/installation.xml index d7a112fd5..061ae9e21 100644 --- a/doc/installation.xml +++ b/doc/installation.xml @@ -73,7 +73,7 @@ psql -d yourdatabase -f sfcgal_comments.sql If you are on windows, do not quote the driver list Setting environment variables varies depending on OS. For PostgreSQL installed on Ubuntu or Debian via apt-postgresql, the preferred way is to - edit /etc/postgresql/9.3/main/environment where 9.3 refers to version of PostgreSQL and main refers to the cluster. + edit /etc/postgresql/10/main/environment where 9.3 refers to version of PostgreSQL and main refers to the cluster. On windows, if you are running as a service, you can set via System variables which for Windows 7 you can get to by right-clicking on Computer->Properties Advanced System Settings or in explorer navigating to Control Panel\All Control Panel Items\System. Then clicking Advanced System Settings ->Advanced->Environment Variables and adding new system variables. @@ -127,7 +127,7 @@ psql -d yourdatabase -f sfcgal_comments.sql - Proj4 reprojection library, version 4.6.0 or greater. Proj4 4.9 or above is needed to take advantage of improved geodetic. + Proj4 reprojection library, version 4.9.0 or greater. Proj4 4.9 or above is needed to take advantage of improved geodetic. The Proj4 library is used to provide coordinate reprojection support within PostGIS. Proj4 is available for download from @@ -139,7 +139,7 @@ psql -d yourdatabase -f sfcgal_comments.sql - GEOS geometry library, version 3.4 or greater, but GEOS 3.7+ is recommended to take full advantage of all the new functions and features. You should have at least GEOS 3.5, + GEOS geometry library, version 3.5 or greater, but GEOS 3.7+ is recommended to take full advantage of all the new functions and features. You should have at least GEOS 3.5, without which you will be missing some major enhancements such as and . GEOS is available for download from http://trac.osgeo.org/geos/ diff --git a/doc/postgis.xml b/doc/postgis.xml index 617638424..b5815c953 100644 --- a/doc/postgis.xml +++ b/doc/postgis.xml @@ -4,7 +4,7 @@ - + -- 2.40.0