]> granicus.if.org Git - postgis/commitdiff
Add GEOS to compile cunit flags of shp2pgsql to prevent error in #1898
authorRegina Obe <lr@pcorp.us>
Mon, 6 May 2013 07:58:11 +0000 (07:58 +0000)
committerRegina Obe <lr@pcorp.us>
Mon, 6 May 2013 07:58:11 +0000 (07:58 +0000)
git-svn-id: http://svn.osgeo.org/postgis/trunk@11363 b70326c6-7e19-0410-871a-916f4a2858ee

loader/cunit/Makefile.in

index 2e4f384c07b9c06a0ed791220521117670349944..017a48aae16182aa8b3a6a319c77400c721da536 100644 (file)
 # **********************************************************************
 
 CC=@CC@
-CFLAGS=@CFLAGS@ @WARNFLAGS@
+GEOS_CFLAGS=@GEOS_CPPFLAGS@
+GEOS_LDFLAGS=@GEOS_LDFLAGS@ -lgeos_c
+
+CFLAGS=@CFLAGS@ @WARNFLAGS@ $(GEOS_CFLAGS)
 
 CUNIT_LDFLAGS=@CUNIT_LDFLAGS@
 CUNIT_CPPFLAGS=@CUNIT_CPPFLAGS@ -I..
@@ -40,7 +43,7 @@ GETTEXT_LDFLAGS = @GETTEXT_LDFLAGS@ @LIBINTL@
 CFLAGS += $(GETTEXT_CFLAGS) $(ICONV_CFLAGS)
 
 # Build full linking line
-LDFLAGS = -lm $(GETTEXT_LDFLAGS) $(PGSQL_FE_LDFLAGS) $(ICONV_LDFLAGS) $(CUNIT_LDFLAGS)
+LDFLAGS = -lm $(GEOS_LDFLAGS) $(GETTEXT_LDFLAGS) $(PGSQL_FE_LDFLAGS) $(ICONV_LDFLAGS) $(CUNIT_LDFLAGS)
 
 # Object files
 OBJS=  \