[postgis-tickets] [SCM] PostGIS branch master updated. 3.1.0rc1-147-g0a9809b

[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  0a9809b7978b77e09f173ce256ec696a04071b30 (commit)
       via  3ecd0fb05e37de06a6e3e1354bfee961cddef7f5 (commit)
       via  8b80c4bd848ff3d71b998dc8a4bd42627ed72581 (commit)
      from  dabd7723201a2efed06fd3d3e77c35e5cec7e44b (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 0a9809b7978b77e09f173ce256ec696a04071b30
Merge: dabd772 3ecd0fb
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Mon Apr 19 12:51:16 2021 -0700

    Merge branch 'ffontaine-master'


commit 3ecd0fb05e37de06a6e3e1354bfee961cddef7f5
Merge: dabd772 8b80c4b
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Mon Apr 19 12:37:56 2021 -0700

    Merge branch 'master' of https://github.com/ffontaine/postgis into ffontaine-master


commit 8b80c4bd848ff3d71b998dc8a4bd42627ed72581
Author: Fabrice Fontaine <fontaine.fabrice at gmail.com>
Date:   Sat Apr 17 11:58:19 2021 +0200

    configure.ac: fix cross-compilation with protobuf-c
    
    Try to retrieve the version from pkg-config to avoid the following
    error:
    
    checking protobuf-c version... configure: error: in `/home/fabrice/buildroot/output/build/postgis-3.1.1':
    configure: error: cannot run test program while cross compiling
    
    Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com>

diff --git a/configure.ac b/configure.ac
index 48ba070..df75fe6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1004,6 +1004,7 @@ if test "$CHECK_PROTOBUF" != "no"; then
 		PKG_CHECK_MODULES([PROTOBUFC], [libprotobuf-c >= 1.1.0], [
 				PROTOBUF_CPPFLAGS="$PROTOBUFC_CFLAGS";
 				PROTOBUF_LDFLAGS="$PROTOBUFC_LIBS";
+				PROTOC_VERSION=`$PKG_CONFIG libprotobuf-c --modversion | sed 's/\([[0-9]]\).*\([[0-9]]\).*\([[0-9]]\)/\100\200\3/'`
 			], [
 				AC_MSG_RESULT([libprotobuf-c not found in pkg-config])
 			])
@@ -1054,7 +1055,10 @@ if test "$CHECK_PROTOBUF" != "no"; then
 		[])
 
 	AC_MSG_CHECKING([protobuf-c version])
-	AC_PROTOBUFC_VERSION([PROTOC_VERSION])
+	dnl Return the protobuf-c version number if not detected by pkg-config
+	if test "x$PROTOC_VERSION" = "x"; then
+		AC_PROTOBUFC_VERSION([PROTOC_VERSION])
+	fi
         if test ! "$PROTOC_VERSION" -ge 1001000; then
                 AC_MSG_ERROR("Old protobuf-c release found but 1.1.0 is required. You can disable MVT and Geobuf support using --without-protobuf")
         fi

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

Summary of changes:
 configure.ac | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
PostGIS