[postgis-tickets] [SCM] PostGIS branch master updated. 3.1.0rc1-66-gb02ff2d
git at osgeo.org
git at osgeo.org
Tue Feb 9 11:57:26 PST 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 b02ff2dd6d4962fb7984102cddf3560ea682ef4c (commit)
via 518ae076a8c6e6239b9f4c4b1808f5b10650bf1b (commit)
from 88b689c8f1d3e72dde2e3ee534d48b514ccf63f3 (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 b02ff2dd6d4962fb7984102cddf3560ea682ef4c
Merge: 518ae07 88b689c
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date: Tue Feb 9 11:57:16 2021 -0800
Merge branch 'master' of https://git.osgeo.org/gitea/postgis/postgis
commit 518ae076a8c6e6239b9f4c4b1808f5b10650bf1b
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date: Tue Feb 9 11:57:04 2021 -0800
If pg_get_release is not present, test for proj_info instead when configuring.
diff --git a/configure.ac b/configure.ac
index 077a615..d0d944b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -905,12 +905,15 @@ AC_SUBST([PROJ_LDFLAGS])
dnl Ensure we can link against libproj
LIBS_SAVE="$LIBS"
LIBS="$PROJ_LDFLAGS"
-AC_CHECK_LIB([proj], [pj_get_release],
- [],
- [AC_MSG_ERROR([could not find libproj - you may need to specify the directory of a PROJ installation using --with-projdir])],
+AC_CHECK_LIB([proj], [pj_get_release], [],
+ [AC_CHECK_LIB([proj], [proj_info], [],
+ [AC_MSG_ERROR([could not find libproj - you may need to specify the directory of a PROJ installation using --with-projdir])],
+ []
+ )],
[])
LIBS="$LIBS_SAVE"
+
dnl ===========================================================================
dnl Detect if json-c installed
dnl ===========================================================================
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list