[postgis-tickets] [SCM] PostGIS branch master updated. 3.1.0rc1-412-g86a8a59
git at osgeo.org
git at osgeo.org
Fri Aug 20 21:24:50 PDT 2021
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 86a8a59791431b279e4d6511c96af0d3e45332d5 (commit)
from ca57f5ffa443aef7f41c59c12a719a10ecb49e7e (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 86a8a59791431b279e4d6511c96af0d3e45332d5
Author: Regina Obe <lr at pcorp.us>
Date: Sat Aug 21 00:24:44 2021 -0400
Partially revert #4964 which broke mingw64 building. Closes #4977
diff --git a/configure.ac b/configure.ac
index 2356ab7..422fd87 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1013,7 +1013,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 -lprotobuf-c";
+ PROTOBUF_LDFLAGS="-L$withval/lib";
PROTOBUF_CPPFLAGS="-I$withval/include"
fi
], [])
@@ -1044,7 +1044,7 @@ if test "$CHECK_PROTOBUF" != "no"; then
dnl confirm that discovered/configured library path works
AC_CHECK_LIB([protobuf-c], [protobuf_c_message_init],
- [PROTOBUF_LDFLAGS="-lprotobuf-c"],
+ [],
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 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list