From 7172b3649407b0d851fef78ff298965479ebde56 Mon Sep 17 00:00:00 2001
From: strk <strk@5242fede-7e19-0410-aef8-94bd7d2200fb>
Date: Mon, 12 Dec 2011 09:57:21 +0000
Subject: [PATCH] Add --clibs to geos-config and GEOS_C_LIBS to geos.m4 (#497)

git-svn-id: http://svn.osgeo.org/geos/branches/3.3@3541 5242fede-7e19-0410-aef8-94bd7d2200fb
---
 NEWS                 | 1 +
 macros/geos.m4       | 5 ++++-
 tools/geos-config.in | 4 ++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index cd1eae6e..bfbe7eca 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,7 @@ YYYY-MM-DD
     - Fix CascadedPolygonUnion to discard non-polygonal components (#499)
     - Improve buffer robustness by reverting to non-snaprounding noder (#495)
     - Fix C++11 build by avoiding std::pair<auto_ptr> (#491)
+    - Add --clibs to geos-config and GEOS_C_LIBS to geos.m4 (#497)
 
 Changes in 3.3.1
 2011-09-27
diff --git a/macros/geos.m4 b/macros/geos.m4
index e6d8a694..b0eebf4c 100644
--- a/macros/geos.m4
+++ b/macros/geos.m4
@@ -2,7 +2,7 @@ dnl $Id$
 dnl 
 dnl GEOS_INIT (MINIMUM_VERSION)
 dnl
-dnl Test for GEOS: define HAVE_GEOS, GEOS_LIBS, GEOS_CFLAGS, GEOS_VERSION
+dnl Test for GEOS: define HAVE_GEOS, GEOS_LIBS, GEOS_C_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,8 @@ dnl
 AC_DEFUN([GEOS_INIT],[
 	AC_SUBST(GEOS_LIBS)
 	AC_SUBST(GEOS_CFLAGS)
+	AC_SUBST(GEOS_C_LIBS)
+	AC_SUBST(GEOS_C_CFLAGS)
 	AC_SUBST(HAVE_GEOS) 
 	AC_SUBST(GEOS_VERSION)
 
@@ -76,6 +78,7 @@ AC_DEFUN([GEOS_INIT],[
           AC_MSG_RESULT(yes)
           HAVE_GEOS="yes"
           GEOS_LIBS="`$GEOS_CONFIG --libs`"
+          GEOS_C_LIBS="`$GEOS_CONFIG --ldflags` -lgeos_c"
           GEOS_CFLAGS="`$GEOS_CONFIG --cflags`"
           GEOS_VERSION="`$GEOS_CONFIG --version`"
         else
diff --git a/tools/geos-config.in b/tools/geos-config.in
index cf2d73bd..9dbf495e 100644
--- a/tools/geos-config.in
+++ b/tools/geos-config.in
@@ -11,6 +11,7 @@ Options:
      [--prefix]
      [--version]
      [--libs]
+     [--clibs]
      [--cflags]
      [--ldflags]
      [--includes]
@@ -39,6 +40,9 @@ case $1 in
     --libs)
       echo -L${libdir} -lgeos
       ;;
+    --clibs)
+      echo -L${libdir} -lgeos_c
+      ;;
     --ldflags)
       echo -L${libdir}
       ;;
-- 
2.11.4.GIT