Index: test/Makefile.am
==================================================================
--- test/Makefile.am
+++ test/Makefile.am
@@ -1,86 +1,61 @@
 AM_CPPFLAGS = @CFLAGS@ @GEOS_CFLAGS@ @LIBXML2_CFLAGS@
 
 check_PROGRAMS = check_endian \
 		check_version \
 		check_init \
-		check_init2 \
 		check_init_full \
 		check_geom_aux \
-		check_geometry_cols \
 		check_tempgeom \
 		check_create \
 		check_bufovflw \
 		check_fdo1 \
 		check_fdo2 \
 		check_fdo3 \
 		check_fdo_bufovflw \
-		check_md5 \
 		check_dbf_load \
 		check_shp_load \
-		check_shp_load_3d \
 		shape_cp1252 \
 		shape_primitives \
-		shape_utf8_1 \
-		shape_utf8_1ex \
 		shape_utf8_2 \
 		shape_3d \
-		check_clone_table \
 		check_xls_load \
 		check_math_funcs \
 		check_gaia_util \
 		check_gaia_utf8 \
 		check_extension \
-		check_recover_geom \
-		check_sql_stmt \
-		check_sql_stmt_tiny \
-		check_sql_stmt_legacy \
-		check_sql_stmt_extension \
 		check_multithread \
 		check_virtualtable1 \
-		check_virtualtable2 \
 		check_virtualtable3 \
 		check_virtualtable4 \
 		check_virtualtable5 \
 		check_virtualtable6 \
-		check_virtual_ovflw \
-		check_mbrcache \
 		check_spatialindex \
 		check_exif \
 		check_exif2 \
 		check_relations_fncts \
 		check_extra_relations_fncts \
 		check_geoscvt_fncts \
-		check_libxml2 \
 		check_styling \
 		check_map_config \
 		check_virtualxpath \
 		check_virtualbbox \
-		check_wfsin \
-		check_dxf \
 		check_metacatalog \
-		check_virtualelem \
-		check_srid_fncts \
 		check_control_points \
-		check_cutter \
 		check_topology2d \
 		check_topology3d \
 		check_toponoface2d \
 		check_topoplus \
 		check_toposnap \
 		check_network2d \
 		check_network3d \
 		check_network_log \
-		check_virtualknn2 \
 		check_sequence \
-		check_stored_proc \
 		check_wms \
-		check_drop_rename \
 		routing_test \
 		geojson_test \
-		check_zipshp \
-		check_multiple_points
+		check_zipshp
 		
 if ENABLE_GEOPACKAGE
 check_PROGRAMS += \
 		check_createBaseTables \
 		check_gpkgCreateTilesTable \

Index: test/Makefile.in
==================================================================
--- test/Makefile.in
+++ test/Makefile.in
@@ -86,49 +86,43 @@
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 check_PROGRAMS = check_endian$(EXEEXT) check_version$(EXEEXT) \
-	check_init$(EXEEXT) check_init2$(EXEEXT) \
+	check_init$(EXEEXT) \
 	check_init_full$(EXEEXT) check_geom_aux$(EXEEXT) \
-	check_geometry_cols$(EXEEXT) check_tempgeom$(EXEEXT) \
-	check_create$(EXEEXT) check_bufovflw$(EXEEXT) \
+	check_tempgeom$(EXEEXT) \
+	check_create$(EXEEXT) \
 	check_fdo1$(EXEEXT) check_fdo2$(EXEEXT) check_fdo3$(EXEEXT) \
-	check_fdo_bufovflw$(EXEEXT) check_md5$(EXEEXT) \
+	check_fdo_bufovflw$(EXEEXT) \
 	check_dbf_load$(EXEEXT) check_shp_load$(EXEEXT) \
-	check_shp_load_3d$(EXEEXT) shape_cp1252$(EXEEXT) \
-	shape_primitives$(EXEEXT) shape_utf8_1$(EXEEXT) \
-	shape_utf8_1ex$(EXEEXT) shape_utf8_2$(EXEEXT) \
-	shape_3d$(EXEEXT) check_clone_table$(EXEEXT) \
+	shape_cp1252$(EXEEXT) \
+	shape_primitives$(EXEEXT) shape_utf8_2$(EXEEXT) \
+	shape_3d$(EXEEXT) \
 	check_xls_load$(EXEEXT) check_math_funcs$(EXEEXT) \
 	check_gaia_util$(EXEEXT) check_gaia_utf8$(EXEEXT) \
-	check_extension$(EXEEXT) check_recover_geom$(EXEEXT) \
-	check_sql_stmt$(EXEEXT) check_sql_stmt_tiny$(EXEEXT) \
-	check_sql_stmt_legacy$(EXEEXT) \
-	check_sql_stmt_extension$(EXEEXT) check_multithread$(EXEEXT) \
-	check_virtualtable1$(EXEEXT) check_virtualtable2$(EXEEXT) \
+	check_extension$(EXEEXT) \
+	check_multithread$(EXEEXT) \
+	check_virtualtable1$(EXEEXT) \
 	check_virtualtable3$(EXEEXT) check_virtualtable4$(EXEEXT) \
 	check_virtualtable5$(EXEEXT) check_virtualtable6$(EXEEXT) \
-	check_virtual_ovflw$(EXEEXT) check_mbrcache$(EXEEXT) \
 	check_spatialindex$(EXEEXT) check_exif$(EXEEXT) \
 	check_exif2$(EXEEXT) check_relations_fncts$(EXEEXT) \
 	check_extra_relations_fncts$(EXEEXT) \
-	check_geoscvt_fncts$(EXEEXT) check_libxml2$(EXEEXT) \
+	check_geoscvt_fncts$(EXEEXT) \
 	check_styling$(EXEEXT) check_map_config$(EXEEXT) \
 	check_virtualxpath$(EXEEXT) check_virtualbbox$(EXEEXT) \
-	check_wfsin$(EXEEXT) check_dxf$(EXEEXT) \
-	check_metacatalog$(EXEEXT) check_virtualelem$(EXEEXT) \
-	check_srid_fncts$(EXEEXT) check_control_points$(EXEEXT) \
-	check_cutter$(EXEEXT) check_topology2d$(EXEEXT) \
+	check_metacatalog$(EXEEXT) \
+	check_control_points$(EXEEXT) \
+	check_topology2d$(EXEEXT) \
 	check_topology3d$(EXEEXT) check_toponoface2d$(EXEEXT) \
 	check_topoplus$(EXEEXT) check_toposnap$(EXEEXT) \
 	check_network2d$(EXEEXT) check_network3d$(EXEEXT) \
-	check_network_log$(EXEEXT) check_virtualknn2$(EXEEXT) \
-	check_sequence$(EXEEXT) check_stored_proc$(EXEEXT) \
-	check_wms$(EXEEXT) check_drop_rename$(EXEEXT) \
+	check_network_log$(EXEEXT) \
+	check_sequence$(EXEEXT) \
+	check_wms$(EXEEXT) \
 	routing_test$(EXEEXT) geojson_test$(EXEEXT) \
-	check_zipshp$(EXEEXT) check_multiple_points$(EXEEXT) \
 	$(am__EXEEXT_1)
 @ENABLE_GEOPACKAGE_TRUE@am__append_1 = \
 @ENABLE_GEOPACKAGE_TRUE@		check_createBaseTables \
 @ENABLE_GEOPACKAGE_TRUE@		check_gpkgCreateTilesTable \
 @ENABLE_GEOPACKAGE_TRUE@		check_gpkgCreateTilesTableMissingSRID \
@@ -215,37 +209,22 @@
 check_add_tile_triggers_bad_table_name_SOURCES =  \
 	check_add_tile_triggers_bad_table_name.c
 check_add_tile_triggers_bad_table_name_OBJECTS =  \
 	check_add_tile_triggers_bad_table_name.$(OBJEXT)
 check_add_tile_triggers_bad_table_name_LDADD = $(LDADD)
-check_bufovflw_SOURCES = check_bufovflw.c
-check_bufovflw_OBJECTS = check_bufovflw.$(OBJEXT)
-check_bufovflw_LDADD = $(LDADD)
-check_clone_table_SOURCES = check_clone_table.c
-check_clone_table_OBJECTS = check_clone_table.$(OBJEXT)
-check_clone_table_LDADD = $(LDADD)
 check_control_points_SOURCES = check_control_points.c
 check_control_points_OBJECTS = check_control_points.$(OBJEXT)
 check_control_points_LDADD = $(LDADD)
 check_create_SOURCES = check_create.c
 check_create_OBJECTS = check_create.$(OBJEXT)
 check_create_LDADD = $(LDADD)
 check_createBaseTables_SOURCES = check_createBaseTables.c
 check_createBaseTables_OBJECTS = check_createBaseTables.$(OBJEXT)
 check_createBaseTables_LDADD = $(LDADD)
-check_cutter_SOURCES = check_cutter.c
-check_cutter_OBJECTS = check_cutter.$(OBJEXT)
-check_cutter_LDADD = $(LDADD)
 check_dbf_load_SOURCES = check_dbf_load.c
 check_dbf_load_OBJECTS = check_dbf_load.$(OBJEXT)
 check_dbf_load_LDADD = $(LDADD)
-check_drop_rename_SOURCES = check_drop_rename.c
-check_drop_rename_OBJECTS = check_drop_rename.$(OBJEXT)
-check_drop_rename_LDADD = $(LDADD)
-check_dxf_SOURCES = check_dxf.c
-check_dxf_OBJECTS = check_dxf.$(OBJEXT)
-check_dxf_LDADD = $(LDADD)
 check_endian_SOURCES = check_endian.c
 check_endian_OBJECTS = check_endian.$(OBJEXT)
 check_endian_LDADD = $(LDADD)
 check_exif_SOURCES = check_exif.c
 check_exif_OBJECTS = check_exif.$(OBJEXT)
@@ -279,13 +258,10 @@
 check_gaia_util_OBJECTS = check_gaia_util.$(OBJEXT)
 check_gaia_util_LDADD = $(LDADD)
 check_geom_aux_SOURCES = check_geom_aux.c
 check_geom_aux_OBJECTS = check_geom_aux.$(OBJEXT)
 check_geom_aux_LDADD = $(LDADD)
