remove --disable-offline-raster compile flag as by default the GUC postgis.gdal_enabl...

git-svn-id: http://svn.osgeo.org/postgis/trunk@12476 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/configure.ac b/configure.ac
index ae56eecf65245e9c33a1f8211b1ec5452b75a8a2..29bd70c74a7348bb7844d6d692b17ba38403b845 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1107,21 +1107,6 @@ if test "x$with_raster" != "xno"; then
 
                AC_SUBST([GDALFPOLYGONIZE])
 
-               dnl ===========================================================================
-               dnl Disable offline raster storage with --disable-offline-raster
-               dnl ===========================================================================
-               AC_ARG_ENABLE(
-                       [offline-rasters],
-                       AC_HELP_STRING([--disable-offline-rasters], [disable support for off-db rasters]),
-                       [POSTGIS_RASTER_DISABLE_OFFLINE=1],
-                       [POSTGIS_RASTER_DISABLE_OFFLINE=0])
-               if test "x$POSTGIS_RASTER_DISABLE_OFFLINE" = "x1"; then
-                       AC_DEFINE_UNQUOTED(
-                               [POSTGIS_RASTER_DISABLE_OFFLINE],
-                               [$POSTGIS_RASTER_DISABLE_OFFLINE],
-                               [Define to disable support for offline rasters])
-               fi
-
        else
                AC_MSG_RESULT([not found])
                AC_MSG_ERROR([gdal-config not found. Use --without-raster or try --with-gdalconfig=<path to gdal-config>])

diff --git a/raster/raster_config.h.in b/raster/raster_config.h.in
index d2c41eb5bd72efa41eea2b7831cc60e65f764ec0..a4bfdf1c4ee534ea80fb0dc82ce5bc083cfb2ca2 100644 (file)
--- a/raster/raster_config.h.in
+++ b/raster/raster_config.h.in
@@ -32,6 +32,3 @@
 
 /* Define to 1 if a warning is outputted every time a double is truncated */
 #undef POSTGIS_RASTER_WARN_ON_TRUNCATION
-
-/* Define to disable support for offline rasters */
-#undef POSTGIS_RASTER_DISABLE_OFFLINE

diff --git a/raster/rt_core/rt_band.c b/raster/rt_core/rt_band.c
index a2fd81c2d5687a5aa41b52bd171ed6d0c587f899..1e714b0321790e511c2610476bf2ed39834e5c26 100644 (file)
--- a/raster/rt_core/rt_band.c
+++ b/raster/rt_core/rt_band.c
@@ -352,13 +352,6 @@ rt_band_load_offline_data(rt_band band) {
                return ES_ERROR;
        }
 
-#ifdef POSTGIS_RASTER_DISABLE_OFFLINE
-       rterror("rt_raster_load_offline_data: "
-               "offline raster support disabled at compile-time");
-       return ES_ERROR;
-#endif
-
-
        rt_util_gdal_register_all(0);
        /*
        hdsSrc = GDALOpenShared(band->data.offline.path, GA_ReadOnly);