[postgis-tickets] [SCM] PostGIS branch master updated. 3.1.0rc1-52-gdbd1425

[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  dbd1425e11283d7c7b840e293073d336c6362b59 (commit)
       via  1815cbe641f7b97b6a3368932ec47c7c697dd4e0 (commit)
       via  7ff1d90703ddba72a05cca771ab344857aa43a26 (commit)
       via  671a878982550e3c590d642620a6621b52c230c7 (commit)
      from  5148c43e378628090098099f63b67297d573a4fe (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 dbd1425e11283d7c7b840e293073d336c6362b59
Merge: 5148c43 1815cbe
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Thu Jan 28 12:49:47 2021 -0800

    Merge branch 'fidomax-patch-2'


commit 1815cbe641f7b97b6a3368932ec47c7c697dd4e0
Merge: 7ff1d90 5148c43
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Thu Jan 28 12:48:03 2021 -0800

    Merge branch 'master' of https://git.osgeo.org/gitea/postgis/postgis


commit 7ff1d90703ddba72a05cca771ab344857aa43a26
Merge: ebe9ec5 671a878
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Thu Jan 28 12:47:11 2021 -0800

    Merge branch 'fidomax-patch-2'


commit 671a878982550e3c590d642620a6621b52c230c7
Author: Maxim Kochetkov <adobegitler at gmail.com>
Date:   Thu Jan 28 08:12:57 2021 +0300

    Use pkg-config to get PROJ version if available
    
    In case of cross-compile AC_PROJ_VERSION([POSTGIS_PROJ_VERSION]) fails.
    So try to get version by pkg-config first

diff --git a/configure.ac b/configure.ac
index 9ac7051..077a615 100644
--- a/configure.ac
+++ b/configure.ac
@@ -864,6 +864,7 @@ elif test ! -z "$PKG_CONFIG"; then
 		[
 			PROJ_CPPFLAGS="$PROJ_CFLAGS"
 			PROJ_LDFLAGS="$PROJ_LIBS"
+			POSTGIS_PROJ_VERSION=`$PKG_CONFIG proj --modversion | sed 's/\([[0-9]]\).*\([[0-9]]\).*\([[0-9]]\)/\1\2/'`
 		],
 		[
 			PROJ_LDFLAGS="-lproj"
@@ -885,8 +886,10 @@ AC_CHECK_HEADER([proj_api.h],
 		)]
 	)
 
-dnl Return the PROJ.4 version number
-AC_PROJ_VERSION([POSTGIS_PROJ_VERSION])
+dnl Return the PROJ.4 version number if not detected by pkg-config
+if test "x$POSTGIS_PROJ_VERSION" = "x"; then
+	AC_PROJ_VERSION([POSTGIS_PROJ_VERSION])
+fi
 AC_DEFINE_UNQUOTED([POSTGIS_PROJ_VERSION], [$POSTGIS_PROJ_VERSION], [PROJ library version])
 AC_SUBST([POSTGIS_PROJ_VERSION])
 CPPFLAGS="$CPPFLAGS_SAVE"

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

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


hooks/post-receive
-- 
PostGIS