[geos-commits] r3974 - trunk/capi

Tue Feb 11 01:01:47 PST 2014

Author: strk
Date: 2014-02-11 01:01:46 -0800 (Tue, 11 Feb 2014)
New Revision: 3974

Modified:
   trunk/capi/Makefile.am
Log:
Include AM_CPPFLAGS in target-specific CPPFLAGS

Attempt to fix build on travis (with automake 1.11.3)
See http://travis-ci.org/libgeos/libgeos/jobs/18602776#L2519

Modified: trunk/capi/Makefile.am
===================================================================

--- trunk/capi/Makefile.am	2014-02-10 18:39:47 UTC (rev 3973)
+++ trunk/capi/Makefile.am	2014-02-11 09:01:46 UTC (rev 3974)
@@ -21,7 +21,7 @@
     $(NULL)
 
 libgeos_c_la_SOURCES = $(DIR_SOURCES)
-libgeos_c_la_CPPFLAGS = -DGEOS_CAPI_VERSION='$(GEOS_CAPI_VERSION)' -DGEOS_JTS_PORT='$(GEOS_JTS_PORT)'
+libgeos_c_la_CPPFLAGS = $(AM_CPPFLAGS) -DGEOS_CAPI_VERSION='$(GEOS_CAPI_VERSION)' -DGEOS_JTS_PORT='$(GEOS_JTS_PORT)'
 libgeos_c_la_LIBADD = $(top_builddir)/src/libgeos.la
 libgeos_c_la_LDFLAGS = \
     -version-info @CAPI_INTERFACE_CURRENT@:@CAPI_INTERFACE_REVISION@:@CAPI_INTERFACE_AGE@ \

