GNUmakefile fix for OGR/GEOS

[warmerdam]

Hi,

Here a simple fix to gdal/ogr/GNUmakefile

$ cvs -z3 diff -u GNUmakefile
Index: GNUmakefile
===================================================================
RCS file: /cvsroot/osrs/gdal/ogr/GNUmakefile,v
retrieving revision 1.69
diff -u -r1.69 GNUmakefile
--- GNUmakefile 30 Jul 2004 14:44:25 -0000      1.69
+++ GNUmakefile 18 Aug 2004 01:20:42 -0000
@@ -9,7 +9,7 @@
                ogr_featurestyle.h ogr_api.h
 
 ifeq ($(HAVE_GEOS),yes)
-CPPFLAGS       :=      -DHAVE_GEOS=1 $(GEOS_INC)
$(CPPFLAGS)
+CPPFLAGS       :=      -DHAVE_GEOS=1 -I$(GEOS_INC)
$(CPPFLAGS)
 endif
 
 CPPFLAGS       :=      -Iogrsf_frmts -I.
$(GDAL_INCLUDE) $(PROJ_INCLUDE) $(PROJ_FLAGS)
$(CPPFLAGS)


There is a "-I" missing before "$(GEOS_INC)". 
Without that you'll a quite intuitive g++ msg:
"cannot specify -o with -c or -S and multiple
compilations"
:-/


The build choke later because of the new GEOS
interface


/bin/sh ../libtool --mode=compile g++ -Wall  -g
-DDEBUG  -Iogrsf_frmts -I. -I../port -I../gcore
-I../ogr -I../alg   -DHAVE_GEOS=1 -I/usr/local/include
-I../port   -c -o ogrgeometry.o ogrgeometry.cpp
 g++ -Wall -g -DDEBUG -Iogrsf_frmts -I. -I../port
-I../gcore -I../ogr -I../alg -DHAVE_GEOS=1
-I/usr/local/include -I../port -c ogrgeometry.cpp 
-fPIC -DPIC -o .libs/ogrgeometry.o
ogrgeometry.cpp: In member function `virtual
geos::Geometry* 
   OGRGeometry::exportToGEOS() const':
ogrgeometry.cpp:1249: error: no matching function for
call to `geos::WKTReader
   ::WKTReader()'
/usr/local/include/geos/io.h:111: error: candidates
are: 
   geos::WKTReader::WKTReader(const geos::WKTReader&)
/usr/local/include/geos/io.h:123: error:              
  
   geos::WKTReader::WKTReader(const
geos::GeometryFactory*)
make[1]: *** [ogrgeometry.o] Error 1
make[1]: Leaving directory
`/home/loup/dev/gis/gdal/ogr'
make: *** [ogr-target] Error 2

Also the #include "geos.h" is missing at the top of
this file
(ogrgeometry.cpp.)


Thanks,

Sylvain.
PS: GEOS interface was/is changing 
(today CVS give a version of 2.0.0)

[warmerdam]

s duclos wrote:

> Hi,
>
> Here a simple fix to gdal/ogr/GNUmakefile

...

>
> Sylvain.
> PS: GEOS interface was/is changing (today CVS give a version of 2.0.0)


Sylvain,

I see the geos.refractions.net web site is still just showing the 1.0.0
release.  I think it might be prudent to wait for 2.0.0 to be officially
issued and then correct against that.  I did the development against an
interim CVS version which had, amoung other things, some issues with the
geos-config script.

Thanks for your feedback!

Frank

[warmerdam]

2.0.0 has now been released, and I the same issues arise.  I have applied
patches to:
 o Fixed the include file path. 
 o Support creation and maintenance of a geos::GeometryFactory now required
   for the WKTReader. 

I didn't run into the geos.h include file issue you mention.  

All changes now in CVS. Please let me know if issues remain.