-check_geometry_cols_SOURCES = check_geometry_cols.c
-check_geometry_cols_OBJECTS = check_geometry_cols.$(OBJEXT)
-check_geometry_cols_LDADD = $(LDADD)
 check_geoscvt_fncts_SOURCES = check_geoscvt_fncts.c
 check_geoscvt_fncts_OBJECTS = check_geoscvt_fncts.$(OBJEXT)
 check_geoscvt_fncts_LDADD = $(LDADD)
 check_get_normal_row_SOURCES = check_get_normal_row.c
 check_get_normal_row_OBJECTS = check_get_normal_row.$(OBJEXT)
@@ -400,37 +376,22 @@
 check_gpkg_opt_extension_mechanism_extensions_data_table_def_LDADD =  \
 	$(LDADD)
 check_init_SOURCES = check_init.c
 check_init_OBJECTS = check_init.$(OBJEXT)
 check_init_LDADD = $(LDADD)
-check_init2_SOURCES = check_init2.c
-check_init2_OBJECTS = check_init2.$(OBJEXT)
-check_init2_LDADD = $(LDADD)
 check_init_full_SOURCES = check_init_full.c
 check_init_full_OBJECTS = check_init_full.$(OBJEXT)
 check_init_full_LDADD = $(LDADD)
-check_libxml2_SOURCES = check_libxml2.c
-check_libxml2_OBJECTS = check_libxml2.$(OBJEXT)
-check_libxml2_LDADD = $(LDADD)
 check_map_config_SOURCES = check_map_config.c
 check_map_config_OBJECTS = check_map_config.$(OBJEXT)
 check_map_config_LDADD = $(LDADD)
 check_math_funcs_SOURCES = check_math_funcs.c
 check_math_funcs_OBJECTS = check_math_funcs.$(OBJEXT)
 check_math_funcs_LDADD = $(LDADD)
-check_mbrcache_SOURCES = check_mbrcache.c
-check_mbrcache_OBJECTS = check_mbrcache.$(OBJEXT)
-check_mbrcache_LDADD = $(LDADD)
-check_md5_SOURCES = check_md5.c
-check_md5_OBJECTS = check_md5.$(OBJEXT)
-check_md5_LDADD = $(LDADD)
 check_metacatalog_SOURCES = check_metacatalog.c
 check_metacatalog_OBJECTS = check_metacatalog.$(OBJEXT)
 check_metacatalog_LDADD = $(LDADD)
-check_multiple_points_SOURCES = check_multiple_points.c
-check_multiple_points_OBJECTS = check_multiple_points.$(OBJEXT)
-check_multiple_points_LDADD = $(LDADD)
 check_multithread_SOURCES = check_multithread.c
 check_multithread_OBJECTS = check_multithread.$(OBJEXT)
 check_multithread_LDADD = $(LDADD)
 check_network2d_SOURCES = check_network2d.c
 check_network2d_OBJECTS = check_network2d.$(OBJEXT)
@@ -439,46 +400,22 @@
 check_network3d_OBJECTS = check_network3d.$(OBJEXT)
 check_network3d_LDADD = $(LDADD)
 check_network_log_SOURCES = check_network_log.c
 check_network_log_OBJECTS = check_network_log.$(OBJEXT)
 check_network_log_LDADD = $(LDADD)
-check_recover_geom_SOURCES = check_recover_geom.c
-check_recover_geom_OBJECTS = check_recover_geom.$(OBJEXT)
-check_recover_geom_LDADD = $(LDADD)
 check_relations_fncts_SOURCES = check_relations_fncts.c
 check_relations_fncts_OBJECTS = check_relations_fncts.$(OBJEXT)
 check_relations_fncts_LDADD = $(LDADD)
 check_sequence_SOURCES = check_sequence.c
 check_sequence_OBJECTS = check_sequence.$(OBJEXT)
 check_sequence_LDADD = $(LDADD)
 check_shp_load_SOURCES = check_shp_load.c
 check_shp_load_OBJECTS = check_shp_load.$(OBJEXT)
 check_shp_load_LDADD = $(LDADD)
-check_shp_load_3d_SOURCES = check_shp_load_3d.c
-check_shp_load_3d_OBJECTS = check_shp_load_3d.$(OBJEXT)
-check_shp_load_3d_LDADD = $(LDADD)
 check_spatialindex_SOURCES = check_spatialindex.c
 check_spatialindex_OBJECTS = check_spatialindex.$(OBJEXT)
 check_spatialindex_LDADD = $(LDADD)
-check_sql_stmt_SOURCES = check_sql_stmt.c
-check_sql_stmt_OBJECTS = check_sql_stmt.$(OBJEXT)
-check_sql_stmt_LDADD = $(LDADD)
-check_sql_stmt_extension_SOURCES = check_sql_stmt_extension.c
-check_sql_stmt_extension_OBJECTS = check_sql_stmt_extension.$(OBJEXT)
-check_sql_stmt_extension_LDADD = $(LDADD)
-check_sql_stmt_legacy_SOURCES = check_sql_stmt_legacy.c
-check_sql_stmt_legacy_OBJECTS = check_sql_stmt_legacy.$(OBJEXT)
-check_sql_stmt_legacy_LDADD = $(LDADD)
-check_sql_stmt_tiny_SOURCES = check_sql_stmt_tiny.c
-check_sql_stmt_tiny_OBJECTS = check_sql_stmt_tiny.$(OBJEXT)
-check_sql_stmt_tiny_LDADD = $(LDADD)
-check_srid_fncts_SOURCES = check_srid_fncts.c
-check_srid_fncts_OBJECTS = check_srid_fncts.$(OBJEXT)
-check_srid_fncts_LDADD = $(LDADD)
-check_stored_proc_SOURCES = check_stored_proc.c
-check_stored_proc_OBJECTS = check_stored_proc.$(OBJEXT)
-check_stored_proc_LDADD = $(LDADD)
 check_styling_SOURCES = check_styling.c
 check_styling_OBJECTS = check_styling.$(OBJEXT)
 check_styling_LDADD = $(LDADD)
 check_tempgeom_SOURCES = check_tempgeom.c
 check_tempgeom_OBJECTS = check_tempgeom.$(OBJEXT)
@@ -499,28 +436,16 @@
 check_toposnap_OBJECTS = check_toposnap.$(OBJEXT)
 check_toposnap_LDADD = $(LDADD)
 check_version_SOURCES = check_version.c
 check_version_OBJECTS = check_version.$(OBJEXT)
 check_version_LDADD = $(LDADD)
-check_virtual_ovflw_SOURCES = check_virtual_ovflw.c
-check_virtual_ovflw_OBJECTS = check_virtual_ovflw.$(OBJEXT)
-check_virtual_ovflw_LDADD = $(LDADD)
 check_virtualbbox_SOURCES = check_virtualbbox.c
 check_virtualbbox_OBJECTS = check_virtualbbox.$(OBJEXT)
 check_virtualbbox_LDADD = $(LDADD)
-check_virtualelem_SOURCES = check_virtualelem.c
-check_virtualelem_OBJECTS = check_virtualelem.$(OBJEXT)
-check_virtualelem_LDADD = $(LDADD)
-check_virtualknn2_SOURCES = check_virtualknn2.c
-check_virtualknn2_OBJECTS = check_virtualknn2.$(OBJEXT)
-check_virtualknn2_LDADD = $(LDADD)
 check_virtualtable1_SOURCES = check_virtualtable1.c
 check_virtualtable1_OBJECTS = check_virtualtable1.$(OBJEXT)
 check_virtualtable1_LDADD = $(LDADD)
-check_virtualtable2_SOURCES = check_virtualtable2.c
-check_virtualtable2_OBJECTS = check_virtualtable2.$(OBJEXT)
-check_virtualtable2_LDADD = $(LDADD)
 check_virtualtable3_SOURCES = check_virtualtable3.c
 check_virtualtable3_OBJECTS = check_virtualtable3.$(OBJEXT)
 check_virtualtable3_LDADD = $(LDADD)
 check_virtualtable4_SOURCES = check_virtualtable4.c
 check_virtualtable4_OBJECTS = check_virtualtable4.$(OBJEXT)
@@ -532,22 +457,16 @@
 check_virtualtable6_OBJECTS = check_virtualtable6.$(OBJEXT)
 check_virtualtable6_LDADD = $(LDADD)
 check_virtualxpath_SOURCES = check_virtualxpath.c
 check_virtualxpath_OBJECTS = check_virtualxpath.$(OBJEXT)
 check_virtualxpath_LDADD = $(LDADD)
-check_wfsin_SOURCES = check_wfsin.c
-check_wfsin_OBJECTS = check_wfsin.$(OBJEXT)
-check_wfsin_LDADD = $(LDADD)
 check_wms_SOURCES = check_wms.c
 check_wms_OBJECTS = check_wms.$(OBJEXT)
 check_wms_LDADD = $(LDADD)
 check_xls_load_SOURCES = check_xls_load.c
 check_xls_load_OBJECTS = check_xls_load.$(OBJEXT)
 check_xls_load_LDADD = $(LDADD)
-check_zipshp_SOURCES = check_zipshp.c
-check_zipshp_OBJECTS = check_zipshp.$(OBJEXT)
-check_zipshp_LDADD = $(LDADD)
 geojson_test_SOURCES = geojson_test.c
 geojson_test_OBJECTS = geojson_test.$(OBJEXT)
 geojson_test_LDADD = $(LDADD)
 routing_test_SOURCES = routing_test.c
 routing_test_OBJECTS = routing_test.$(OBJEXT)
@@ -559,16 +478,10 @@
 shape_cp1252_OBJECTS = shape_cp1252.$(OBJEXT)
 shape_cp1252_LDADD = $(LDADD)
 shape_primitives_SOURCES = shape_primitives.c
 shape_primitives_OBJECTS = shape_primitives.$(OBJEXT)
 shape_primitives_LDADD = $(LDADD)
