[geos-commits] [SCM] GEOS branch master updated. 203847a8ade193f3c1e2224b7b25828e3e67e746

[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 "GEOS".

The branch, master has been updated
       via  203847a8ade193f3c1e2224b7b25828e3e67e746 (commit)
       via  4dd0e1c416c0c97e75d6b6e0c1f1acfe4a0327f9 (commit)
      from  efe09d6e53ad5e6a7a43747af24f28c6876c6c72 (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 203847a8ade193f3c1e2224b7b25828e3e67e746
Merge: efe09d6 4dd0e1c
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Mon Jan 4 09:57:49 2021 -0800

    Merge branch 'eyal0-patch-1'


commit 4dd0e1c416c0c97e75d6b6e0c1f1acfe4a0327f9
Author: Eyal <109809+eyal0 at users.noreply.github.com>
Date:   Sat Jan 2 11:16:49 2021 -0700

    Add GEOS_CC_LIBS for linking with c++
    
    This fixes #376

diff --git a/macros/geos.m4 b/macros/geos.m4
index f069102..e4cbbfc 100644
--- a/macros/geos.m4
+++ b/macros/geos.m4
@@ -1,7 +1,7 @@
 dnl 
 dnl GEOS_INIT (MINIMUM_VERSION)
 dnl
-dnl Test for GEOS: define HAVE_GEOS, GEOS_LIBS, GEOS_C_LIBS, GEOS_CFLAGS, GEOS_VERSION
+dnl Test for GEOS: define HAVE_GEOS, GEOS_LIBS, GEOS_C_LIBS, GEOS_CC_LIBS, GEOS_CFLAGS, GEOS_VERSION
 dnl 
 dnl Call as GEOS_INIT or GEOS_INIT(minimum version) in configure.in. Test
 dnl HAVE_GEOS (yes|no) afterwards. If yes, all other vars above can be 
@@ -17,6 +17,7 @@ AC_DEFUN([GEOS_INIT],[
 	AC_SUBST(GEOS_LIBS)
 	AC_SUBST(GEOS_CFLAGS)
 	AC_SUBST(GEOS_C_LIBS)
+	AC_SUBST(GEOS_CC_LIBS)
 	AC_SUBST(GEOS_C_CFLAGS)
 	AC_SUBST(HAVE_GEOS) 
 	AC_SUBST(GEOS_VERSION)
@@ -78,6 +79,7 @@ AC_DEFUN([GEOS_INIT],[
           HAVE_GEOS="yes"
           GEOS_LIBS="`$GEOS_CONFIG --libs`"
           GEOS_C_LIBS="`$GEOS_CONFIG --ldflags` -lgeos_c"
+          GEOS_CC_LIBS="`$GEOS_CONFIG --ldflags` -lgeos"
           GEOS_CFLAGS="`$GEOS_CONFIG --cflags`"
           GEOS_VERSION="`$GEOS_CONFIG --version`"
         else

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

Summary of changes:
 macros/geos.m4 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
GEOS