1*4882a593SmuzhiyunFrom 876a04a795fcb179e0dc802e260353012c4890f9 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Maxim Kochetkov <adobegitler@gmail.com> 3*4882a593SmuzhiyunDate: Thu, 28 Jan 2021 08:12:57 +0300 4*4882a593SmuzhiyunSubject: [PATCH] Use pkg-config to get PROJ version if available 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunIn case of cross-compile AC_PROJ_VERSION([POSTGIS_PROJ_VERSION]) fails. 7*4882a593SmuzhiyunSo try to get version by pkg-config first 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunSigned-off-by: Maxim Kochetkov <fido_max@inbox.ru> 10*4882a593SmuzhiyunFetch from: https://github.com/postgis/postgis/commit/671a878982550e3c590d642620a6621b52c230c7.patch 11*4882a593Smuzhiyun--- 12*4882a593Smuzhiyun configure.ac | 7 +++++-- 13*4882a593Smuzhiyun 1 file changed, 5 insertions(+), 2 deletions(-) 14*4882a593Smuzhiyun 15*4882a593Smuzhiyundiff --git a/configure.ac b/configure.ac 16*4882a593Smuzhiyunindex 86e1597ee..016f81c7d 100644 17*4882a593Smuzhiyun--- a/configure.ac 18*4882a593Smuzhiyun+++ b/configure.ac 19*4882a593Smuzhiyun@@ -866,6 +866,7 @@ elif test ! -z "$PKG_CONFIG"; then 20*4882a593Smuzhiyun [ 21*4882a593Smuzhiyun PROJ_CPPFLAGS="$PROJ_CFLAGS" 22*4882a593Smuzhiyun PROJ_LDFLAGS="$PROJ_LIBS" 23*4882a593Smuzhiyun+ POSTGIS_PROJ_VERSION=`$PKG_CONFIG proj --modversion | sed 's/\([[0-9]]\).*\([[0-9]]\).*\([[0-9]]\)/\1\2/'` 24*4882a593Smuzhiyun ], 25*4882a593Smuzhiyun [ 26*4882a593Smuzhiyun PROJ_LDFLAGS="-lproj" 27*4882a593Smuzhiyun@@ -887,8 +888,10 @@ AC_CHECK_HEADER([proj_api.h], 28*4882a593Smuzhiyun )] 29*4882a593Smuzhiyun ) 30*4882a593Smuzhiyun 31*4882a593Smuzhiyun-dnl Return the PROJ.4 version number 32*4882a593Smuzhiyun-AC_PROJ_VERSION([POSTGIS_PROJ_VERSION]) 33*4882a593Smuzhiyun+dnl Return the PROJ.4 version number if not detected by pkg-config 34*4882a593Smuzhiyun+if test "x$POSTGIS_PROJ_VERSION" = "x"; then 35*4882a593Smuzhiyun+ AC_PROJ_VERSION([POSTGIS_PROJ_VERSION]) 36*4882a593Smuzhiyun+fi 37*4882a593Smuzhiyun AC_DEFINE_UNQUOTED([POSTGIS_PROJ_VERSION], [$POSTGIS_PROJ_VERSION], [PROJ library version]) 38*4882a593Smuzhiyun AC_SUBST([POSTGIS_PROJ_VERSION]) 39*4882a593Smuzhiyun CPPFLAGS="$CPPFLAGS_SAVE" 40*4882a593Smuzhiyun-- 41*4882a593Smuzhiyun2.30.0 42*4882a593Smuzhiyun 43