From dda44b29642e28bea77497d7b2584bfcea10517e Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Tue, 21 Jul 2015 16:37:06 +0000 Subject: [PATCH] Update minimum required PostgreSQL version in README and configure See #3211 git-svn-id: http://svn.osgeo.org/postgis/trunk@13821 b70326c6-7e19-0410-871a-916f4a2858ee --- README.postgis | 4 ++-- configure.ac | 33 +++++++++++++++------------------ 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/README.postgis b/README.postgis index 2dac93017..b8b1db275 100644 --- a/README.postgis +++ b/README.postgis @@ -13,7 +13,7 @@ Directory structure:: ./ Build scripts and install directions ./doc PostGIS Documentation - ./extensions Support for the PostgreSQL 9.1+ Extensions framework + ./extensions Support for the PostgreSQL Extensions framework ./extras Various pieces that didn't belong to mainstream (package management specfiles, WFS_locks, sample WKB parser) ./liblwgeom LWGEOM geometry library @@ -31,7 +31,7 @@ Directory structure:: REQUIREMENTS ------------ -PostGIS is compatible with PostgreSQL 9.0 and above. +PostGIS is compatible with PostgreSQL 9.1 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 9d1cc6501..13ff48c99 100644 --- a/configure.ac +++ b/configure.ac @@ -421,10 +421,10 @@ PGSQL_LIBDIR=`$PG_CONFIG --libdir` PGSQL_SHAREDIR=`$PG_CONFIG --sharedir` AC_MSG_RESULT([checking PostgreSQL version... $PGSQL_FULL_VERSION]) -dnl Ensure that we are using PostgreSQL >= 9.0 -if test ! "$PGSQL_MAJOR_VERSION" -ge 9; then - AC_MSG_ERROR([PostGIS requires PostgreSQL >= 9.0]) -fi +dnl Ensure that we are using PostgreSQL >= 9.1 +if test $POSTGIS_PGSQL_VERSION -lt 91; then + AC_MSG_ERROR([PostGIS requires PostgreSQL >= 9.1]) +fi dnl Note: We don't need the server-side LDFLAGS or CPPFLAGS because we get these from PGXS @@ -1235,23 +1235,20 @@ fi dnl =========================================================================== dnl See if we have the requirements for building the extensions, namely -dnl PostgreSQL 9.1 or better and the xlstproc tool for generating the commends -dnl SQL file. +dnl the xlstproc tool for generating the comments SQL file. dnl =========================================================================== EXTENSIONS="" -if test $POSTGIS_PGSQL_VERSION -ge 91; then - if test \ - "x$XSLTPROC" != "x" -o \ - -e doc/postgis_comments.sql -a \ - -e doc/raster_comments.sql; - then - if test "x$RASTER" = "xraster"; then - AC_MSG_RESULT([enabling PostgreSQL extension support...]) - EXTENSIONS=extensions - AC_SUBST([EXTENSIONS]) - fi - fi +if test \ + "x$XSLTPROC" != "x" -o \ + -e doc/postgis_comments.sql -a \ + -e doc/raster_comments.sql; +then + if test "x$RASTER" = "xraster"; then + AC_MSG_RESULT([enabling PostgreSQL extension support...]) + EXTENSIONS=extensions + AC_SUBST([EXTENSIONS]) + fi fi -- 2.40.0