Clean postgis_config.h.in and related functions

Closes https://github.com/postgis/postgis/pull/412
Closes #4423

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

diff --git a/configure.ac b/configure.ac
index bc8dbca5ecc381184cfe60ecc1fc2d2e05b20b10..054b213823dd01e6f1db6ce82af9520892238d76 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1124,16 +1124,6 @@ AC_SUBST([POSTGIS_BUILD_DATE])
 AC_SUBST([POSTGIS_SCRIPTS_VERSION])
 
 
-dnl ===========================================================================
-dnl Other parameters
-dnl
-
-dnl Always enable BBOX caching by default
-AC_DEFINE_UNQUOTED([POSTGIS_AUTOCACHE_BBOX], [1], [Enable caching of bounding box within geometries])
-
-dnl Always enable use of ANALYZE statistics by default
-AC_DEFINE_UNQUOTED([POSTGIS_USE_STATS], [1], [Enable use of ANALYZE statistics])
-
 dnl ====================================
 dnl address standardizer stuff
 dnl ====================================

diff --git a/postgis/lwgeom_functions_basic.c b/postgis/lwgeom_functions_basic.c
index 3a0866ba8e42b424b38ff23de7ef4108820ce7c4..01536829e966723ba47d628814dcd5de4ac4ab99 100644 (file)
--- a/postgis/lwgeom_functions_basic.c
+++ b/postgis/lwgeom_functions_basic.c
@@ -44,8 +44,6 @@ Datum LWGEOM_summary(PG_FUNCTION_ARGS);
 Datum LWGEOM_npoints(PG_FUNCTION_ARGS);
 Datum LWGEOM_nrings(PG_FUNCTION_ARGS);
 Datum ST_Area(PG_FUNCTION_ARGS);
-Datum postgis_uses_stats(PG_FUNCTION_ARGS);
-Datum postgis_autocache_bbox(PG_FUNCTION_ARGS);
 Datum postgis_scripts_released(PG_FUNCTION_ARGS);
 Datum postgis_version(PG_FUNCTION_ARGS);
 Datum postgis_liblwgeom_version(PG_FUNCTION_ARGS);
@@ -207,22 +205,6 @@ Datum postgis_scripts_released(PG_FUNCTION_ARGS)
        PG_RETURN_TEXT_P(result);
 }
 
-PG_FUNCTION_INFO_V1(postgis_uses_stats);
-Datum postgis_uses_stats(PG_FUNCTION_ARGS)
-{
-       PG_RETURN_BOOL(true);
-}
-
-PG_FUNCTION_INFO_V1(postgis_autocache_bbox);
-Datum postgis_autocache_bbox(PG_FUNCTION_ARGS)
-{
-#ifdef POSTGIS_AUTOCACHE_BBOX
-       PG_RETURN_BOOL(true);
-#else
-       PG_RETURN_BOOL(false);
-#endif
-}
-
 PG_FUNCTION_INFO_V1(postgis_libxml_version);
 Datum postgis_libxml_version(PG_FUNCTION_ARGS)
 {

diff --git a/postgis/postgis_legacy.c b/postgis/postgis_legacy.c
index d5cc9ef567703e5b19651cfe4c9f13bec5745bac..cb3b0017f185d46ca8a2da39bbee07c690002ea1 100644 (file)
--- a/postgis/postgis_legacy.c
+++ b/postgis/postgis_legacy.c
@@ -75,3 +75,5 @@ POSTGIS_DEPRECATE("3.0.0", sfcgal_distance3d);
 POSTGIS_DEPRECATE("3.0.0", LWGEOM_mindistance3d);
 POSTGIS_DEPRECATE("3.0.0", intersects);
 POSTGIS_DEPRECATE("3.0.0", pgis_geometry_accum_finalfn);
+POSTGIS_DEPRECATE("3.0.0", postgis_autocache_bbox);
+POSTGIS_DEPRECATE("2.0.0", postgis_uses_stats);

diff --git a/postgis_config.h.in b/postgis_config.h.in
index d904731850065353697e2ab7a914c7e35d8687e0..9cad6c8552fb0a3793ac781dbe29caf366253cfa 100644 (file)
--- a/postgis_config.h.in
+++ b/postgis_config.h.in
@@ -14,26 +14,8 @@
    language is requested. */
 #undef ENABLE_NLS
 
-/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
-   CoreFoundation framework. */
-#undef HAVE_CFLOCALECOPYCURRENT
-
-/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in
-   the CoreFoundation framework. */
-#undef HAVE_CFPREFERENCESCOPYAPPVALUE
-
-/* Define if the GNU dcgettext() function is already present or preinstalled.
-   */
-#undef HAVE_DCGETTEXT
-
 /* Define for some functions we are interested in */
-#undef HAVE_VASPRINTF
-#undef HAVE_ASPRINTF
 #undef HAVE_FSEEKO
-#undef HAVE_STRCASESTR
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
 
 /* Define if the GNU gettext() function is already present or preinstalled. */
 #undef HAVE_GETTEXT
@@ -47,9 +29,6 @@
 /* ieeefp.h header */
 #undef HAVE_IEEEFP_H
 
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
 /* Define to 1 if you have the `geos_c' library (-lgeos_c). */
 #undef HAVE_LIBGEOS_C
 
@@ -86,27 +65,6 @@
 /* Define to 1 if you have the <libxml/xpath.h> header file. */
 #undef HAVE_LIBXML_XPATH_H
 
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
@@ -116,16 +74,12 @@
 /* Define to 1 if sfcgal is being built */
 #undef HAVE_SFCGAL
 
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
+/* Define to the sub-directory in which libtool stores uninstalled libraries. */
 #undef LT_OBJDIR
 
 /* Location of PostgreSQL locale directory */
 #undef PGSQL_LOCALEDIR
 
-/* Enable caching of bounding box within geometries */
-#undef POSTGIS_AUTOCACHE_BBOX
-
 /* PostGIS build date */
 #undef POSTGIS_BUILD_DATE
 
@@ -159,9 +113,6 @@
 /* PROJ library version */
 #undef POSTGIS_PROJ_VERSION
 
-/* PROJ 6: Flag to use the old API */
-#undef ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
-
 /* PostGIS Raster build date */
 #undef POSTGIS_RASTER_BUILD_DATE
 
@@ -189,15 +140,10 @@
 /* PostGIS scripts version */
 #undef POSTGIS_SCRIPTS_VERSION
 
-/* Enable use of ANALYZE statistics */
-#undef POSTGIS_USE_STATS
 
 /* PostGIS version */
 #undef POSTGIS_VERSION
 
-/* Define command to determine the current directory during regression */
-#undef PWDREGRESS
-
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS