From: Bborie Park <bkpark at ucdavis.edu>
Date: Sun, 13 Apr 2014 03:14:14 +0000 (+0000)
Subject: remove --disable-offline-raster compile flag as by default the GUC postgis.gdal_enabl... 
X-Git-Tag: 2.2.0rc1~1128
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=98a3040c2d2fd7e9673dde720423c8ac3e650584;p=postgis

remove --disable-offline-raster compile flag as by default the GUC postgis.gdal_enabled_drivers is set to DISABLE_ALL

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

diff --git a/configure.ac b/configure.ac
index ae56eecf6..29bd70c74 100644
--- 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 d2c41eb5b..a4bfdf1c4 100644
--- 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 a2fd81c2d..1e714b032 100644
--- 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);