Commit 462dd395 authored by Bas Couwenberg's avatar Bas Couwenberg

New upstream version 2.5.2+dfsg

parent 9034aec0
# This is for the drone 1.0 agent
# https://docs.drone.io/user-guide/pipeline/steps/
# https://dronie.osgeo.org #1.0 server
# See https://git.osgeo.org/gitea/postgis/postgis-docker
# todo: add docker images from https://hub.docker.com/r/postgis/postgis-build-env/tags/
test-image: &test-image docker.kbt.io/postgis/build-test:trisquel2
kind: pipeline
name: pg-9.5
steps:
- name: build
image: *test-image
pull: true
commands:
- export PGVER=9.5
- service postgresql start $PGVER
- export PGPORT=`grep ^port /etc/postgresql/$PGVER/main/postgresql.conf | awk '{print $3}'`
- export PATH=/usr/lib/postgresql/$PGVER/bin:$PATH
- psql --version
- ./autogen.sh
- ./configure CFLAGS="-O0 -Wall -fno-omit-frame-pointer -Werror" --without-interrupt-tests
- make -j
# we should maybe wait for postgresql service to startup here...
- psql -c "select version()" template1
- make check RUNTESTFLAGS=-v
- make install
- utils/check_all_upgrades.sh
`grep '^POSTGIS_' Version.config | cut -d= -f2 | paste -sd '.'`
---
test-image: &test-image docker.kbt.io/postgis/build-test:trisquel2
kind: pipeline
name: pg-9.6
steps:
- name: build
image: *test-image
pull: true
commands:
- export PGVER=9.6
- service postgresql start $PGVER
- export PGPORT=`grep ^port /etc/postgresql/$PGVER/main/postgresql.conf | awk '{print $3}'`
- export PATH=/usr/lib/postgresql/$PGVER/bin:$PATH
- psql --version
- ./autogen.sh
- ./configure CFLAGS="-O0 -Wall -fno-omit-frame-pointer -Werror" --without-interrupt-tests
- make -j
# we should maybe wait for postgresql service to startup here...
- psql -c "select version()" template1
- make check RUNTESTFLAGS=-v
- make install
- utils/check_all_upgrades.sh
`grep '^POSTGIS_' Version.config | cut -d= -f2 | paste -sd '.'`
---
test-image: &test-image docker.kbt.io/postgis/build-test:trisquel2
kind: pipeline
name: pg-10
steps:
- name: build
image: *test-image
pull: true
commands:
- export PGVER=10
- service postgresql start $PGVER
- export PGPORT=`grep ^port /etc/postgresql/$PGVER/main/postgresql.conf | awk '{print $3}'`
- export PATH=/usr/lib/postgresql/$PGVER/bin:$PATH
- psql --version
- ./autogen.sh
- ./configure CFLAGS="-O0 -Wall -fno-omit-frame-pointer -Werror" --without-interrupt-tests
- make -j
# we should maybe wait for postgresql service to startup here...
- psql -c "select version()" template1
- make check RUNTESTFLAGS=-v
- make install
- utils/check_all_upgrades.sh
`grep '^POSTGIS_' Version.config | cut -d= -f2 | paste -sd '.'`
...
2019-03-10 18:58 Regina Obe <lr@pcorp.us>
* [r17321] Make _drop_raster_constraint_spatially_unique and
_raster_constraint_info_spatially_unique allow for presence or
absense of schema qual on geometry cast.
Was failing before when installed as extension (but not by
script)
Reference #4291 for PostGIS 2.5.2
2019-03-10 09:07 Regina Obe <lr@pcorp.us>
* [r17317] Take out schema qualify in constraint see if it resolves
failing check constraint check on bessie and debbie
Reference #4291 for PostGIS 2.5.2
2019-03-10 07:20 Regina Obe <lr@pcorp.us>
* [r17316] Schema qualify all geometry casts in raster code,
otherwise materialized views do not resture
Closes #4291 for PostGIS 2.5.2
Missed some spots in last commit
2019-03-09 06:54 Regina Obe <lr@pcorp.us>
* [r17313] Schema qualify all geometry casts in raster code,
otherwise materialized views do not resture
Reference #4291 for PostGIS 2.5.2
2019-03-09 06:29 Regina Obe <lr@pcorp.us>
* [r17311] Change de_DE to de. de is the one that is active
References #3848 for PostGIS 2.5
2019-02-21 20:44 Paul Ramsey <pramsey@cleverelephant.ca>
* [r17270] Add extra_float_digits for pg12
2019-02-15 19:00 Paul Ramsey <pramsey@cleverelephant.ca>
* [r17256] Update test running instructions
2019-02-15 18:53 Paul Ramsey <pramsey@cleverelephant.ca>
* [r17253] Update OGC certification scripts to match new SFSQL 1.2
signatures
2019-02-11 17:18 Paul Ramsey <pramsey@cleverelephant.ca>
* [r17237] Add generated file
2019-02-11 17:18 Paul Ramsey <pramsey@cleverelephant.ca>
* [r17236] Add lexer initialization
References #4017
2019-02-05 00:41 Regina Obe <lr@pcorp.us>
* [r17230] Get rid of sudo -i on the pg11 docker evidentally not
installed
2019-02-04 22:45 Regina Obe <lr@pcorp.us>
* [r17228] Fix dronie badge (still need to fix build link)
2019-01-31 15:49 Raúl Marín Rodríguez <rmrodriguez@carto.com>
* [r17224] PostgreSQL 12 compatibility
Initial patch by Laurenz Albe
References #4313
2019-01-30 19:17 Raúl Marín Rodríguez <rmrodriguez@carto.com>
* [r17221] ST_ClipByBox2D: Do not throw when the geometry is
invalid
Closes #4314
2019-01-25 11:52 Raúl Marín Rodríguez <rmrodriguez@carto.com>
* [r17215] PG12 compat: Remove unnecessary header include (tqual.h)
Closes #4307
2019-01-22 09:09 Raúl Marín Rodríguez <rmrodriguez@carto.com>
* [r17206] Partially revert r17180
It changed the behaviour of _postgis_pgsql_version
Now uses the appropiate 5-6 digit version from server_version_num
References #4296
References #4303
2019-01-21 19:52 Paul Ramsey <pramsey@cleverelephant.ca>
* [r17199] Sync generated parser to y file, using newer bison
version
2019-01-21 19:24 Paul Ramsey <pramsey@cleverelephant.ca>
* [r17195] Commit generated code to match parser
2019-01-21 19:24 Paul Ramsey <pramsey@cleverelephant.ca>
* [r17194] Actually put fix for #4273 in the right place
so it isn't blown away when parser.y is evaluated.
References #4273
2019-01-18 21:57 Paul Ramsey <pramsey@cleverelephant.ca>
* [r17189] Un space
2019-01-18 20:43 Paul Ramsey <pramsey@cleverelephant.ca>
* [r17186] Avoid final point duplicates for circle stroking
References #4283
2019-01-18 18:02 Paul Ramsey <pramsey@cleverelephant.ca>
* [r17182] More robust geography distance
References #4290
2019-01-18 17:24 Raúl Marín Rodríguez <rmrodriguez@carto.com>
* [r17180] Use `server_version_num` instead of parsing `version()`
References #4296
2019-01-18 16:06 Raúl Marín Rodríguez <rmrodriguez@carto.com>
* [r17175] Avoid passing a NULL pointer to GEOSisEmpty
References #4275
2019-01-18 11:56 Raúl Marín Rodríguez <rmrodriguez@carto.com>
* [r17172] Correct issue reference from previous commit
References #4289
2019-01-18 11:53 Raúl Marín Rodríguez <rmrodriguez@carto.com>
* [r17170] ST_AsMVTGeom: Transform coordinates space before
clipping
References #4300
2019-01-17 23:22 Paul Ramsey <pramsey@cleverelephant.ca>
* [r17168] Use AccessShareLock in spatial_index_read_extent
References #4261
2019-01-17 11:32 Darafei Praliaskouski <me@komzpa.net>
* [r17164] ST_Subdivide endless loop on coordinates near coincident
to bounds
Closes #4301
Closes https://github.com/postgis/postgis/pull/361
2019-01-16 10:50 Raúl Marín Rodríguez <rmrodriguez@carto.com>
* [r17161] ST_AsMVTGeom: Always return the simplest geometry
Closes #4300
2019-01-16 09:04 Raúl Marín Rodríguez <rmrodriguez@carto.com>
* [r17159] Tests: Remove warning when building with 32bit arch
It appeared when investigating #4298
2019-01-15 22:16 Regina Obe <lr@pcorp.us>
* [r17157] Add dronie.osgeo.org agent config (drone 1.0 standard)
2019-01-11 12:37 Raúl Marín Rodríguez <rmrodriguez@carto.com>
* [r17135] ST_AsMVT: parse JSON numeric values with decimals as
doubles
References #4292
2019-01-10 16:21 Paul Ramsey <pramsey@cleverelephant.ca>
* [r17131] Remove memory leak in "junky wkt" case
References #4273
2019-01-09 20:09 Paul Ramsey <pramsey@cleverelephant.ca>
* [r17129] Move fix further into parser, fix bad test case
References #4273
2018-12-26 04:06 Regina Obe <lr@pcorp.us>
* [r17119] Fix so custom --with-projdir= configure switch works
again.
References #4279 for PostGIS 2.5
2018-12-21 05:38 Darafei Praliaskouski <me@komzpa.net>
* [r17115] [doc] ST_AsGeoJSON doc refresh
Closes #4276
2018-12-17 10:41 Darafei Praliaskouski <me@komzpa.net>
* [r17112] Attribute Raúl Marín for help resolving build issue.
References #4254
2018-12-17 10:34 Darafei Praliaskouski <me@komzpa.net>
* [r17109] Support Proj 6. Support is via legacy API, we need to
redesign for non-legacy and Proj 7.
Closes #4254
Closes https://github.com/postgis/postgis/pull/354
2018-11-30 15:01 Regina Obe <lr@pcorp.us>
* [r17089] change winnie to build, test, and package using GEOS
3.7.1 instead of GEOS 3.7.0
2018-11-29 11:11 Raúl Marín Rodríguez <rmrodriguez@carto.com>
* [r17088] Correct referenfce in NEWS file
2018-11-29 09:29 Raúl Marín Rodríguez <rmrodriguez@carto.com>
* [r17085] Document MULTISURFACE compatibility of ST_LineToCurve
(Steven Ottens)
References #4162
2018-11-27 00:14 Paul Ramsey <pramsey@cleverelephant.ca>
* [r17078] Change test conditions to look for empty.
References #4245
2018-11-25 19:28 Darafei Praliaskouski <me@komzpa.net>
* [r17074] Stabilize GiST ND indexes for mixed dimensions
Patch by Darafei Praliaskouski
Thanks to
Arthur Lesuisse for synthesizing test case,
Andrew Gierth for finding runaway memcpy,
Raúl Marín for pointing to memory problem in index construction.
This is not backpatchable to 2.x, that requires separate
solution.
Closes #4139
2018-11-23 17:56 Regina Obe <lr@pcorp.us>
* [r17063] Get rid of use of oids in topology regress was taken out
in PostgreSQL 12.
Closes #4251 for PostGIS 2.5.2
2018-11-23 07:49 Regina Obe <lr@pcorp.us>
* [r17061] Missed a spot in last commit
Closes #4231 for postgis 2.5.2
2018-11-22 21:10 Regina Obe <lr@pcorp.us>
* [r17060] Add 2.2.8 to upgrade targets
Remove using of pg_constraint.consrc to allow support of 12 as
noted by Laurenz Albe (pg_constraint.consrc was removed in
12devel)
Closes #4231 for postgis 2.5.2
2018-11-22 16:16 Raúl Marín Rodríguez <rmrodriguez@carto.com>
* [r17058] Avoid unaligned memory access in BOX2D_out
References #4244
2018-11-22 13:43 Raúl Marín Rodríguez <rmrodriguez@carto.com>
* [r17052] Fix undefined behaviour in ST_3DDistance
References #4246
2018-11-21 14:13 Raúl Marín Rodríguez <rmrodriguez@carto.com>
* [r17042] Fix undefined behaviour in raster intersection
References #4249
2018-11-21 11:45 Raúl Marín Rodríguez <rmrodriguez@carto.com>
* [r17037] Avoid undefined behaviour in next_float functions (Raúl
Marín)
References #4247
2018-11-18 21:32 Regina Obe <lr@pcorp.us>
* [r17028] Flip to 2.5.2dev
2018-11-18 21:29 Regina Obe <lr@pcorp.us>
* [r17026] Prep for 2.5.1 for real this time
2018-11-18 09:41 Regina Obe <lr@pcorp.us>
* [r17025] Flip back to 2.5.1dev until confirm winnie's issues on
#4242 are just winnie's
2018-11-18 09:19 Regina Obe <lr@pcorp.us>
* [r17024] update change log in prep for 2.5.1 release
2018-11-18 08:43 Regina Obe <lr@pcorp.us>
* [r17023] Prepping for 2.5.1 release
PostGIS 2.5.2
2019/03/11
* Bug fixes *
- #4231, Support for PostgreSQL 12dev (remove use of pg_constraint.consrc)
(Regina Obe, Laurenz Albe)
- #4247, Avoid undefined behaviour in next_float functions (Raúl Marín)
- #4249, Fix undefined behaviour in raster intersection (Raúl Marín)
- #4246, Fix undefined behaviour in ST_3DDistance (Raúl Marín)
- #4244, Avoid unaligned memory access in BOX2D_out (Raúl Marín)
- #4139, Make mixed-dimension ND index build tree correctly.
WARNING: REINDEX your ND index on tables that have records with different M/Z
dimensions for &&& operator to work predictably.
(Darafei Praliaskouski, Arthur Lesuisse, Andrew Gierth, Raúl Marín)
- #4262, Document MULTISURFACE compatibility of ST_LineToCurve (Steven Ottens)
- #4267, Enable Proj 6 deprecated APIs (Darafei Praliaskouski, Raúl Marín)
- #4276, ST_AsGeoJSON documentation refresh (Darafei Praliaskouski)
- #4273, Tighter parsing of WKT (Paul Ramsey)
- #4292, ST_AsMVT: parse JSON numeric values with decimals as doubles (Raúl Marín)
- #4300, ST_AsMVTGeom: Always return the simplest geometry (Raúl Marín)
- #4301, ST_Subdivide: fix endless loop on coordinates near coincident to bounds
(Darafei Praliaskouski)
- #4261, Use AccessShareLock in spatial_index_read_extent (Paul Ramsey)
- #4289, ST_AsMVTGeom: Transform coordinates space before clipping (Raúl Marín)
- #4275, Avoid passing a NULL pointer to GEOSisEmpty (Raúl Marín)
- #4296, Use `server_version_num` instead of parsing `version()` (Raúl Marín)
- #4290, More robust geography distance (Paul Ramsey)
- #4283, Avoid final point duplicates for circle stroking (Paul Ramsey)
- #4314, ST_ClipByBox2D: Do not throw when the geometry is invalid (Raúl Marín)
- #4313, #4307, PostgreSQL 12 compatibility (Laurenz Albe, Raúl Marín)
- #4290, Schema qualify geometry casts in raster functions (Regina Obe)
- #4086, Constraint violation loading tiger_data (zcta5 geometry type) (Regina Obe)
PostGIS 2.5.1
2018/11/18
* Bug fixes *
- #4183, St_AsMVTGeom: Drop invalid geometries after simplification (Raúl Marín)
- #4183, ST_AsMVTGeom: Drop invalid geometries after simplification (Raúl Marín)
- #4188, Avoid division by zero in kmeans (Raúl Marín)
- #4189, Fix undefined behaviour in SADFWrite (Raúl Marín)
- #4191, Fix undefined behaviour in ptarray_clone_deep (Raúl Marín)
......@@ -19,7 +54,7 @@ PostGIS 2.5.1
- #4216, Revert non-sliced box access (Paul Ramsey)
- #2767, Documentation for AddRasterConstraint optional parameters (Sunveer Singh)
- #4326, Allocate enough memory in gidx_to_string (Raúl Marín)
- #4190, Avoid undefined behaviour in gserialized_estimate
- #4190, Avoid undefined behaviour in gserialized_estimate (Raúl Marín)
PostGIS 2.5.0
......
......@@ -3,7 +3,7 @@ Debbie:
Winnie:
[![Build Status](https://debbie.postgis.net:444/buildStatus/icon?job=PostGIS_2.5)](https://debbie.postgis.net:444/view/PostGIS/job/PostGIS_2.5/)
Dronie:
[![Build Status](https://drone.osgeo.org/api/badges/postgis/postgis/status.svg?branch=svn-2.5)](https://drone.osgeo.org/postgis/postgis?branch=svn-2.5)
[![Build Status](https://dronie.osgeo.org/api/badges/postgis/postgis/status.svg?ref=refs/heads/svn-2.5)](https://dronie.osgeo.org/postgis/postgis?branch=svn-2.5)
Travis:
[![Build Status](https://secure.travis-ci.org/postgis/postgis.svg)](http://travis-ci.org/postgis/postgis)
GitLab-CI:
......
PostGIS - Geographic Information Systems Extensions to PostgreSQL
=================================================================
:Version: 2.5.0rc1
:Date: 2018-08-19
:Version: 2.5.2
:Date: 2019-03-11
:Website: http://postgis.net
This distribution contains a module which implements GIS simple features, ties
......@@ -31,7 +31,7 @@ Directory structure::
REQUIREMENTS
------------
PostGIS is compatible with PostgreSQL 9.4 and above.
PostGIS is compatible with PostgreSQL 9.4-11.
You *must* have the full PostgreSQL - including server headers - installed for
this to work.
......
......@@ -5,7 +5,7 @@
POSTGIS_MAJOR_VERSION=2
POSTGIS_MINOR_VERSION=5
POSTGIS_MICRO_VERSION=1
POSTGIS_MICRO_VERSION=2
# Liblwgeom interface versioning, reset to 0:0:0 (cur:age:rev)
# when changing POSTGIS_MINOR_VERSION
......
......@@ -31,7 +31,7 @@
PROGRAM=libtool
PACKAGE=libtool
VERSION="2.4.6 Debian-2.4.6-6"
VERSION="2.4.6 Debian-2.4.6-10"
package_revision=2.4.6
......@@ -64,7 +64,7 @@ package_revision=2.4.6
# libraries, which are installed to $pkgauxdir.
# Set a version string for this script.
scriptversion=2015-10-04.22; # UTC
scriptversion=2015-01-20.17; # UTC
# General shell script boiler plate, and helper functions.
# Written by Gary V. Vaughan, 2004
......@@ -1091,57 +1091,6 @@ func_relative_path ()
}
# func_quote ARG
# --------------
# Aesthetically quote one ARG, store the result into $func_quote_result. Note
# that we keep attention to performance here (so far O(N) complexity as long as
# func_append is O(1)).
func_quote ()
{
$debug_cmd
func_quote_result=$1
case $func_quote_result in
*[\\\`\"\$]*)
case $func_quote_result in
*[\[\*\?]*)
func_quote_result=`$ECHO "$func_quote_result" | $SED "$sed_quote_subst"`
return 0
;;
esac
func_quote_old_IFS=$IFS
for _G_char in '\' '`' '"' '$'
do
# STATE($1) PREV($2) SEPARATOR($3)
set start "" ""
func_quote_result=dummy"$_G_char$func_quote_result$_G_char"dummy
IFS=$_G_char
for _G_part in $func_quote_result
do
case $1 in
quote)
func_append func_quote_result "$3$2"
set quote "$_G_part" "\\$_G_char"
;;
start)
set first "" ""
func_quote_result=
;;
first)
set quote "$_G_part" ""
;;
esac
done
IFS=$func_quote_old_IFS
done
;;
*) ;;
esac
}
# func_quote_for_eval ARG...
# --------------------------
# Aesthetically quote ARGs to be evaled later.
......@@ -1158,8 +1107,12 @@ func_quote_for_eval ()
func_quote_for_eval_unquoted_result=
func_quote_for_eval_result=
while test 0 -lt $#; do
func_quote "$1"
_G_unquoted_arg=$func_quote_result
case $1 in
*[\\\`\"\$]*)
_G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;;
*)
_G_unquoted_arg=$1 ;;
esac
if test -n "$func_quote_for_eval_unquoted_result"; then
func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg"
else
......@@ -2188,7 +2141,7 @@ include the following information:
compiler: $LTCC
compiler flags: $LTCFLAGS
linker: $LD (gnu? $with_gnu_ld)
version: $progname $scriptversion Debian-2.4.6-6
version: $progname $scriptversion Debian-2.4.6-10
automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q`
......@@ -5397,8 +5350,7 @@ else
if test \"\$libtool_execute_magic\" != \"$magic\"; then
file=\"\$0\""
func_quote "$ECHO"
qECHO=$func_quote_result
qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
$ECHO "\
# A function that is used when there is no print builtin or printf.
......@@ -7415,10 +7367,11 @@ func_mode_link ()
# -specs=* GCC specs files
# -stdlib=* select c++ std lib with clang
# -fsanitize=* Clang/GCC memory and address sanitizer
# -fuse-ld=* Linker select flags for GCC
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
-O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
-specs=*|-fsanitize=*)
-specs=*|-fsanitize=*|-fuse-ld=*)
func_quote_for_eval "$arg"
arg=$func_quote_for_eval_result
func_append compile_command " $arg"
......@@ -10655,8 +10608,8 @@ EOF
relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
fi
done
func_quote "(cd `pwd`; $relink_command)"
relink_command=$func_quote_result
relink_command="(cd `pwd`; $relink_command)"
relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
fi
# Only actually do things if not in dry run mode.
......@@ -10902,8 +10855,7 @@ EOF
done
# Quote the link command for shipping.
relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
func_quote "$relink_command"
relink_command=$func_quote_result
relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
if test yes = "$hardcode_automatic"; then
relink_command=
fi
......
......@@ -13,7 +13,7 @@ set -e
#POSTGIS_MICRO_VERSION=0SVN
#export GCC_TYPE=gcc48 #for pre-4.8.0 compiles this is blank
export SFCGAL_VER=1.3.2
export GEOS_VER=3.7.0
export GEOS_VER=3.7.1
export GDAL_VER=2.2.4
export PROJ_VER=4.9.3
export SFCGAL_VER=1.3.2
......
......@@ -13,7 +13,7 @@
#export GCC_TYPE=
export SFCGAL_VER=1.3.2
export GEOS_VER=3.7.0
export GEOS_VER=3.7.1
export GDAL_VER=2.2.4
export PROJ_VER=4.9.3
export SFCGAL_VER=1.3.2
......
#!/bin/bash
set -e
export SFCGAL_VER=1.3.2
export GEOS_VER=3.7.0
export GEOS_VER=3.7.1
export GDAL_VER=2.2.4
export PROJ_VER=4.9.3
export SFCGAL_VER=1.3.2
......
......@@ -7925,6 +7925,12 @@ lt_prog_compiler_static=
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-static'
;;
# flang / f18. f95 an alias for gfortran or flang on Debian
flang* | f18* | f95*)
lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_pic='-fPIC'
lt_prog_compiler_static='-static'
;;
# icc used to be incompatible with GCC.
# ICC 10 doesn't accept -KPIC any more.
icc* | ifort*)
......@@ -16219,7 +16225,7 @@ if test ! "x$PROJDIR" = "x"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Using user-specified proj directory: $PROJDIR" >&5
$as_echo "Using user-specified proj directory: $PROJDIR" >&6; }
PROJ_CPPFLAGS="-I$PROJDIR/include"
PROJ_CPPFLAGS="-I$PROJDIR/include -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1"
PROJ_LDFLAGS="-L$PROJDIR/lib"
else
as_fn_error $? "the --with-projdir directory \"$PROJDIR\" cannot be found" "$LINENO" 5
......@@ -16227,10 +16233,12 @@ $as_echo "Using user-specified proj directory: $PROJDIR" >&6; }
fi
fi
CPPFLAGS_SAVE="$CPPFLAGS"
CPPFLAGS="$PROJ_CPPFLAGS"
ac_fn_c_check_header_mongrel "$LINENO" "proj_api.h" "ac_cv_header_proj_api_h" "$ac_includes_default"
ac_fn_c_check_header_compile "$LINENO" "proj_api.h" "ac_cv_header_proj_api_h" "
#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H 1
"
if test "x$ac_cv_header_proj_api_h" = xyes; then :
else
......@@ -16252,6 +16260,7 @@ else
#ifdef HAVE_STDINT_H
#include <stdio.h>
#endif
#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H 1
#include "proj_api.h"
int
......
......@@ -825,7 +825,7 @@ if test ! "x$PROJDIR" = "x"; then
AC_MSG_RESULT([Using user-specified proj directory: $PROJDIR])
dnl Add the include directory to PROJ_CPPFLAGS
PROJ_CPPFLAGS="-I$PROJDIR/include"
PROJ_CPPFLAGS="-I$PROJDIR/include -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1"
PROJ_LDFLAGS="-L$PROJDIR/lib"
else
AC_MSG_ERROR([the --with-projdir directory "$PROJDIR" cannot be found])
......@@ -833,11 +833,13 @@ if test ! "x$PROJDIR" = "x"; then
fi
fi
dnl Check that we can find the proj_api.h header file
CPPFLAGS_SAVE="$CPPFLAGS"
CPPFLAGS="$PROJ_CPPFLAGS"
AC_CHECK_HEADER([proj_api.h], [], [AC_MSG_ERROR([could not find proj_api.h - you may need to specify the directory of a PROJ.4 installation using --with-projdir])])
AC_CHECK_HEADER([proj_api.h], [], [AC_MSG_ERROR([could not find proj_api.h - you may need to specify the directory of a PROJ.4 installation using --with-projdir])],
[
#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H 1
])
dnl Return the PROJ.4 version number
AC_PROJ_VERSION([POSTGIS_PROJ_VERSION])
......