Permalink
Browse files

Removed SDERASTER stuff in configure and Makefile (bug 1560)

git-svn-id: http://svn.osgeo.org/mapserver/trunk@5044 7532c77e-422f-0410-93f4-f0b67bdd69e2
  • Loading branch information...
1 parent d091e77 commit 3d0a860d6d9d3bace3b29eae405744665a016fa2 @dmorissette dmorissette committed Dec 8, 2005
Showing with 2 additions and 66 deletions.
  1. +1 −1 HISTORY.TXT
  2. +0 −1 Makefile.in
  3. +0 −2 README.CONFIGURE
  4. +1 −36 configure
  5. +0 −26 configure.in
View
@@ -20,7 +20,7 @@ CVS HEAD
as I know, I'm the only one to ever get it to work, it hasn't kept up with
the connection pooling stuff we did, and its utility is quite limited in
comparison to regular gdal-based raster support (projections,
- resampling, etc) (HB).
+ resampling, etc) (HB - bug 1560).
- SDE: Put msSDELayerGetRowIDColumn at the top of mapsde.c so things
would compile correctly. This function is not included (or necessary)
View
@@ -98,7 +98,6 @@ EPPL_OBJ= @EPPL_OBJ@
# on your system someplace. The actual SDE server you wish to connect to can
# be elsewhere.
SDE= @SDE_ENABLED@
-SDERASTER= @SDERASTER_ENABLED@
SDE_LIB= @SDE_LIB@
SDE_INC= @SDE_INC@
View
@@ -62,7 +62,6 @@ Here is the list of available options as returned by "./configure --help":
--with-threads[=linkopt]Include thread safe support
--with-sde[=DIR] Include ESRI SDE support (DIR is SDE's install dir).
--with-sde-version[=VERSION NUMBER] Set ESRI SDE version number (Default is 80).
- --with-sderaster Include experimental ESRI SDE raster support.
--with-mpatrol[=DIR] Include MPATROL support (DIR is MPATROL's install dir).
--with-geos=PATH Include GEOS support (PATH is path to geos-config)
--with-ogr[=PATH] Include OGR support (PATH is path to gdal-config).
@@ -221,7 +220,6 @@ ESRI SDE Support:
--with-sde[=DIR] Include ESRI SDE support (DIR is SDE's install dir).
--with-sde-version[=VERSION NUMBER] Set ESRI SDE version number (Default is 80).
- --with-sderaster Include experimental ESRI SDE raster support.
ESRI SDE support is optional, and is not included by default.
View
@@ -272,7 +272,7 @@ PACKAGE_STRING=
PACKAGE_BUGREPORT=
ac_unique_file="Makefile.in"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX RANLIB ac_ct_RANLIB LEX LEXLIB LEX_OUTPUT_ROOT YACC XTRALIBS CPP EGREP C_PIC STRINGS MS_VERSION FT_BIN ZLIB_ENABLED ZLIB_INC ZLIB_LIB JPEG_ENABLED JPEG_INC JPEG_LIB ICONV_ENABLED ICONV_INC ICONV_LIB GD_DEF GD_INC GD_LIB GD_STATIC MAKE_GD MAKE_GD_CLEAN PDF_ENABLED PDF_INC PDF_LIB EPPL_ENABLED EPPL_OBJ PROJ_ENABLED PROJ_INC PROJ_LIB THREAD_FLAG THREAD_LIB SDE_ENABLED SDE_INC SDE_LIB SDERASTER_ENABLED MPATROL_ENABLED MPATROL_INC MPATROL_LIB GEOS_CONFIG GEOS_ENABLED GEOS_INC GEOS_LIB GDAL_CONFIG GDAL_ENABLED OGR_ENABLED GDAL_INC GDAL_LIB TIFF_ENABLED TIFF_INC TIFF_LIB PG_CONFIG POSTGIS_ENABLED POSTGIS_INC POSTGIS_LIB MY_CONFIG MYGIS_ENABLED MYGIS_INC MYGIS_LIB ORACLESPATIAL_ENABLED ORACLESPATIAL_INC ORACLESPATIAL_LIB MING_ENABLED MING_INC MING_LIB WMS_SVR_ENABLED WFS_SVR_ENABLED WCS_SVR_ENABLED LIBCURL_CONFIG WMS_LYR_ENABLED WFS_LYR_ENABLED CURL_INC CURL_LIB FASTCGI_ENABLED FASTCGI_INC FASTCGI_LIB HTTPD MS_INC MS_LIB IGNORE_MISSING_DATA USE_POINT_Z_M DEBUG_FLAGS LD_SHARED SO_EXT PHP_VERSION_FLAG PHP_SRC_DIR PHP_CC PHP_LD PHP_REGEX_INC PHP_REGEX_OBJ USE_PHP_REGEX MAKE_PHPMS MAKE_PHPMS_CLEAN APACHE_INC ALL_ENABLED ALL_INC ALL_LIB ALL_STATIC_LIB RPATHS LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX RANLIB ac_ct_RANLIB LEX LEXLIB LEX_OUTPUT_ROOT YACC XTRALIBS CPP EGREP C_PIC STRINGS MS_VERSION FT_BIN ZLIB_ENABLED ZLIB_INC ZLIB_LIB JPEG_ENABLED JPEG_INC JPEG_LIB ICONV_ENABLED ICONV_INC ICONV_LIB GD_DEF GD_INC GD_LIB GD_STATIC MAKE_GD MAKE_GD_CLEAN PDF_ENABLED PDF_INC PDF_LIB EPPL_ENABLED EPPL_OBJ PROJ_ENABLED PROJ_INC PROJ_LIB THREAD_FLAG THREAD_LIB SDE_ENABLED SDE_INC SDE_LIB MPATROL_ENABLED MPATROL_INC MPATROL_LIB GEOS_CONFIG GEOS_ENABLED GEOS_INC GEOS_LIB GDAL_CONFIG GDAL_ENABLED OGR_ENABLED GDAL_INC GDAL_LIB TIFF_ENABLED TIFF_INC TIFF_LIB PG_CONFIG POSTGIS_ENABLED POSTGIS_INC POSTGIS_LIB MY_CONFIG MYGIS_ENABLED MYGIS_INC MYGIS_LIB ORACLESPATIAL_ENABLED ORACLESPATIAL_INC ORACLESPATIAL_LIB MING_ENABLED MING_INC MING_LIB WMS_SVR_ENABLED WFS_SVR_ENABLED WCS_SVR_ENABLED LIBCURL_CONFIG WMS_LYR_ENABLED WFS_LYR_ENABLED CURL_INC CURL_LIB FASTCGI_ENABLED FASTCGI_INC FASTCGI_LIB HTTPD MS_INC MS_LIB IGNORE_MISSING_DATA USE_POINT_Z_M DEBUG_FLAGS LD_SHARED SO_EXT PHP_VERSION_FLAG PHP_SRC_DIR PHP_CC PHP_LD PHP_REGEX_INC PHP_REGEX_OBJ USE_PHP_REGEX MAKE_PHPMS MAKE_PHPMS_CLEAN APACHE_INC ALL_ENABLED ALL_INC ALL_LIB ALL_STATIC_LIB RPATHS LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -853,7 +853,6 @@ Optional Packages:
--with-threads=linkoptInclude thread safe support
--with-sde=DIR Include ESRI SDE support (DIR is SDE's install dir).
--with-sde-version=VERSION NUMBER Set ESRI SDE version number (Default is 80).
- --with-sderaster Include experimental ESRI SDE raster support.
--with-mpatrol=DIR Include MPATROL support (DIR is MPATROL's install dir).
--with-geos=PATH Include GEOS support (PATH is path to geos-config)
--with-ogr=PATH Include OGR support (PATH is path to gdal-config).
@@ -8483,39 +8482,6 @@ ALL_INC="$SDE_INC $ALL_INC"
ALL_LIB="$SDE_LIB $ALL_LIB"
-{ echo "$as_me:$LINENO: checking whether we should include SDE raster support..." >&5
-echo "$as_me: checking whether we should include SDE raster support..." >&6;}
-
-# Check whether --with-sderaster or --without-sderaster was given.
-if test "${with_sderaster+set}" = set; then
- withval="$with_sderaster"
-
-fi;
-
-if test "$with_sderaster" = "yes" ; then
-
- if test "$SDE_ENABLED" != "-DUSE_SDE" ; then
- { { echo "$as_me:$LINENO: error: --with-sderaster requested without SDE supported enabled." >&5
-echo "$as_me: error: --with-sderaster requested without SDE supported enabled." >&2;}
- { (exit 1); exit 1; }; }
- fi
-
- SDERASTER_ENABLED=-DUSE_SDERASTER
-
- echo "$as_me:$LINENO: result: including experimental SDE raster support." >&5
-echo "${ECHO_T} including experimental SDE raster support." >&6
-
-else
-
- echo "$as_me:$LINENO: result: not including experimental SDE raster support." >&5
-echo "${ECHO_T} not including experimental SDE raster support." >&6
-fi
-
-SDERASTER_ENABLED=$SDERASTER_ENABLED
-
-
-ALL_ENABLED="$SDERASTER_ENABLED $ALL_ENABLED"
-
{ echo "$as_me:$LINENO: checking whether we should compile in MPATROL support..." >&5
echo "$as_me: checking whether we should compile in MPATROL support..." >&6;}
@@ -11204,7 +11170,6 @@ s,@THREAD_LIB@,$THREAD_LIB,;t t
s,@SDE_ENABLED@,$SDE_ENABLED,;t t
s,@SDE_INC@,$SDE_INC,;t t
s,@SDE_LIB@,$SDE_LIB,;t t
-s,@SDERASTER_ENABLED@,$SDERASTER_ENABLED,;t t
s,@MPATROL_ENABLED@,$MPATROL_ENABLED,;t t
s,@MPATROL_INC@,$MPATROL_INC,;t t
s,@MPATROL_LIB@,$MPATROL_LIB,;t t
View
@@ -923,32 +923,6 @@ ALL_ENABLED="$SDE_ENABLED $ALL_ENABLED"
ALL_INC="$SDE_INC $ALL_INC"
ALL_LIB="$SDE_LIB $ALL_LIB"
-dnl ---------------------------------------------------------------------
-dnl Should we include ESRI SDE support?
-dnl ---------------------------------------------------------------------
-
-AC_CHECKING(whether we should include SDE raster support)
-AC_ARG_WITH(sderaster,
-[ --with-sderaster Include experimental ESRI SDE raster support.],,)
-
-if test "$with_sderaster" = "yes" ; then
-
- if test "$SDE_ENABLED" != "-DUSE_SDE" ; then
- AC_MSG_ERROR([--with-sderaster requested without SDE supported enabled.])
- fi
-
- SDERASTER_ENABLED=-DUSE_SDERASTER
-
- AC_MSG_RESULT([ including experimental SDE raster support.])
-
-else
-
- AC_MSG_RESULT([ not including experimental SDE raster support.])
-fi
-
-AC_SUBST(SDERASTER_ENABLED,$SDERASTER_ENABLED)
-
-ALL_ENABLED="$SDERASTER_ENABLED $ALL_ENABLED"
dnl ---------------------------------------------------------------------
dnl Use MPATROL ONLY IF REQUESTED.

0 comments on commit 3d0a860

Please sign in to comment.