[postgis-tickets] [SCM] PostGIS branch master updated. 3.2.0-515-g4053205b0

[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  4053205b04d25d5d7e30328cac29e7ce2958c1ac (commit)
      from  1e76b00013f979c52c3b2e639b77018290dfb1e0 (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 4053205b04d25d5d7e30328cac29e7ce2958c1ac
Author: Regina Obe <lr at pcorp.us>
Date:   Sat Feb 12 18:44:10 2022 -0500

    Patches from Tobias Bussmann
    References #5090 for PostGIS 3.3.0
    Closes https://github.com/postgis/postgis/pull/662, Closes
    https://github.com/postgis/postgis/pull/663atches from Tobias Bussmann
    References #5090 for PostGIS 3.3.0
    Closes https://github.com/postgis/postgis/pull/662, Closes https://github.com/postgis/postgis/pull/663

diff --git a/configure.ac b/configure.ac
index 07307a46f..fe9de0bcb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1028,7 +1028,7 @@ if test "$CHECK_PROTOBUF" != "no"; then
 			if test "x$withval" = "xyes"; then
 				AC_MSG_ERROR([you must specify a parameter to --with-protobufdir, e.g. --with-protobufdir=/usr/local])
 			else
-				PROTOBUF_LDFLAGS="-L$withval/lib";
+				PROTOBUF_LDFLAGS="-L$withval/lib -lprotobuf-c";
 				PROTOBUF_CPPFLAGS="-I$withval/include"
 			fi
 		], [])
@@ -1040,7 +1040,7 @@ if test "$CHECK_PROTOBUF" != "no"; then
 
 	AC_ARG_WITH([protobuf-lib],
 		[AS_HELP_STRING([--with-protobuf-lib=PATH], [libprotobuf-c.so/dll/dylib library installation directory])], [
-			PROTOBUF_LDFLAGS="-L$withval"
+			PROTOBUF_LDFLAGS="-L$withval -lprotobuf-c"
 		],[])
 
 	if test -n "$PROTOBUF_CPPFLAGS"; then
@@ -1058,8 +1058,11 @@ if test "$CHECK_PROTOBUF" != "no"; then
 	)
 
 	dnl confirm that discovered/configured library path works
-	AC_CHECK_LIB([protobuf-c], [protobuf_c_message_init],
-		[],
+	AC_CHECK_LIB([protobuf-c], [protobuf_c_message_init],[
+			if test "x$PROTOBUF_LDFLAGS" = "x"; then
+				PROTOBUF_LDFLAGS="-lprotobuf-c"
+			fi
+		],
 		AC_MSG_ERROR([unable to link protobuf-c using $LDFLAGS. You can disable MVT and Geobuf support using --without-protobuf])
 		HAVE_PROTOBUF=no
 	)

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

Summary of changes:
 configure.ac | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
PostGIS