[geos-commits] r3832 - in trunk: . tools

[svn_geos at osgeo.org]

Author: strk
Date: 2013-07-10 22:49:58 -0700 (Wed, 10 Jul 2013)
New Revision: 3832

Modified:
   trunk/NEWS
   trunk/tools/geos-config.in
Log:
Add --cclibs, --static-clibs and --static-cclibs to geos-config (#497)

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2013-07-11 05:46:13 UTC (rev 3831)
+++ trunk/NEWS	2013-07-11 05:49:58 UTC (rev 3832)
@@ -10,6 +10,8 @@
   - New Centroid class supporting mixed geometry components (#612)
   - io::Writer::reserve() method
   - CAPI: GEOSNearestPoints
+  - Add --cclibs, --static-clibs and --static-cclibs to geos-config (#497)
+
 - C++ API changes:
   - New noding::GeometryNoder class
   - Added BufferOp::setSingleSided 

Modified: trunk/tools/geos-config.in
===================================================================
--- trunk/tools/geos-config.in	2013-07-11 05:46:13 UTC (rev 3831)
+++ trunk/tools/geos-config.in	2013-07-11 05:49:58 UTC (rev 3832)
@@ -12,6 +12,9 @@
      [--version]
      [--libs]
      [--clibs]
+     [--cclibs]
+     [--static-clibs]
+     [--static-cclibs]
      [--cflags]
      [--ldflags]
      [--includes]
@@ -38,11 +41,22 @@
     echo -I${prefix}/include 
       ;;
     --libs)
+      # TODO: make an alias for --clibs
+      # see http://trac.osgeo.org/geos/ticket/497
       echo -L${libdir} -lgeos
       ;;
     --clibs)
       echo -L${libdir} -lgeos_c
       ;;
+    --cclibs)
+      echo -L${libdir} -lgeos
+      ;;
+    --static-clibs)
+      echo -L${libdir} -lgeos_c -lgeos -m
+      ;;
+    --static-cclibs)
+      echo -L${libdir} -lgeos -m
+      ;;
     --ldflags)
       echo -L${libdir}
       ;;