-shape_utf8_1_SOURCES = shape_utf8_1.c
-shape_utf8_1_OBJECTS = shape_utf8_1.$(OBJEXT)
-shape_utf8_1_LDADD = $(LDADD)
-shape_utf8_1ex_SOURCES = shape_utf8_1ex.c
-shape_utf8_1ex_OBJECTS = shape_utf8_1ex.$(OBJEXT)
-shape_utf8_1ex_LDADD = $(LDADD)
 shape_utf8_2_SOURCES = shape_utf8_2.c
 shape_utf8_2_OBJECTS = shape_utf8_2.$(OBJEXT)
 shape_utf8_2_LDADD = $(LDADD)
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -585,24 +498,21 @@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/. -I$(top_builddir)/./src/headers/spatialite
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__maybe_remake_depfiles = depfiles
 am__depfiles_remade = ./$(DEPDIR)/check_add_tile_triggers.Po \
 	./$(DEPDIR)/check_add_tile_triggers_bad_table_name.Po \
-	./$(DEPDIR)/check_bufovflw.Po ./$(DEPDIR)/check_clone_table.Po \
 	./$(DEPDIR)/check_control_points.Po \
 	./$(DEPDIR)/check_create.Po \
 	./$(DEPDIR)/check_createBaseTables.Po \
-	./$(DEPDIR)/check_cutter.Po ./$(DEPDIR)/check_dbf_load.Po \
-	./$(DEPDIR)/check_drop_rename.Po ./$(DEPDIR)/check_dxf.Po \
+	./$(DEPDIR)/check_dbf_load.Po \
 	./$(DEPDIR)/check_endian.Po ./$(DEPDIR)/check_exif.Po \
 	./$(DEPDIR)/check_exif2.Po ./$(DEPDIR)/check_extension.Po \
 	./$(DEPDIR)/check_extra_relations_fncts.Po \
 	./$(DEPDIR)/check_fdo1.Po ./$(DEPDIR)/check_fdo2.Po \
 	./$(DEPDIR)/check_fdo3.Po ./$(DEPDIR)/check_fdo_bufovflw.Po \
 	./$(DEPDIR)/check_gaia_utf8.Po ./$(DEPDIR)/check_gaia_util.Po \
 	./$(DEPDIR)/check_geom_aux.Po \
-	./$(DEPDIR)/check_geometry_cols.Po \
 	./$(DEPDIR)/check_geoscvt_fncts.Po \
 	./$(DEPDIR)/check_get_normal_row.Po \
 	./$(DEPDIR)/check_get_normal_row_bad_geopackage.Po \
 	./$(DEPDIR)/check_get_normal_row_bad_geopackage2.Po \
 	./$(DEPDIR)/check_get_normal_zoom.Po \
@@ -625,51 +535,38 @@
 	./$(DEPDIR)/check_gpkg_base_core_container_data_file_format_application_id.Po \
 	./$(DEPDIR)/check_gpkg_base_core_contents_data_table_def.Po \
 	./$(DEPDIR)/check_gpkg_base_core_spatial_ref_sys_data_table_def.Po \
 	./$(DEPDIR)/check_gpkg_base_core_spatial_ref_sys_data_values_default.Po \
 	./$(DEPDIR)/check_gpkg_opt_extension_mechanism_extensions_data_table_def.Po \
-	./$(DEPDIR)/check_init.Po ./$(DEPDIR)/check_init2.Po \
-	./$(DEPDIR)/check_init_full.Po ./$(DEPDIR)/check_libxml2.Po \
+	./$(DEPDIR)/check_init.Po \
+	./$(DEPDIR)/check_init_full.Po \
 	./$(DEPDIR)/check_map_config.Po \
-	./$(DEPDIR)/check_math_funcs.Po ./$(DEPDIR)/check_mbrcache.Po \
-	./$(DEPDIR)/check_md5.Po ./$(DEPDIR)/check_metacatalog.Po \
-	./$(DEPDIR)/check_multiple_points.Po \
+	./$(DEPDIR)/check_math_funcs.Po \
+	./$(DEPDIR)/check_metacatalog.Po \
 	./$(DEPDIR)/check_multithread.Po \
 	./$(DEPDIR)/check_network2d.Po ./$(DEPDIR)/check_network3d.Po \
 	./$(DEPDIR)/check_network_log.Po \
-	./$(DEPDIR)/check_recover_geom.Po \
 	./$(DEPDIR)/check_relations_fncts.Po \
 	./$(DEPDIR)/check_sequence.Po ./$(DEPDIR)/check_shp_load.Po \
-	./$(DEPDIR)/check_shp_load_3d.Po \
 	./$(DEPDIR)/check_spatialindex.Po \
-	./$(DEPDIR)/check_sql_stmt.Po \
-	./$(DEPDIR)/check_sql_stmt_extension.Po \
-	./$(DEPDIR)/check_sql_stmt_legacy.Po \
-	./$(DEPDIR)/check_sql_stmt_tiny.Po \
-	./$(DEPDIR)/check_srid_fncts.Po \
-	./$(DEPDIR)/check_stored_proc.Po ./$(DEPDIR)/check_styling.Po \
+	./$(DEPDIR)/check_styling.Po \
 	./$(DEPDIR)/check_tempgeom.Po ./$(DEPDIR)/check_topology2d.Po \
 	./$(DEPDIR)/check_topology3d.Po \
 	./$(DEPDIR)/check_toponoface2d.Po \
 	./$(DEPDIR)/check_topoplus.Po ./$(DEPDIR)/check_toposnap.Po \
 	./$(DEPDIR)/check_version.Po \
-	./$(DEPDIR)/check_virtual_ovflw.Po \
 	./$(DEPDIR)/check_virtualbbox.Po \
-	./$(DEPDIR)/check_virtualelem.Po \
-	./$(DEPDIR)/check_virtualknn2.Po \
 	./$(DEPDIR)/check_virtualtable1.Po \
-	./$(DEPDIR)/check_virtualtable2.Po \
 	./$(DEPDIR)/check_virtualtable3.Po \
 	./$(DEPDIR)/check_virtualtable4.Po \
 	./$(DEPDIR)/check_virtualtable5.Po \
 	./$(DEPDIR)/check_virtualtable6.Po \
-	./$(DEPDIR)/check_virtualxpath.Po ./$(DEPDIR)/check_wfsin.Po \
+	./$(DEPDIR)/check_virtualxpath.Po \
 	./$(DEPDIR)/check_wms.Po ./$(DEPDIR)/check_xls_load.Po \
-	./$(DEPDIR)/check_zipshp.Po ./$(DEPDIR)/geojson_test.Po \
+	./$(DEPDIR)/geojson_test.Po \
 	./$(DEPDIR)/routing_test.Po ./$(DEPDIR)/shape_3d.Po \
 	./$(DEPDIR)/shape_cp1252.Po ./$(DEPDIR)/shape_primitives.Po \
-	./$(DEPDIR)/shape_utf8_1.Po ./$(DEPDIR)/shape_utf8_1ex.Po \
 	./$(DEPDIR)/shape_utf8_2.Po
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -687,18 +584,18 @@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
 SOURCES = check_add_tile_triggers.c \
-	check_add_tile_triggers_bad_table_name.c check_bufovflw.c \
-	check_clone_table.c check_control_points.c check_create.c \
-	check_createBaseTables.c check_cutter.c check_dbf_load.c \
-	check_drop_rename.c check_dxf.c check_endian.c check_exif.c \
+	check_add_tile_triggers_bad_table_name.c \
+	check_control_points.c check_create.c \
+	check_createBaseTables.c check_dbf_load.c \
+	check_endian.c check_exif.c \
 	check_exif2.c check_extension.c check_extra_relations_fncts.c \
 	check_fdo1.c check_fdo2.c check_fdo3.c check_fdo_bufovflw.c \
 	check_gaia_utf8.c check_gaia_util.c check_geom_aux.c \
-	check_geometry_cols.c check_geoscvt_fncts.c \
+	check_geoscvt_fncts.c \
 	check_get_normal_row.c check_get_normal_row_bad_geopackage.c \
 	check_get_normal_row_bad_geopackage2.c check_get_normal_zoom.c \
 	check_get_normal_zoom_bad_geopackage.c \
 	check_get_normal_zoom_bad_geopackage2.c \
 	check_get_normal_zoom_extension_load.c check_gpkgConvert.c \
@@ -713,39 +610,36 @@
 	check_gpkg_base_core_container_data_file_format_application_id.c \
 	check_gpkg_base_core_contents_data_table_def.c \
 	check_gpkg_base_core_spatial_ref_sys_data_table_def.c \
 	check_gpkg_base_core_spatial_ref_sys_data_values_default.c \
 	check_gpkg_opt_extension_mechanism_extensions_data_table_def.c \
-	check_init.c check_init2.c check_init_full.c check_libxml2.c \
-	check_map_config.c check_math_funcs.c check_mbrcache.c \
-	check_md5.c check_metacatalog.c check_multiple_points.c \
+	check_init.c check_init_full.c \
+	check_map_config.c check_math_funcs.c \
+	check_metacatalog.c \
 	check_multithread.c check_network2d.c check_network3d.c \
-	check_network_log.c check_recover_geom.c \
+	check_network_log.c \
 	check_relations_fncts.c check_sequence.c check_shp_load.c \
-	check_shp_load_3d.c check_spatialindex.c check_sql_stmt.c \
-	check_sql_stmt_extension.c check_sql_stmt_legacy.c \
-	check_sql_stmt_tiny.c check_srid_fncts.c check_stored_proc.c \
+	check_spatialindex.c \
 	check_styling.c check_tempgeom.c check_topology2d.c \
 	check_topology3d.c check_toponoface2d.c check_topoplus.c \
-	check_toposnap.c check_version.c check_virtual_ovflw.c \
-	check_virtualbbox.c check_virtualelem.c check_virtualknn2.c \
-	check_virtualtable1.c check_virtualtable2.c \
+	check_toposnap.c check_version.c \
+	check_virtualbbox.c \
+	check_virtualtable1.c \
 	check_virtualtable3.c check_virtualtable4.c \
 	check_virtualtable5.c check_virtualtable6.c \
-	check_virtualxpath.c check_wfsin.c check_wms.c \
-	check_xls_load.c check_zipshp.c geojson_test.c routing_test.c \
-	shape_3d.c shape_cp1252.c shape_primitives.c shape_utf8_1.c \
-	shape_utf8_1ex.c shape_utf8_2.c
+	check_virtualxpath.c check_wms.c \
+	check_xls_load.c geojson_test.c routing_test.c \
+	shape_3d.c shape_cp1252.c shape_primitives.c shape_utf8_2.c
 DIST_SOURCES = check_add_tile_triggers.c \
