Support Proj 6. Support is via legacy API, we need to redesign for non-legacy and...

Closes #4254
Closes https://github.com/postgis/postgis/pull/354

git-svn-id: http://svn.osgeo.org/postgis/branches/2.5@17109 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/NEWS b/NEWS
index 1205a627597b17480d54e65e9db8efa6da43cf21..f15a6701e4d89d1768e5c7fcbbe329406cfeb0af 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -2,24 +2,32 @@ PostGIS 2.5.2
 XXXX/XX/XX
 
  * 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)
 
 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)

diff --git a/configure.ac b/configure.ac
index a9b6e29a121764015abc27055817bc3d6b7a54db..21d83f82b41ae56fa54fa369196c5f0a6777fcf7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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,11 @@ 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])

diff --git a/liblwgeom/liblwgeom.h.in b/liblwgeom/liblwgeom.h.in
index 0291c1b2b568dca84f0406c977d15f961568b69e..94ae57c23027903ef4dcf5844d720194200d5c33 100644 (file)
--- a/liblwgeom/liblwgeom.h.in
+++ b/liblwgeom/liblwgeom.h.in
@@ -32,6 +32,7 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdint.h>
+#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H 1
 #include "proj_api.h"
 
 #if defined(PJ_VERSION) && PJ_VERSION >= 490

diff --git a/macros/ac_proj4_version.m4 b/macros/ac_proj4_version.m4
index 3d9deca1d392ffa5b91adbf24c75a94ec8c184ad..f8671ec7ef16f7e2ae64999692b97deba58e0849 100644 (file)
--- a/macros/ac_proj4_version.m4
+++ b/macros/ac_proj4_version.m4
@@ -19,13 +19,14 @@ AC_DEFUN([AC_PROJ_VERSION], [
                #ifdef HAVE_STDINT_H
                        #include <stdio.h>
                #endif
+               #define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H 1
                #include "proj_api.h"
-       ], 
+       ],
        [
-               FILE *fp; 
+               FILE *fp;
 
-               fp = fopen("conftest.out", "w"); 
-               fprintf(fp, "%d\n", PJ_VERSION); 
+               fp = fopen("conftest.out", "w");
+               fprintf(fp, "%d\n", PJ_VERSION);
                fclose(fp)])
        ],
         [

diff --git a/raster/macros/ac_proj4_version.m4 b/raster/macros/ac_proj4_version.m4
index d87ee1174c050f559c7c82be5a39029ad2d98942..481393563a8cd2e835fdb4d8339d1f346e634309 100644 (file)
--- a/raster/macros/ac_proj4_version.m4
+++ b/raster/macros/ac_proj4_version.m4
@@ -30,13 +30,14 @@ AC_DEFUN([AC_PROJ_VERSION], [
                #ifdef HAVE_STDINT_H
                        #include <stdio.h>
                #endif
+               #define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H 1
                #include "proj_api.h"
-       ], 
+       ],
        [
-               FILE *fp; 
+               FILE *fp;
 
-               fp = fopen("conftest.out", "w"); 
-               fprintf(fp, "%d\n", PJ_VERSION); 
+               fp = fopen("conftest.out", "w");
+               fprintf(fp, "%d\n", PJ_VERSION);
                fclose(fp)])
        ],
         [