#! /bin/sh /usr/share/dpatch/dpatch-run ## ogdi.dpatch by Francesco Paolo Lovergine ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: No description. @DPATCH@ diff -urNad gdal-1.4.1~/GDALmake.opt.in gdal-1.4.1/GDALmake.opt.in --- gdal-1.4.1~/GDALmake.opt.in 2007-04-24 12:46:08.000000000 +0200 +++ gdal-1.4.1/GDALmake.opt.in 2007-04-24 12:46:56.000000000 +0200 @@ -275,7 +275,7 @@ # PCRaster support PCRASTER_SETTING = @PCRASTER_SETTING@ -OGDI_INCLUDE = @OGDI_INCLUDE@ +OGDI_INCLUDE = -I/usr/include/ogdi PNG_SETTING = @PNG_SETTING@ JPEG_SETTING = @JPEG_SETTING@ diff -urNad gdal-1.4.1~/configure gdal-1.4.1/configure --- gdal-1.4.1~/configure 2007-04-24 12:45:54.000000000 +0200 +++ gdal-1.4.1/configure 2007-04-24 12:46:10.000000000 +0200 @@ -23968,7 +23968,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-logdi31 $LIBS" +LIBS="-logdi $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -24034,16 +24034,16 @@ if test "$HAVE_OGDI" = "yes" ; then - LIBS="-logdi31 $LIBS" + LIBS="-logdi $LIBS" fi else HAVE_OGDI=yes - LIBS="-L$with_ogdi -L$with_ogdi/lib -logdi31 $LIBS" - OGDI_INCLUDE="-I$with_ogdi -I$with_ogdi/include" + LIBS="-logdi $LIBS" + OGDI_INCLUDE="-I/usr/include/ogdi" - echo "using libogdi31 from $with_ogdi." + echo "using libogdi from $with_ogdi." fi