[geos-commits] r3542 - in trunk: macros tools
svn_geos at osgeo.org
svn_geos at osgeo.org
Mon Dec 12 04:59:00 EST 2011
Author: strk
Date: 2011-12-12 01:59:00 -0800 (Mon, 12 Dec 2011)
New Revision: 3542
Modified:
trunk/macros/geos.m4
trunk/tools/geos-config.in
Log:
Add --clibs to geos-config and GEOS_C_LIBS to geos.m4 (#497)
Modified: trunk/macros/geos.m4
===================================================================
--- trunk/macros/geos.m4 2011-12-12 09:57:21 UTC (rev 3541)
+++ trunk/macros/geos.m4 2011-12-12 09:59:00 UTC (rev 3542)
@@ -1,7 +1,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
@@ -16,6 +16,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)
@@ -75,6 +77,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: trunk/tools/geos-config.in
===================================================================
--- trunk/tools/geos-config.in 2011-12-12 09:57:21 UTC (rev 3541)
+++ trunk/tools/geos-config.in 2011-12-12 09:59:00 UTC (rev 3542)
@@ -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}
;;
More information about the geos-commits
mailing list