-	check_add_tile_triggers_bad_table_name.c check_bufovflw.c \
-	check_clone_table.c check_control_points.c check_create.c \
-	check_createBaseTables.c check_cutter.c check_dbf_load.c \
-	check_drop_rename.c check_dxf.c check_endian.c check_exif.c \
+	check_add_tile_triggers_bad_table_name.c \
+	check_control_points.c check_create.c \
+	check_createBaseTables.c check_dbf_load.c \
+	check_endian.c check_exif.c \
 	check_exif2.c check_extension.c check_extra_relations_fncts.c \
 	check_fdo1.c check_fdo2.c check_fdo3.c check_fdo_bufovflw.c \
 	check_gaia_utf8.c check_gaia_util.c check_geom_aux.c \
-	check_geometry_cols.c check_geoscvt_fncts.c \
+	check_geoscvt_fncts.c \
 	check_get_normal_row.c check_get_normal_row_bad_geopackage.c \
 	check_get_normal_row_bad_geopackage2.c check_get_normal_zoom.c \
 	check_get_normal_zoom_bad_geopackage.c \
 	check_get_normal_zoom_bad_geopackage2.c \
 	check_get_normal_zoom_extension_load.c check_gpkgConvert.c \
@@ -760,30 +654,27 @@
 	check_gpkg_base_core_container_data_file_format_application_id.c \
 	check_gpkg_base_core_contents_data_table_def.c \
 	check_gpkg_base_core_spatial_ref_sys_data_table_def.c \
 	check_gpkg_base_core_spatial_ref_sys_data_values_default.c \
 	check_gpkg_opt_extension_mechanism_extensions_data_table_def.c \
-	check_init.c check_init2.c check_init_full.c check_libxml2.c \
-	check_map_config.c check_math_funcs.c check_mbrcache.c \
-	check_md5.c check_metacatalog.c check_multiple_points.c \
+	check_init.c check_init_full.c \
+	check_map_config.c check_math_funcs.c \
+	check_metacatalog.c \
 	check_multithread.c check_network2d.c check_network3d.c \
 	check_network_log.c check_recover_geom.c \
 	check_relations_fncts.c check_sequence.c check_shp_load.c \
-	check_shp_load_3d.c check_spatialindex.c check_sql_stmt.c \
-	check_sql_stmt_extension.c check_sql_stmt_legacy.c \
-	check_sql_stmt_tiny.c check_srid_fncts.c check_stored_proc.c \
+	check_spatialindex.c \
 	check_styling.c check_tempgeom.c check_topology2d.c \
 	check_topology3d.c check_toponoface2d.c check_topoplus.c \
-	check_toposnap.c check_version.c check_virtual_ovflw.c \
-	check_virtualbbox.c check_virtualelem.c check_virtualknn2.c \
-	check_virtualtable1.c check_virtualtable2.c \
+	check_toposnap.c check_version.c \
+	check_virtualbbox.c \
+	check_virtualtable1.c \
 	check_virtualtable3.c check_virtualtable4.c \
 	check_virtualtable5.c check_virtualtable6.c \
-	check_virtualxpath.c check_wfsin.c check_wms.c \
-	check_xls_load.c check_zipshp.c geojson_test.c routing_test.c \
-	shape_3d.c shape_cp1252.c shape_primitives.c shape_utf8_1.c \
-	shape_utf8_1ex.c shape_utf8_2.c
+	check_virtualxpath.c check_wms.c \
+	check_xls_load.c geojson_test.c routing_test.c \
+	shape_3d.c shape_cp1252.c shape_primitives.c shape_utf8_2.c
 RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
 	ctags-recursive dvi-recursive html-recursive info-recursive \
 	install-data-recursive install-dvi-recursive \
 	install-exec-recursive install-html-recursive \
 	install-info-recursive install-pdf-recursive \
@@ -1195,11 +1086,10 @@
 MOSTLYCLEANFILES = *.gcna *.gcno *.gcda
 EXTRA_DIST = fnmatch_impl4win.h \
 	fnmatch4win.h \
 	scandir4win.h \
 	test_helpers.h \
-	check_sql_stmt.h \
 	shapetest1.dbf \
 	shapetest1.prj \
 	shapetest1.qpj \
 	shapetest1.shp \
 	shapetest1.shx \
@@ -1369,18 +1259,10 @@
 
 check_add_tile_triggers_bad_table_name$(EXEEXT): $(check_add_tile_triggers_bad_table_name_OBJECTS) $(check_add_tile_triggers_bad_table_name_DEPENDENCIES) $(EXTRA_check_add_tile_triggers_bad_table_name_DEPENDENCIES) 
 	@rm -f check_add_tile_triggers_bad_table_name$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(check_add_tile_triggers_bad_table_name_OBJECTS) $(check_add_tile_triggers_bad_table_name_LDADD) $(LIBS)
 
-check_bufovflw$(EXEEXT): $(check_bufovflw_OBJECTS) $(check_bufovflw_DEPENDENCIES) $(EXTRA_check_bufovflw_DEPENDENCIES) 
-	@rm -f check_bufovflw$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(check_bufovflw_OBJECTS) $(check_bufovflw_LDADD) $(LIBS)
-
-check_clone_table$(EXEEXT): $(check_clone_table_OBJECTS) $(check_clone_table_DEPENDENCIES) $(EXTRA_check_clone_table_DEPENDENCIES) 
-	@rm -f check_clone_table$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(check_clone_table_OBJECTS) $(check_clone_table_LDADD) $(LIBS)
-
 check_control_points$(EXEEXT): $(check_control_points_OBJECTS) $(check_control_points_DEPENDENCIES) $(EXTRA_check_control_points_DEPENDENCIES) 
 	@rm -f check_control_points$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(check_control_points_OBJECTS) $(check_control_points_LDADD) $(LIBS)
 
 check_create$(EXEEXT): $(check_create_OBJECTS) $(check_create_DEPENDENCIES) $(EXTRA_check_create_DEPENDENCIES) 
@@ -1389,26 +1271,14 @@
 
 check_createBaseTables$(EXEEXT): $(check_createBaseTables_OBJECTS) $(check_createBaseTables_DEPENDENCIES) $(EXTRA_check_createBaseTables_DEPENDENCIES) 
 	@rm -f check_createBaseTables$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(check_createBaseTables_OBJECTS) $(check_createBaseTables_LDADD) $(LIBS)
 
-check_cutter$(EXEEXT): $(check_cutter_OBJECTS) $(check_cutter_DEPENDENCIES) $(EXTRA_check_cutter_DEPENDENCIES) 
-	@rm -f check_cutter$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(check_cutter_OBJECTS) $(check_cutter_LDADD) $(LIBS)
-
 check_dbf_load$(EXEEXT): $(check_dbf_load_OBJECTS) $(check_dbf_load_DEPENDENCIES) $(EXTRA_check_dbf_load_DEPENDENCIES) 
 	@rm -f check_dbf_load$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(check_dbf_load_OBJECTS) $(check_dbf_load_LDADD) $(LIBS)
 
-check_drop_rename$(EXEEXT): $(check_drop_rename_OBJECTS) $(check_drop_rename_DEPENDENCIES) $(EXTRA_check_drop_rename_DEPENDENCIES) 
-	@rm -f check_drop_rename$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(check_drop_rename_OBJECTS) $(check_drop_rename_LDADD) $(LIBS)
-
-check_dxf$(EXEEXT): $(check_dxf_OBJECTS) $(check_dxf_DEPENDENCIES) $(EXTRA_check_dxf_DEPENDENCIES) 
-	@rm -f check_dxf$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(check_dxf_OBJECTS) $(check_dxf_LDADD) $(LIBS)
-
 check_endian$(EXEEXT): $(check_endian_OBJECTS) $(check_endian_DEPENDENCIES) $(EXTRA_check_endian_DEPENDENCIES) 
 	@rm -f check_endian$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(check_endian_OBJECTS) $(check_endian_LDADD) $(LIBS)
 
 check_exif$(EXEEXT): $(check_exif_OBJECTS) $(check_exif_DEPENDENCIES) $(EXTRA_check_exif_DEPENDENCIES) 
@@ -1453,14 +1323,10 @@
 
 check_geom_aux$(EXEEXT): $(check_geom_aux_OBJECTS) $(check_geom_aux_DEPENDENCIES) $(EXTRA_check_geom_aux_DEPENDENCIES) 
 	@rm -f check_geom_aux$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(check_geom_aux_OBJECTS) $(check_geom_aux_LDADD) $(LIBS)
 
-check_geometry_cols$(EXEEXT): $(check_geometry_cols_OBJECTS) $(check_geometry_cols_DEPENDENCIES) $(EXTRA_check_geometry_cols_DEPENDENCIES) 
-	@rm -f check_geometry_cols$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(check_geometry_cols_OBJECTS) $(check_geometry_cols_LDADD) $(LIBS)
-
 check_geoscvt_fncts$(EXEEXT): $(check_geoscvt_fncts_OBJECTS) $(check_geoscvt_fncts_DEPENDENCIES) $(EXTRA_check_geoscvt_fncts_DEPENDENCIES) 
 	@rm -f check_geoscvt_fncts$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(check_geoscvt_fncts_OBJECTS) $(check_geoscvt_fncts_LDADD) $(LIBS)
 
 check_get_normal_row$(EXEEXT): $(check_get_normal_row_OBJECTS) $(check_get_normal_row_DEPENDENCIES) $(EXTRA_check_get_normal_row_DEPENDENCIES) 
@@ -1569,46 +1435,26 @@
 
 check_init$(EXEEXT): $(check_init_OBJECTS) $(check_init_DEPENDENCIES) $(EXTRA_check_init_DEPENDENCIES) 
 	@rm -f check_init$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(check_init_OBJECTS) $(check_init_LDADD) $(LIBS)
 
-check_init2$(EXEEXT): $(check_init2_OBJECTS) $(check_init2_DEPENDENCIES) $(EXTRA_check_init2_DEPENDENCIES) 
-	@rm -f check_init2$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(check_init2_OBJECTS) $(check_init2_LDADD) $(LIBS)
-
 check_init_full$(EXEEXT): $(check_init_full_OBJECTS) $(check_init_full_DEPENDENCIES) $(EXTRA_check_init_full_DEPENDENCIES) 
 	@rm -f check_init_full$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(check_init_full_OBJECTS) $(check_init_full_LDADD) $(LIBS)
 
