[geos-commits] r3541 - in branches/3.3: . macros tools

[svn_geos at osgeo.org]

Author: strk
Date: 2011-12-12 01:57:21 -0800 (Mon, 12 Dec 2011)
New Revision: 3541

Modified:
   branches/3.3/NEWS
   branches/3.3/macros/geos.m4
   branches/3.3/tools/geos-config.in
Log:
Add --clibs to geos-config and GEOS_C_LIBS to geos.m4 (#497)

Modified: branches/3.3/NEWS
===================================================================
--- branches/3.3/NEWS	2011-12-09 10:54:27 UTC (rev 3540)
+++ branches/3.3/NEWS	2011-12-12 09:57:21 UTC (rev 3541)
@@ -12,6 +12,7 @@
     - 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

Modified: branches/3.3/macros/geos.m4
===================================================================
--- branches/3.3/macros/geos.m4	2011-12-09 10:54:27 UTC (rev 3540)
+++ branches/3.3/macros/geos.m4	2011-12-12 09:57:21 UTC (rev 3541)
@@ -2,7 +2,7 @@
 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 @@
 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_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

Modified: branches/3.3/tools/geos-config.in
===================================================================
--- branches/3.3/tools/geos-config.in	2011-12-09 10:54:27 UTC (rev 3540)
+++ branches/3.3/tools/geos-config.in	2011-12-12 09:57:21 UTC (rev 3541)
@@ -11,6 +11,7 @@
      [--prefix]
      [--version]
      [--libs]
+     [--clibs]
      [--cflags]
      [--ldflags]
      [--includes]
@@ -39,6 +40,9 @@
     --libs)
       echo -L${libdir} -lgeos
       ;;
+    --clibs)
+      echo -L${libdir} -lgeos_c
+      ;;
     --ldflags)
       echo -L${libdir}
       ;;