[Gdal-dev] GDALmake.opt.in patch and explanation

[Derrick J Brashear]

I need the following patch on MacOS in order to insure that gdal gets its
own headers and not headers from elsewhere on the system needed for
dependancies; I need to build with external tiff/geotiff in order that
linker reordering not give me problems with mismatched interfaces (Xastir
uses libtiff and libgeotiff directly, as well as using GDAL for vector
stuff, only, at the moment) and doing so causes conflicts this patch is
needed to correct.

--- GDALmake.opt.in.orig        Fri Mar 19 18:47:48 2004
+++ GDALmake.opt.in     Fri Mar 19 18:50:20 2004
@@ -79,8 +79,8 @@
 endif

 CPPFLAGS       = @CPPFLAGS@ -I$(GDAL_ROOT)/port
-CFLAGS         = @C_WFLAGS@ @C_PIC@ $(C_ODFLAGS) @EXTRA_INCLUDES@ $(USER_DEFS)
-CXXFLAGS       = @CXX_WFLAGS@ @CXX_PIC@ $(CXX_ODFLAGS) \
+CFLAGS         = @C_WFLAGS@ @C_PIC@ $(GDAL_INCLUDE) $(C_ODFLAGS) @EXTRA_INCLUDES@ $(USER_DEFS)
+CXXFLAGS       = @CXX_WFLAGS@ @CXX_PIC@ $(GDAL_INCLUDE) $(CXX_ODFLAGS) \
                  @EXTRA_INCLUDES@ $(USER_DEFS)

 RANLIB         =       @RANLIB@