-check_libxml2$(EXEEXT): $(check_libxml2_OBJECTS) $(check_libxml2_DEPENDENCIES) $(EXTRA_check_libxml2_DEPENDENCIES) 
-	@rm -f check_libxml2$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(check_libxml2_OBJECTS) $(check_libxml2_LDADD) $(LIBS)
-
 check_map_config$(EXEEXT): $(check_map_config_OBJECTS) $(check_map_config_DEPENDENCIES) $(EXTRA_check_map_config_DEPENDENCIES) 
 	@rm -f check_map_config$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(check_map_config_OBJECTS) $(check_map_config_LDADD) $(LIBS)
 
 check_math_funcs$(EXEEXT): $(check_math_funcs_OBJECTS) $(check_math_funcs_DEPENDENCIES) $(EXTRA_check_math_funcs_DEPENDENCIES) 
 	@rm -f check_math_funcs$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(check_math_funcs_OBJECTS) $(check_math_funcs_LDADD) $(LIBS)
 
-check_mbrcache$(EXEEXT): $(check_mbrcache_OBJECTS) $(check_mbrcache_DEPENDENCIES) $(EXTRA_check_mbrcache_DEPENDENCIES) 
-	@rm -f check_mbrcache$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(check_mbrcache_OBJECTS) $(check_mbrcache_LDADD) $(LIBS)
-
-check_md5$(EXEEXT): $(check_md5_OBJECTS) $(check_md5_DEPENDENCIES) $(EXTRA_check_md5_DEPENDENCIES) 
-	@rm -f check_md5$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(check_md5_OBJECTS) $(check_md5_LDADD) $(LIBS)
-
 check_metacatalog$(EXEEXT): $(check_metacatalog_OBJECTS) $(check_metacatalog_DEPENDENCIES) $(EXTRA_check_metacatalog_DEPENDENCIES) 
 	@rm -f check_metacatalog$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(check_metacatalog_OBJECTS) $(check_metacatalog_LDADD) $(LIBS)
 
-check_multiple_points$(EXEEXT): $(check_multiple_points_OBJECTS) $(check_multiple_points_DEPENDENCIES) $(EXTRA_check_multiple_points_DEPENDENCIES) 
-	@rm -f check_multiple_points$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(check_multiple_points_OBJECTS) $(check_multiple_points_LDADD) $(LIBS)
-
 check_multithread$(EXEEXT): $(check_multithread_OBJECTS) $(check_multithread_DEPENDENCIES) $(EXTRA_check_multithread_DEPENDENCIES) 
 	@rm -f check_multithread$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(check_multithread_OBJECTS) $(check_multithread_LDADD) $(LIBS)
 
 check_network2d$(EXEEXT): $(check_network2d_OBJECTS) $(check_network2d_DEPENDENCIES) $(EXTRA_check_network2d_DEPENDENCIES) 
@@ -1621,14 +1467,10 @@
 
 check_network_log$(EXEEXT): $(check_network_log_OBJECTS) $(check_network_log_DEPENDENCIES) $(EXTRA_check_network_log_DEPENDENCIES) 
 	@rm -f check_network_log$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(check_network_log_OBJECTS) $(check_network_log_LDADD) $(LIBS)
 
-check_recover_geom$(EXEEXT): $(check_recover_geom_OBJECTS) $(check_recover_geom_DEPENDENCIES) $(EXTRA_check_recover_geom_DEPENDENCIES) 
-	@rm -f check_recover_geom$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(check_recover_geom_OBJECTS) $(check_recover_geom_LDADD) $(LIBS)
-
 check_relations_fncts$(EXEEXT): $(check_relations_fncts_OBJECTS) $(check_relations_fncts_DEPENDENCIES) $(EXTRA_check_relations_fncts_DEPENDENCIES) 
 	@rm -f check_relations_fncts$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(check_relations_fncts_OBJECTS) $(check_relations_fncts_LDADD) $(LIBS)
 
 check_sequence$(EXEEXT): $(check_sequence_OBJECTS) $(check_sequence_DEPENDENCIES) $(EXTRA_check_sequence_DEPENDENCIES) 
@@ -1637,42 +1479,14 @@
 
 check_shp_load$(EXEEXT): $(check_shp_load_OBJECTS) $(check_shp_load_DEPENDENCIES) $(EXTRA_check_shp_load_DEPENDENCIES) 
 	@rm -f check_shp_load$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(check_shp_load_OBJECTS) $(check_shp_load_LDADD) $(LIBS)
 
-check_shp_load_3d$(EXEEXT): $(check_shp_load_3d_OBJECTS) $(check_shp_load_3d_DEPENDENCIES) $(EXTRA_check_shp_load_3d_DEPENDENCIES) 
-	@rm -f check_shp_load_3d$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(check_shp_load_3d_OBJECTS) $(check_shp_load_3d_LDADD) $(LIBS)
-
 check_spatialindex$(EXEEXT): $(check_spatialindex_OBJECTS) $(check_spatialindex_DEPENDENCIES) $(EXTRA_check_spatialindex_DEPENDENCIES) 
 	@rm -f check_spatialindex$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(check_spatialindex_OBJECTS) $(check_spatialindex_LDADD) $(LIBS)
 
-check_sql_stmt$(EXEEXT): $(check_sql_stmt_OBJECTS) $(check_sql_stmt_DEPENDENCIES) $(EXTRA_check_sql_stmt_DEPENDENCIES) 
-	@rm -f check_sql_stmt$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(check_sql_stmt_OBJECTS) $(check_sql_stmt_LDADD) $(LIBS)
-
-check_sql_stmt_extension$(EXEEXT): $(check_sql_stmt_extension_OBJECTS) $(check_sql_stmt_extension_DEPENDENCIES) $(EXTRA_check_sql_stmt_extension_DEPENDENCIES) 
-	@rm -f check_sql_stmt_extension$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(check_sql_stmt_extension_OBJECTS) $(check_sql_stmt_extension_LDADD) $(LIBS)
-
-check_sql_stmt_legacy$(EXEEXT): $(check_sql_stmt_legacy_OBJECTS) $(check_sql_stmt_legacy_DEPENDENCIES) $(EXTRA_check_sql_stmt_legacy_DEPENDENCIES) 
-	@rm -f check_sql_stmt_legacy$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(check_sql_stmt_legacy_OBJECTS) $(check_sql_stmt_legacy_LDADD) $(LIBS)
-
-check_sql_stmt_tiny$(EXEEXT): $(check_sql_stmt_tiny_OBJECTS) $(check_sql_stmt_tiny_DEPENDENCIES) $(EXTRA_check_sql_stmt_tiny_DEPENDENCIES) 
-	@rm -f check_sql_stmt_tiny$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(check_sql_stmt_tiny_OBJECTS) $(check_sql_stmt_tiny_LDADD) $(LIBS)
-
-check_srid_fncts$(EXEEXT): $(check_srid_fncts_OBJECTS) $(check_srid_fncts_DEPENDENCIES) $(EXTRA_check_srid_fncts_DEPENDENCIES) 
-	@rm -f check_srid_fncts$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(check_srid_fncts_OBJECTS) $(check_srid_fncts_LDADD) $(LIBS)
-
-check_stored_proc$(EXEEXT): $(check_stored_proc_OBJECTS) $(check_stored_proc_DEPENDENCIES) $(EXTRA_check_stored_proc_DEPENDENCIES) 
-	@rm -f check_stored_proc$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(check_stored_proc_OBJECTS) $(check_stored_proc_LDADD) $(LIBS)
-
 check_styling$(EXEEXT): $(check_styling_OBJECTS) $(check_styling_DEPENDENCIES) $(EXTRA_check_styling_DEPENDENCIES) 
 	@rm -f check_styling$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(check_styling_OBJECTS) $(check_styling_LDADD) $(LIBS)
 
 check_tempgeom$(EXEEXT): $(check_tempgeom_OBJECTS) $(check_tempgeom_DEPENDENCIES) $(EXTRA_check_tempgeom_DEPENDENCIES) 
@@ -1701,34 +1515,18 @@
 
 check_version$(EXEEXT): $(check_version_OBJECTS) $(check_version_DEPENDENCIES) $(EXTRA_check_version_DEPENDENCIES) 
 	@rm -f check_version$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(check_version_OBJECTS) $(check_version_LDADD) $(LIBS)
 
-check_virtual_ovflw$(EXEEXT): $(check_virtual_ovflw_OBJECTS) $(check_virtual_ovflw_DEPENDENCIES) $(EXTRA_check_virtual_ovflw_DEPENDENCIES) 
-	@rm -f check_virtual_ovflw$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(check_virtual_ovflw_OBJECTS) $(check_virtual_ovflw_LDADD) $(LIBS)
-
 check_virtualbbox$(EXEEXT): $(check_virtualbbox_OBJECTS) $(check_virtualbbox_DEPENDENCIES) $(EXTRA_check_virtualbbox_DEPENDENCIES) 
 	@rm -f check_virtualbbox$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(check_virtualbbox_OBJECTS) $(check_virtualbbox_LDADD) $(LIBS)
 
-check_virtualelem$(EXEEXT): $(check_virtualelem_OBJECTS) $(check_virtualelem_DEPENDENCIES) $(EXTRA_check_virtualelem_DEPENDENCIES) 
-	@rm -f check_virtualelem$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(check_virtualelem_OBJECTS) $(check_virtualelem_LDADD) $(LIBS)
-
-check_virtualknn2$(EXEEXT): $(check_virtualknn2_OBJECTS) $(check_virtualknn2_DEPENDENCIES) $(EXTRA_check_virtualknn2_DEPENDENCIES) 
-	@rm -f check_virtualknn2$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(check_virtualknn2_OBJECTS) $(check_virtualknn2_LDADD) $(LIBS)
-
 check_virtualtable1$(EXEEXT): $(check_virtualtable1_OBJECTS) $(check_virtualtable1_DEPENDENCIES) $(EXTRA_check_virtualtable1_DEPENDENCIES) 
 	@rm -f check_virtualtable1$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(check_virtualtable1_OBJECTS) $(check_virtualtable1_LDADD) $(LIBS)
 
