[postgis-tickets] [SCM] PostGIS branch stable-3.0 updated. 3.0.1-26-g2d89dab

[git at osgeo.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".

The branch, stable-3.0 has been updated
       via  2d89dabd2f2b561fbc0e95b1ed12ee8487ef6271 (commit)
       via  9588e3a4f384f7c33e060138c944e39fe5d93ce1 (commit)
      from  aeea5121b2a99137e67ea4177c8b5d43efcba35d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2d89dabd2f2b561fbc0e95b1ed12ee8487ef6271
Author: Raúl Marín <git at rmr.ninja>
Date:   Mon Jun 22 12:42:02 2020 +0200

    Configure: Default to -lproj in all cases
    
    Closes #4716

diff --git a/NEWS b/NEWS
index 1964cbe..39ad4fd 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,7 @@ PostGIS 3.0.2
   - #4670, ST_AddPoint: Fix bug when a positive position is requested (Raúl Marín)
   - #4702, Legacy ST_Locate_Between_Measures is wrong (Kaplas80)
   - #4699, crash on null input to ST_Union(raster, otherarg) (Jaime Casanova, 2ndQuadrant)
+  - #4716, Fix several issues with pkg-config in the configure script (Raúl Marín)
 
 PostGIS 3.0.1
 2020/02/20
diff --git a/configure.ac b/configure.ac
index 1e06773..4f26390 100644
--- a/configure.ac
+++ b/configure.ac
@@ -874,15 +874,18 @@ if test ! "x$PROJDIR" = "x"; then
 		fi
 	fi
 elif test ! -z "$PKG_CONFIG"; then
-        dnl To keep compatibility with PROJ pre 4.8, default to lproj if not found
+	dnl To keep compatibility with PROJ pre 4.8, default to lproj if not found
 	PKG_CHECK_MODULES([PROJ], [proj],
-            [
-                PROJ_CPPFLAGS="$PROJ_CFLAGS"
-                PROJ_LDFLAGS="$PROJ_LIBS"
-            ],
-            [
-                PROJ_LDFLAGS="-lproj"
-            ])
+		[
+			PROJ_CPPFLAGS="$PROJ_CFLAGS"
+			PROJ_LDFLAGS="$PROJ_LIBS"
+		],
+		[
+			PROJ_LDFLAGS="-lproj"
+		])
+else
+	dnl To keep compatibility with PROJ pre 4.8, default to lproj
+	PROJ_LDFLAGS="-lproj"
 fi
 
 

commit 9588e3a4f384f7c33e060138c944e39fe5d93ce1
Author: Raúl Marín <git at rmr.ninja>
Date:   Mon Jun 22 12:42:27 2020 +0200

    Configure: Don't error if json-c is not found with pkg-config

diff --git a/configure.ac b/configure.ac
index c5df08d..1e06773 100644
--- a/configure.ac
+++ b/configure.ac
@@ -967,7 +967,7 @@ if test "$CHECK_JSON" != "no"; then
                 HAVE_JSON=yes
                 JSON_CPPFLAGS="$JSONC_CFLAGS"
                 JSON_LDFLAGS="$JSONC_LIBS"
-            ], [])
+            ], [AC_MSG_WARN("Could not find json-c")])
     fi
 
     if test "$HAVE_JSON" = "yes"; then

-----------------------------------------------------------------------

Summary of changes:
 NEWS         |  1 +
 configure.ac | 21 ++++++++++++---------
 2 files changed, 13 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
PostGIS