[postgis-tickets] [SCM] PostGIS branch master updated. 3.1.0alpha1-150-g3f60648

[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, master has been updated
       via  3f60648eb09d50d082dad352f9bcfbae775f964d (commit)
       via  e4a3bd6e811b172907fe02e78d6c397c07c5473d (commit)
      from  28d3e83bcb1820bb4752d38530cd319c9424003e (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 3f60648eb09d50d082dad352f9bcfbae775f964d
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
    
    References #4716
    Closes https://github.com/postgis/postgis/pull/567

diff --git a/NEWS b/NEWS
index 6c3d614..df59f40 100644
--- a/NEWS
+++ b/NEWS
@@ -29,6 +29,7 @@ Only tickets not included in 3.1.0alpha1
   - #4661, Fix access to spatial_ref_sys with a non default schema (Raúl Marín)
   - #4670, ST_AddPoint: Fix bug when a positive position is requested (Raúl Marín)
   - #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.1.0alpha1
 2020/02/01
diff --git a/configure.ac b/configure.ac
index 590cf7c..5398ae0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -864,15 +864,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 e4a3bd6e811b172907fe02e78d6c397c07c5473d
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 db8ceb9..590cf7c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -957,7 +957,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