-check_virtualtable2$(EXEEXT): $(check_virtualtable2_OBJECTS) $(check_virtualtable2_DEPENDENCIES) $(EXTRA_check_virtualtable2_DEPENDENCIES) 
-	@rm -f check_virtualtable2$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(check_virtualtable2_OBJECTS) $(check_virtualtable2_LDADD) $(LIBS)
-
 check_virtualtable3$(EXEEXT): $(check_virtualtable3_OBJECTS) $(check_virtualtable3_DEPENDENCIES) $(EXTRA_check_virtualtable3_DEPENDENCIES) 
 	@rm -f check_virtualtable3$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(check_virtualtable3_OBJECTS) $(check_virtualtable3_LDADD) $(LIBS)
 
 check_virtualtable4$(EXEEXT): $(check_virtualtable4_OBJECTS) $(check_virtualtable4_DEPENDENCIES) $(EXTRA_check_virtualtable4_DEPENDENCIES) 
@@ -1745,26 +1543,18 @@
 
 check_virtualxpath$(EXEEXT): $(check_virtualxpath_OBJECTS) $(check_virtualxpath_DEPENDENCIES) $(EXTRA_check_virtualxpath_DEPENDENCIES) 
 	@rm -f check_virtualxpath$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(check_virtualxpath_OBJECTS) $(check_virtualxpath_LDADD) $(LIBS)
 
-check_wfsin$(EXEEXT): $(check_wfsin_OBJECTS) $(check_wfsin_DEPENDENCIES) $(EXTRA_check_wfsin_DEPENDENCIES) 
-	@rm -f check_wfsin$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(check_wfsin_OBJECTS) $(check_wfsin_LDADD) $(LIBS)
-
 check_wms$(EXEEXT): $(check_wms_OBJECTS) $(check_wms_DEPENDENCIES) $(EXTRA_check_wms_DEPENDENCIES) 
 	@rm -f check_wms$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(check_wms_OBJECTS) $(check_wms_LDADD) $(LIBS)
 
 check_xls_load$(EXEEXT): $(check_xls_load_OBJECTS) $(check_xls_load_DEPENDENCIES) $(EXTRA_check_xls_load_DEPENDENCIES) 
 	@rm -f check_xls_load$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(check_xls_load_OBJECTS) $(check_xls_load_LDADD) $(LIBS)
 
-check_zipshp$(EXEEXT): $(check_zipshp_OBJECTS) $(check_zipshp_DEPENDENCIES) $(EXTRA_check_zipshp_DEPENDENCIES) 
-	@rm -f check_zipshp$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(check_zipshp_OBJECTS) $(check_zipshp_LDADD) $(LIBS)
-
 geojson_test$(EXEEXT): $(geojson_test_OBJECTS) $(geojson_test_DEPENDENCIES) $(EXTRA_geojson_test_DEPENDENCIES) 
 	@rm -f geojson_test$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(geojson_test_OBJECTS) $(geojson_test_LDADD) $(LIBS)
 
 routing_test$(EXEEXT): $(routing_test_OBJECTS) $(routing_test_DEPENDENCIES) $(EXTRA_routing_test_DEPENDENCIES) 
@@ -1781,18 +1571,10 @@
 
 shape_primitives$(EXEEXT): $(shape_primitives_OBJECTS) $(shape_primitives_DEPENDENCIES) $(EXTRA_shape_primitives_DEPENDENCIES) 
 	@rm -f shape_primitives$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(shape_primitives_OBJECTS) $(shape_primitives_LDADD) $(LIBS)
 
-shape_utf8_1$(EXEEXT): $(shape_utf8_1_OBJECTS) $(shape_utf8_1_DEPENDENCIES) $(EXTRA_shape_utf8_1_DEPENDENCIES) 
-	@rm -f shape_utf8_1$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(shape_utf8_1_OBJECTS) $(shape_utf8_1_LDADD) $(LIBS)
-
-shape_utf8_1ex$(EXEEXT): $(shape_utf8_1ex_OBJECTS) $(shape_utf8_1ex_DEPENDENCIES) $(EXTRA_shape_utf8_1ex_DEPENDENCIES) 
-	@rm -f shape_utf8_1ex$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(shape_utf8_1ex_OBJECTS) $(shape_utf8_1ex_LDADD) $(LIBS)
-
 shape_utf8_2$(EXEEXT): $(shape_utf8_2_OBJECTS) $(shape_utf8_2_DEPENDENCIES) $(EXTRA_shape_utf8_2_DEPENDENCIES) 
 	@rm -f shape_utf8_2$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(shape_utf8_2_OBJECTS) $(shape_utf8_2_LDADD) $(LIBS)
 
 mostlyclean-compile:
@@ -1801,19 +1583,14 @@
 distclean-compile:
 	-rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_add_tile_triggers.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_add_tile_triggers_bad_table_name.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_bufovflw.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_clone_table.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_control_points.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_create.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_createBaseTables.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_cutter.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_dbf_load.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_drop_rename.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_dxf.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_endian.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_exif.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_exif2.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_extension.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_extra_relations_fncts.Po@am__quote@ # am--include-marker
@@ -1822,11 +1599,10 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_fdo3.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_fdo_bufovflw.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_gaia_utf8.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_gaia_util.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_geom_aux.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_geometry_cols.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_geoscvt_fncts.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_get_normal_row.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_get_normal_row_bad_geopackage.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_get_normal_row_bad_geopackage2.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_get_normal_zoom.Po@am__quote@ # am--include-marker
@@ -1851,65 +1627,44 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_gpkg_base_core_contents_data_table_def.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_gpkg_base_core_spatial_ref_sys_data_table_def.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_gpkg_base_core_spatial_ref_sys_data_values_default.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_gpkg_opt_extension_mechanism_extensions_data_table_def.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_init.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_init2.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_init_full.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_libxml2.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_map_config.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_math_funcs.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_mbrcache.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_md5.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_metacatalog.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_multiple_points.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_multithread.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_network2d.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_network3d.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_network_log.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_recover_geom.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_relations_fncts.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_sequence.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_shp_load.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_shp_load_3d.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_spatialindex.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_sql_stmt.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_sql_stmt_extension.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_sql_stmt_legacy.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_sql_stmt_tiny.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_srid_fncts.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_stored_proc.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_styling.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_tempgeom.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_topology2d.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_topology3d.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_toponoface2d.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_topoplus.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_toposnap.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_version.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_virtual_ovflw.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_virtualbbox.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_virtualelem.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_virtualknn2.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_virtualtable1.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_virtualtable2.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_virtualtable3.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_virtualtable4.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_virtualtable5.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_virtualtable6.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_virtualxpath.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_wfsin.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_wms.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_xls_load.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_zipshp.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/geojson_test.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/routing_test.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shape_3d.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shape_cp1252.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shape_primitives.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shape_utf8_1.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shape_utf8_1ex.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shape_utf8_2.Po@am__quote@ # am--include-marker
 
 $(am__depfiles_remade):
 	@$(MKDIR_P) $(@D)
 	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
@@ -2202,17 +1957,10 @@
 	b='check_init'; \
 	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
-check_init2.log: check_init2$(EXEEXT)
-	@p='check_init2$(EXEEXT)'; \
-	b='check_init2'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
 check_init_full.log: check_init_full$(EXEEXT)
 	@p='check_init_full$(EXEEXT)'; \
 	b='check_init_full'; \
 	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
 	--log-file $$b.log --trs-file $$b.trs \
@@ -2223,17 +1971,10 @@
 	b='check_geom_aux'; \
 	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
-check_geometry_cols.log: check_geometry_cols$(EXEEXT)
-	@p='check_geometry_cols$(EXEEXT)'; \
-	b='check_geometry_cols'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
 check_tempgeom.log: check_tempgeom$(EXEEXT)
 	@p='check_tempgeom$(EXEEXT)'; \
 	b='check_tempgeom'; \
 	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
 	--log-file $$b.log --trs-file $$b.trs \
@@ -2240,17 +1981,10 @@
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
 check_create.log: check_create$(EXEEXT)
 	@p='check_create$(EXEEXT)'; \
 	b='check_create'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-check_bufovflw.log: check_bufovflw$(EXEEXT)
-	@p='check_bufovflw$(EXEEXT)'; \
-	b='check_bufovflw'; \
 	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
 check_fdo1.log: check_fdo1$(EXEEXT)
@@ -2279,17 +2013,10 @@
 	b='check_fdo_bufovflw'; \
 	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
-check_md5.log: check_md5$(EXEEXT)
-	@p='check_md5$(EXEEXT)'; \
-	b='check_md5'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
 check_dbf_load.log: check_dbf_load$(EXEEXT)
 	@p='check_dbf_load$(EXEEXT)'; \
 	b='check_dbf_load'; \
 	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
 	--log-file $$b.log --trs-file $$b.trs \
@@ -2296,17 +2023,10 @@
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
 check_shp_load.log: check_shp_load$(EXEEXT)
 	@p='check_shp_load$(EXEEXT)'; \
 	b='check_shp_load'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-check_shp_load_3d.log: check_shp_load_3d$(EXEEXT)
-	@p='check_shp_load_3d$(EXEEXT)'; \
-	b='check_shp_load_3d'; \
 	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
 shape_cp1252.log: shape_cp1252$(EXEEXT)
@@ -2321,24 +2041,10 @@
 	b='shape_primitives'; \
 	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
-shape_utf8_1.log: shape_utf8_1$(EXEEXT)
-	@p='shape_utf8_1$(EXEEXT)'; \
-	b='shape_utf8_1'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-shape_utf8_1ex.log: shape_utf8_1ex$(EXEEXT)
-	@p='shape_utf8_1ex$(EXEEXT)'; \
-	b='shape_utf8_1ex'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
 shape_utf8_2.log: shape_utf8_2$(EXEEXT)
 	@p='shape_utf8_2$(EXEEXT)'; \
 	b='shape_utf8_2'; \
 	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
 	--log-file $$b.log --trs-file $$b.trs \
@@ -2345,17 +2051,10 @@
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
 shape_3d.log: shape_3d$(EXEEXT)
 	@p='shape_3d$(EXEEXT)'; \
 	b='shape_3d'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-check_clone_table.log: check_clone_table$(EXEEXT)
-	@p='check_clone_table$(EXEEXT)'; \
-	b='check_clone_table'; \
 	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
 check_xls_load.log: check_xls_load$(EXEEXT)
@@ -2391,45 +2090,10 @@
 	b='check_extension'; \
 	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
-check_recover_geom.log: check_recover_geom$(EXEEXT)
-	@p='check_recover_geom$(EXEEXT)'; \
-	b='check_recover_geom'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-check_sql_stmt.log: check_sql_stmt$(EXEEXT)
-	@p='check_sql_stmt$(EXEEXT)'; \
-	b='check_sql_stmt'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-check_sql_stmt_tiny.log: check_sql_stmt_tiny$(EXEEXT)
-	@p='check_sql_stmt_tiny$(EXEEXT)'; \
-	b='check_sql_stmt_tiny'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-check_sql_stmt_legacy.log: check_sql_stmt_legacy$(EXEEXT)
-	@p='check_sql_stmt_legacy$(EXEEXT)'; \
-	b='check_sql_stmt_legacy'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-check_sql_stmt_extension.log: check_sql_stmt_extension$(EXEEXT)
-	@p='check_sql_stmt_extension$(EXEEXT)'; \
-	b='check_sql_stmt_extension'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
 check_multithread.log: check_multithread$(EXEEXT)
 	@p='check_multithread$(EXEEXT)'; \
 	b='check_multithread'; \
 	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
 	--log-file $$b.log --trs-file $$b.trs \
@@ -2436,17 +2100,10 @@
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
 check_virtualtable1.log: check_virtualtable1$(EXEEXT)
 	@p='check_virtualtable1$(EXEEXT)'; \
 	b='check_virtualtable1'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-check_virtualtable2.log: check_virtualtable2$(EXEEXT)
-	@p='check_virtualtable2$(EXEEXT)'; \
-	b='check_virtualtable2'; \
 	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
 check_virtualtable3.log: check_virtualtable3$(EXEEXT)
@@ -2471,24 +2128,10 @@
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
 check_virtualtable6.log: check_virtualtable6$(EXEEXT)
 	@p='check_virtualtable6$(EXEEXT)'; \
 	b='check_virtualtable6'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-check_virtual_ovflw.log: check_virtual_ovflw$(EXEEXT)
-	@p='check_virtual_ovflw$(EXEEXT)'; \
-	b='check_virtual_ovflw'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-check_mbrcache.log: check_mbrcache$(EXEEXT)
-	@p='check_mbrcache$(EXEEXT)'; \
-	b='check_mbrcache'; \
 	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
 check_spatialindex.log: check_spatialindex$(EXEEXT)
@@ -2531,17 +2174,10 @@
 	b='check_geoscvt_fncts'; \
 	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
-check_libxml2.log: check_libxml2$(EXEEXT)
-	@p='check_libxml2$(EXEEXT)'; \
-	b='check_libxml2'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
 check_styling.log: check_styling$(EXEEXT)
 	@p='check_styling$(EXEEXT)'; \
 	b='check_styling'; \
 	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
 	--log-file $$b.log --trs-file $$b.trs \
@@ -2566,55 +2202,20 @@
 	b='check_virtualbbox'; \
 	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
-check_wfsin.log: check_wfsin$(EXEEXT)
-	@p='check_wfsin$(EXEEXT)'; \
-	b='check_wfsin'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-check_dxf.log: check_dxf$(EXEEXT)
-	@p='check_dxf$(EXEEXT)'; \
-	b='check_dxf'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
 check_metacatalog.log: check_metacatalog$(EXEEXT)
 	@p='check_metacatalog$(EXEEXT)'; \
 	b='check_metacatalog'; \
 	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
-check_virtualelem.log: check_virtualelem$(EXEEXT)
-	@p='check_virtualelem$(EXEEXT)'; \
-	b='check_virtualelem'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-check_srid_fncts.log: check_srid_fncts$(EXEEXT)
-	@p='check_srid_fncts$(EXEEXT)'; \
-	b='check_srid_fncts'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
 check_control_points.log: check_control_points$(EXEEXT)
 	@p='check_control_points$(EXEEXT)'; \
 	b='check_control_points'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-check_cutter.log: check_cutter$(EXEEXT)
-	@p='check_cutter$(EXEEXT)'; \
-	b='check_cutter'; \
 	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
 check_topology2d.log: check_topology2d$(EXEEXT)
@@ -2671,41 +2272,20 @@
 	b='check_network_log'; \
 	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
-check_virtualknn2.log: check_virtualknn2$(EXEEXT)
-	@p='check_virtualknn2$(EXEEXT)'; \
-	b='check_virtualknn2'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
 check_sequence.log: check_sequence$(EXEEXT)
 	@p='check_sequence$(EXEEXT)'; \
 	b='check_sequence'; \
 	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
-check_stored_proc.log: check_stored_proc$(EXEEXT)
-	@p='check_stored_proc$(EXEEXT)'; \
-	b='check_stored_proc'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
 check_wms.log: check_wms$(EXEEXT)
 	@p='check_wms$(EXEEXT)'; \
 	b='check_wms'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-check_drop_rename.log: check_drop_rename$(EXEEXT)
-	@p='check_drop_rename$(EXEEXT)'; \
-	b='check_drop_rename'; \
 	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
 routing_test.log: routing_test$(EXEEXT)
@@ -2716,24 +2296,10 @@
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
 geojson_test.log: geojson_test$(EXEEXT)
 	@p='geojson_test$(EXEEXT)'; \
 	b='geojson_test'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-check_zipshp.log: check_zipshp$(EXEEXT)
-	@p='check_zipshp$(EXEEXT)'; \
-	b='check_zipshp'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-check_multiple_points.log: check_multiple_points$(EXEEXT)
-	@p='check_multiple_points$(EXEEXT)'; \
-	b='check_multiple_points'; \
 	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
 check_createBaseTables.log: check_createBaseTables$(EXEEXT)
@@ -3059,19 +2625,14 @@
 	mostlyclean-am
 
 distclean: distclean-recursive
 		-rm -f ./$(DEPDIR)/check_add_tile_triggers.Po
 	-rm -f ./$(DEPDIR)/check_add_tile_triggers_bad_table_name.Po
-	-rm -f ./$(DEPDIR)/check_bufovflw.Po
-	-rm -f ./$(DEPDIR)/check_clone_table.Po
 	-rm -f ./$(DEPDIR)/check_control_points.Po
 	-rm -f ./$(DEPDIR)/check_create.Po
 	-rm -f ./$(DEPDIR)/check_createBaseTables.Po
-	-rm -f ./$(DEPDIR)/check_cutter.Po
 	-rm -f ./$(DEPDIR)/check_dbf_load.Po
-	-rm -f ./$(DEPDIR)/check_drop_rename.Po
-	-rm -f ./$(DEPDIR)/check_dxf.Po
 	-rm -f ./$(DEPDIR)/check_endian.Po
 	-rm -f ./$(DEPDIR)/check_exif.Po
 	-rm -f ./$(DEPDIR)/check_exif2.Po
 	-rm -f ./$(DEPDIR)/check_extension.Po
 	-rm -f ./$(DEPDIR)/check_extra_relations_fncts.Po
@@ -3080,11 +2641,10 @@
 	-rm -f ./$(DEPDIR)/check_fdo3.Po
 	-rm -f ./$(DEPDIR)/check_fdo_bufovflw.Po
 	-rm -f ./$(DEPDIR)/check_gaia_utf8.Po
 	-rm -f ./$(DEPDIR)/check_gaia_util.Po
 	-rm -f ./$(DEPDIR)/check_geom_aux.Po
-	-rm -f ./$(DEPDIR)/check_geometry_cols.Po
 	-rm -f ./$(DEPDIR)/check_geoscvt_fncts.Po
 	-rm -f ./$(DEPDIR)/check_get_normal_row.Po
 	-rm -f ./$(DEPDIR)/check_get_normal_row_bad_geopackage.Po
 	-rm -f ./$(DEPDIR)/check_get_normal_row_bad_geopackage2.Po
 	-rm -f ./$(DEPDIR)/check_get_normal_zoom.Po
@@ -3109,65 +2669,44 @@
 	-rm -f ./$(DEPDIR)/check_gpkg_base_core_contents_data_table_def.Po
 	-rm -f ./$(DEPDIR)/check_gpkg_base_core_spatial_ref_sys_data_table_def.Po
 	-rm -f ./$(DEPDIR)/check_gpkg_base_core_spatial_ref_sys_data_values_default.Po
 	-rm -f ./$(DEPDIR)/check_gpkg_opt_extension_mechanism_extensions_data_table_def.Po
 	-rm -f ./$(DEPDIR)/check_init.Po
-	-rm -f ./$(DEPDIR)/check_init2.Po
 	-rm -f ./$(DEPDIR)/check_init_full.Po
-	-rm -f ./$(DEPDIR)/check_libxml2.Po
 	-rm -f ./$(DEPDIR)/check_map_config.Po
 	-rm -f ./$(DEPDIR)/check_math_funcs.Po
-	-rm -f ./$(DEPDIR)/check_mbrcache.Po
-	-rm -f ./$(DEPDIR)/check_md5.Po
 	-rm -f ./$(DEPDIR)/check_metacatalog.Po
-	-rm -f ./$(DEPDIR)/check_multiple_points.Po
 	-rm -f ./$(DEPDIR)/check_multithread.Po
 	-rm -f ./$(DEPDIR)/check_network2d.Po
 	-rm -f ./$(DEPDIR)/check_network3d.Po
 	-rm -f ./$(DEPDIR)/check_network_log.Po
-	-rm -f ./$(DEPDIR)/check_recover_geom.Po
 	-rm -f ./$(DEPDIR)/check_relations_fncts.Po
 	-rm -f ./$(DEPDIR)/check_sequence.Po
 	-rm -f ./$(DEPDIR)/check_shp_load.Po
-	-rm -f ./$(DEPDIR)/check_shp_load_3d.Po
 	-rm -f ./$(DEPDIR)/check_spatialindex.Po
-	-rm -f ./$(DEPDIR)/check_sql_stmt.Po
-	-rm -f ./$(DEPDIR)/check_sql_stmt_extension.Po
-	-rm -f ./$(DEPDIR)/check_sql_stmt_legacy.Po
-	-rm -f ./$(DEPDIR)/check_sql_stmt_tiny.Po
-	-rm -f ./$(DEPDIR)/check_srid_fncts.Po
-	-rm -f ./$(DEPDIR)/check_stored_proc.Po
 	-rm -f ./$(DEPDIR)/check_styling.Po
 	-rm -f ./$(DEPDIR)/check_tempgeom.Po
 	-rm -f ./$(DEPDIR)/check_topology2d.Po
 	-rm -f ./$(DEPDIR)/check_topology3d.Po
 	-rm -f ./$(DEPDIR)/check_toponoface2d.Po
 	-rm -f ./$(DEPDIR)/check_topoplus.Po
 	-rm -f ./$(DEPDIR)/check_toposnap.Po
 	-rm -f ./$(DEPDIR)/check_version.Po
-	-rm -f ./$(DEPDIR)/check_virtual_ovflw.Po
 	-rm -f ./$(DEPDIR)/check_virtualbbox.Po
-	-rm -f ./$(DEPDIR)/check_virtualelem.Po
-	-rm -f ./$(DEPDIR)/check_virtualknn2.Po
 	-rm -f ./$(DEPDIR)/check_virtualtable1.Po
-	-rm -f ./$(DEPDIR)/check_virtualtable2.Po
 	-rm -f ./$(DEPDIR)/check_virtualtable3.Po
 	-rm -f ./$(DEPDIR)/check_virtualtable4.Po
 	-rm -f ./$(DEPDIR)/check_virtualtable5.Po
 	-rm -f ./$(DEPDIR)/check_virtualtable6.Po
 	-rm -f ./$(DEPDIR)/check_virtualxpath.Po
-	-rm -f ./$(DEPDIR)/check_wfsin.Po
 	-rm -f ./$(DEPDIR)/check_wms.Po
 	-rm -f ./$(DEPDIR)/check_xls_load.Po
-	-rm -f ./$(DEPDIR)/check_zipshp.Po
 	-rm -f ./$(DEPDIR)/geojson_test.Po
 	-rm -f ./$(DEPDIR)/routing_test.Po
 	-rm -f ./$(DEPDIR)/shape_3d.Po
 	-rm -f ./$(DEPDIR)/shape_cp1252.Po
 	-rm -f ./$(DEPDIR)/shape_primitives.Po
-	-rm -f ./$(DEPDIR)/shape_utf8_1.Po
-	-rm -f ./$(DEPDIR)/shape_utf8_1ex.Po
 	-rm -f ./$(DEPDIR)/shape_utf8_2.Po
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
 
@@ -3212,19 +2751,14 @@
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
 		-rm -f ./$(DEPDIR)/check_add_tile_triggers.Po
 	-rm -f ./$(DEPDIR)/check_add_tile_triggers_bad_table_name.Po
-	-rm -f ./$(DEPDIR)/check_bufovflw.Po
-	-rm -f ./$(DEPDIR)/check_clone_table.Po
 	-rm -f ./$(DEPDIR)/check_control_points.Po
 	-rm -f ./$(DEPDIR)/check_create.Po
 	-rm -f ./$(DEPDIR)/check_createBaseTables.Po
-	-rm -f ./$(DEPDIR)/check_cutter.Po
 	-rm -f ./$(DEPDIR)/check_dbf_load.Po
-	-rm -f ./$(DEPDIR)/check_drop_rename.Po
-	-rm -f ./$(DEPDIR)/check_dxf.Po
 	-rm -f ./$(DEPDIR)/check_endian.Po
 	-rm -f ./$(DEPDIR)/check_exif.Po
 	-rm -f ./$(DEPDIR)/check_exif2.Po
 	-rm -f ./$(DEPDIR)/check_extension.Po
 	-rm -f ./$(DEPDIR)/check_extra_relations_fncts.Po
@@ -3233,11 +2767,10 @@
 	-rm -f ./$(DEPDIR)/check_fdo3.Po
 	-rm -f ./$(DEPDIR)/check_fdo_bufovflw.Po
 	-rm -f ./$(DEPDIR)/check_gaia_utf8.Po
 	-rm -f ./$(DEPDIR)/check_gaia_util.Po
 	-rm -f ./$(DEPDIR)/check_geom_aux.Po
-	-rm -f ./$(DEPDIR)/check_geometry_cols.Po
 	-rm -f ./$(DEPDIR)/check_geoscvt_fncts.Po
 	-rm -f ./$(DEPDIR)/check_get_normal_row.Po
 	-rm -f ./$(DEPDIR)/check_get_normal_row_bad_geopackage.Po
 	-rm -f ./$(DEPDIR)/check_get_normal_row_bad_geopackage2.Po
 	-rm -f ./$(DEPDIR)/check_get_normal_zoom.Po
@@ -3264,63 +2797,43 @@
 	-rm -f ./$(DEPDIR)/check_gpkg_base_core_spatial_ref_sys_data_values_default.Po
 	-rm -f ./$(DEPDIR)/check_gpkg_opt_extension_mechanism_extensions_data_table_def.Po
 	-rm -f ./$(DEPDIR)/check_init.Po
 	-rm -f ./$(DEPDIR)/check_init2.Po
 	-rm -f ./$(DEPDIR)/check_init_full.Po
-	-rm -f ./$(DEPDIR)/check_libxml2.Po
 	-rm -f ./$(DEPDIR)/check_map_config.Po
 	-rm -f ./$(DEPDIR)/check_math_funcs.Po
-	-rm -f ./$(DEPDIR)/check_mbrcache.Po
-	-rm -f ./$(DEPDIR)/check_md5.Po
 	-rm -f ./$(DEPDIR)/check_metacatalog.Po
-	-rm -f ./$(DEPDIR)/check_multiple_points.Po
 	-rm -f ./$(DEPDIR)/check_multithread.Po
 	-rm -f ./$(DEPDIR)/check_network2d.Po
 	-rm -f ./$(DEPDIR)/check_network3d.Po
 	-rm -f ./$(DEPDIR)/check_network_log.Po
-	-rm -f ./$(DEPDIR)/check_recover_geom.Po
 	-rm -f ./$(DEPDIR)/check_relations_fncts.Po
 	-rm -f ./$(DEPDIR)/check_sequence.Po
 	-rm -f ./$(DEPDIR)/check_shp_load.Po
-	-rm -f ./$(DEPDIR)/check_shp_load_3d.Po
 	-rm -f ./$(DEPDIR)/check_spatialindex.Po
-	-rm -f ./$(DEPDIR)/check_sql_stmt.Po
-	-rm -f ./$(DEPDIR)/check_sql_stmt_extension.Po
-	-rm -f ./$(DEPDIR)/check_sql_stmt_legacy.Po
-	-rm -f ./$(DEPDIR)/check_sql_stmt_tiny.Po
-	-rm -f ./$(DEPDIR)/check_srid_fncts.Po
-	-rm -f ./$(DEPDIR)/check_stored_proc.Po
 	-rm -f ./$(DEPDIR)/check_styling.Po
 	-rm -f ./$(DEPDIR)/check_tempgeom.Po
 	-rm -f ./$(DEPDIR)/check_topology2d.Po
 	-rm -f ./$(DEPDIR)/check_topology3d.Po
 	-rm -f ./$(DEPDIR)/check_toponoface2d.Po
 	-rm -f ./$(DEPDIR)/check_topoplus.Po
 	-rm -f ./$(DEPDIR)/check_toposnap.Po
 	-rm -f ./$(DEPDIR)/check_version.Po
-	-rm -f ./$(DEPDIR)/check_virtual_ovflw.Po
 	-rm -f ./$(DEPDIR)/check_virtualbbox.Po
-	-rm -f ./$(DEPDIR)/check_virtualelem.Po
-	-rm -f ./$(DEPDIR)/check_virtualknn2.Po
 	-rm -f ./$(DEPDIR)/check_virtualtable1.Po
-	-rm -f ./$(DEPDIR)/check_virtualtable2.Po
 	-rm -f ./$(DEPDIR)/check_virtualtable3.Po
 	-rm -f ./$(DEPDIR)/check_virtualtable4.Po
 	-rm -f ./$(DEPDIR)/check_virtualtable5.Po
 	-rm -f ./$(DEPDIR)/check_virtualtable6.Po
 	-rm -f ./$(DEPDIR)/check_virtualxpath.Po
-	-rm -f ./$(DEPDIR)/check_wfsin.Po
 	-rm -f ./$(DEPDIR)/check_wms.Po
 	-rm -f ./$(DEPDIR)/check_xls_load.Po
-	-rm -f ./$(DEPDIR)/check_zipshp.Po
 	-rm -f ./$(DEPDIR)/geojson_test.Po
 	-rm -f ./$(DEPDIR)/routing_test.Po
 	-rm -f ./$(DEPDIR)/shape_3d.Po
 	-rm -f ./$(DEPDIR)/shape_cp1252.Po
 	-rm -f ./$(DEPDIR)/shape_primitives.Po
-	-rm -f ./$(DEPDIR)/shape_utf8_1.Po
-	-rm -f ./$(DEPDIR)/shape_utf8_1ex.Po
 	-rm -f ./$(DEPDIR)/shape_utf8_2.Po
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-recursive

Index: test/check_sql_stmt.h
==================================================================
--- test/check_sql_stmt.h
+++ test/check_sql_stmt.h
@@ -557,11 +557,11 @@
     int result = 0;
     const char *security_level;
     int tiny_point = is_tiny_point_enabled (conn->cache);
 #ifndef OMIT_GEOS		/* only if GEOS is supported */
 	char geos_version[32];
-	sprintf(geos_version, "%04d.%04d.%04d",  GEOS_VERSION_MAJOR, GEOS_VERSION_MINOR, GEOS_VERSION_PATCH);
+	sprintf(geos_version, "%04d.%04d",  GEOS_VERSION_MAJOR, GEOS_VERSION_MINOR);
 #endif
 
     result = run_subdir_test ("sql_stmt_tests", conn, load_extension, 0);
     if (result != 0)
       {

