Index: Makefile.am ================================================================== --- Makefile.am +++ Makefile.am @@ -17,9 +17,9 @@ coverage-init: lcov --directory src --capture --initial --output-file libspatialite_cov.info coverage:: - lcov --directory src --output-file libspatialite_cov.info --capture - genhtml -o covresults libspatialite_cov.info + lcov --rc lcov_branch_coverage=1 --directory src --output-file libspatialite_cov.info --capture + genhtml --rc lcov_branch_coverage=1 -o covresults libspatialite_cov.info MOSTLYCLEANFILES = libspatialite_cov.info Index: Makefile.in ================================================================== --- Makefile.in +++ Makefile.in @@ -878,11 +878,11 @@ coverage-init: lcov --directory src --capture --initial --output-file libspatialite_cov.info coverage:: - lcov --directory src --output-file libspatialite_cov.info --capture - genhtml -o covresults libspatialite_cov.info + lcov --rc lcov_branch_coverage=1 --directory src --output-file libspatialite_cov.info --capture + genhtml --rc lcov_branch_coverage=1 -o covresults libspatialite_cov.info # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: Index: config.h.in ================================================================== --- config.h.in +++ config.h.in @@ -1,9 +1,9 @@ /* config.h.in. Generated from configure.ac by autoheader. */ -/* Should be defined in order to enable CONTROL_POINTS support. */ -#undef ENABLE_CONTROL_POINTS +/* Should be defined in order to enable GCP support. */ +#undef ENABLE_GCP /* Should be defined in order to enable GeoPackage support. */ #undef ENABLE_GEOPACKAGE /* Should be defined in order to enable LIBXML2 support. */ Index: configure ================================================================== --- configure +++ configure @@ -795,11 +795,11 @@ enable_iconv enable_freexl enable_epsg enable_geos with_geosconfig -enable_controlpoints +enable_gcp enable_geosadvanced enable_lwgeom enable_libxml2 enable_geopackage enable_gcov @@ -1460,11 +1460,11 @@ --enable-proj enables PROJ.4 inclusion [default=yes] --enable-iconv enables ICONV inclusion [default=yes] --enable-freexl enables FreeXL inclusion [default=yes] --enable-epsg enables full EPSG dataset support [default=yes] --enable-geos enables GEOS inclusion [default=yes] - --enable-controlpoints enables Control Points (from Grass GIS) [default=no] + --enable-gcp enables Control Points (from Grass GIS) [default=no] --enable-geosadvanced enables GEOS advanced features [default=yes] --enable-lwgeom enables LWGEOM support [default=no] --enable-libxml2 enables libxml2 inclusion [default=yes] --enable-geopackage enables GeoPackage support [default=yes] --enable-gcov turn on code coverage analysis tools @@ -17350,11 +17350,11 @@ else as_fn_error $? "'libz' is required but it doesn't seem to be installed on this system." "$LINENO" 5 fi -ac_config_files="$ac_config_files Makefile src/Makefile src/headers/Makefile src/gaiaaux/Makefile src/gaiaexif/Makefile src/gaiageo/Makefile src/gaiageo/flex/Makefile src/gaiageo/lemon/Makefile src/gaiageo/lemon/lemon_src/Makefile src/geopackage/Makefile src/spatialite/Makefile src/shapefiles/Makefile src/dxf/Makefile src/md5/Makefile src/control_points/Makefile src/srsinit/Makefile src/srsinit/epsg_update/Makefile src/connection_cache/Makefile src/connection_cache/generator/Makefile src/virtualtext/Makefile src/wfs/Makefile test/Makefile test/sql_stmt_tests/Makefile test/sql_stmt_geos_tests/Makefile test/sql_stmt_geosadvanced_tests/Makefile test/sql_stmt_geopackage_tests/Makefile test/sql_stmt_proj_tests/Makefile test/sql_stmt_mathsql_tests/Makefile test/sql_stmt_lwgeom_tests/Makefile test/sql_stmt_libxml2_tests/Makefile test/sql_stmt_security_tests/Makefile test/sql_stmt_xmlsec_tests/Makefile test/sql_stmt_freexl_tests/Makefile examples/Makefile Doxyfile spatialite.pc" +ac_config_files="$ac_config_files Makefile src/Makefile src/headers/Makefile src/gaiaaux/Makefile src/gaiaexif/Makefile src/gaiageo/Makefile src/gaiageo/flex/Makefile src/gaiageo/lemon/Makefile src/gaiageo/lemon/lemon_src/Makefile src/geopackage/Makefile src/spatialite/Makefile src/shapefiles/Makefile src/dxf/Makefile src/md5/Makefile src/control_points/Makefile src/srsinit/Makefile src/srsinit/epsg_update/Makefile src/connection_cache/Makefile src/connection_cache/generator/Makefile src/virtualtext/Makefile src/wfs/Makefile test/Makefile test/sql_stmt_tests/Makefile test/sql_stmt_geos_tests/Makefile test/sql_stmt_geosadvanced_tests/Makefile test/sql_stmt_geopackage_tests/Makefile test/sql_stmt_proj_tests/Makefile test/sql_stmt_mathsql_tests/Makefile test/sql_stmt_lwgeom_tests/Makefile test/sql_stmt_libxml2_tests/Makefile test/sql_stmt_security_tests/Makefile test/sql_stmt_xmlsec_tests/Makefile test/sql_stmt_freexl_tests/Makefile test/sql_stmt_cache_tests/Makefile test/sql_stmt_nocache_tests/Makefile examples/Makefile Doxyfile spatialite.pc" # exporting the TARGET_CPU string splite_cpu=`$CC -dumpmachine` cat >>confdefs.h <<_ACEOF @@ -18126,19 +18126,19 @@ LIBS="$LIBS $GEOS_LDFLAGS -lgeos_c" #----------------------------------------------------------------------- # --enable-controlpoints # - # Check whether --enable-controlpoints was given. -if test "${enable_controlpoints+set}" = set; then : - enableval=$enable_controlpoints; + # Check whether --enable-gcp was given. +if test "${enable_gcp+set}" = set; then : + enableval=$enable_gcp; else - enable_controlpoints=no + enable_gcp=no fi - if test x"$enable_controlpoints" != "xno"; then - $as_echo "#define ENABLE_CONTROL_POINTS 1" >>confdefs.h + if test x"$enable_gcp" != "xno"; then + $as_echo "#define ENABLE_GCP 1" >>confdefs.h fi #----------------------------------------------------------------------- # --enable-geosadvanced @@ -19785,10 +19785,12 @@ "test/sql_stmt_lwgeom_tests/Makefile") CONFIG_FILES="$CONFIG_FILES test/sql_stmt_lwgeom_tests/Makefile" ;; "test/sql_stmt_libxml2_tests/Makefile") CONFIG_FILES="$CONFIG_FILES test/sql_stmt_libxml2_tests/Makefile" ;; "test/sql_stmt_security_tests/Makefile") CONFIG_FILES="$CONFIG_FILES test/sql_stmt_security_tests/Makefile" ;; "test/sql_stmt_xmlsec_tests/Makefile") CONFIG_FILES="$CONFIG_FILES test/sql_stmt_xmlsec_tests/Makefile" ;; "test/sql_stmt_freexl_tests/Makefile") CONFIG_FILES="$CONFIG_FILES test/sql_stmt_freexl_tests/Makefile" ;; + "test/sql_stmt_cache_tests/Makefile") CONFIG_FILES="$CONFIG_FILES test/sql_stmt_cache_tests/Makefile" ;; + "test/sql_stmt_nocache_tests/Makefile") CONFIG_FILES="$CONFIG_FILES test/sql_stmt_nocache_tests/Makefile" ;; "examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;; "Doxyfile") CONFIG_FILES="$CONFIG_FILES Doxyfile" ;; "spatialite.pc") CONFIG_FILES="$CONFIG_FILES spatialite.pc" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; @@ -21327,27 +21329,27 @@ #----------------------------------------------------------------------- gpl_escalation=no; if test x"$enable_lwgeom" != "xno"; then gpl_escalation=yes fi -if test x"$enable_controlpoints" != "xno"; then +if test x"$enable_gcp" != "xno"; then gpl_escalation=yes fi if test x"$gpl_escalation" != xno; then echo echo echo "==============================================================" echo " IMPORTANT NOTICE" echo "==============================================================" - echo "You have selected --enable-lwgeom and/or --enable-controlpoints" + echo "You have selected --enable-lwgeom and/or --enable-gcp" echo echo "Both modules strictly depend on code released under the GPLv2+" echo "license, wich is virally infective by definition." echo "Consequently the copy of libspatialite you are going to build" echo "if configured this way *must* be released under the GPLv2+ license." echo echo "If you wish better preserving the initial MPL tri-license you" echo "simply have to reconfigure by specifying the following options:" - echo " --disable-lwgeom --disable-controlpoints" + echo " --disable-lwgeom --disable-gcp" echo "==============================================================" fi Index: configure.ac ================================================================== --- configure.ac +++ configure.ac @@ -33,12 +33,12 @@ [Should be defined in order to enable GEOS_ADVANCED support.]) AH_TEMPLATE([GEOS_TRUNK], [Should be defined in order to enable GEOS_TRUNK experimental support.]) AH_TEMPLATE([ENABLE_LWGEOM], [Should be defined in order to enable LWGEOM support.]) -AH_TEMPLATE([ENABLE_CONTROL_POINTS], - [Should be defined in order to enable CONTROL_POINTS support.]) +AH_TEMPLATE([ENABLE_GCP], + [Should be defined in order to enable GCP support.]) AH_TEMPLATE([OMIT_PROJ], [Should be defined in order to disable PROJ.4 support.]) AH_TEMPLATE([OMIT_ICONV], [Should be defined in order to disable ICONV support.]) AH_TEMPLATE([OMIT_MATHSQL], @@ -137,10 +137,12 @@ test/sql_stmt_lwgeom_tests/Makefile \ test/sql_stmt_libxml2_tests/Makefile \ test/sql_stmt_security_tests/Makefile \ test/sql_stmt_xmlsec_tests/Makefile \ test/sql_stmt_freexl_tests/Makefile \ + test/sql_stmt_cache_tests/Makefile \ + test/sql_stmt_nocache_tests/Makefile \ examples/Makefile \ Doxyfile \ spatialite.pc]) # exporting the TARGET_CPU string @@ -280,15 +282,15 @@ LIBS="$LIBS $GEOS_LDFLAGS -lgeos_c" #----------------------------------------------------------------------- # --enable-controlpoints # - AC_ARG_ENABLE(controlpoints, [AS_HELP_STRING( - [--enable-controlpoints], [enables Control Points (from Grass GIS) [default=no]])], - [], [enable_controlpoints=no]) - if test x"$enable_controlpoints" != "xno"; then - AC_DEFINE(ENABLE_CONTROL_POINTS) + AC_ARG_ENABLE(gcp, [AS_HELP_STRING( + [--enable-gcp], [enables Control Points (from Grass GIS) [default=no]])], + [], [enable_gcp=no]) + if test x"$enable_gcp" != "xno"; then + AC_DEFINE(ENABLE_GCP) fi #----------------------------------------------------------------------- # --enable-geosadvanced # @@ -385,27 +387,27 @@ #----------------------------------------------------------------------- gpl_escalation=no; if test x"$enable_lwgeom" != "xno"; then gpl_escalation=yes fi -if test x"$enable_controlpoints" != "xno"; then +if test x"$enable_gcp" != "xno"; then gpl_escalation=yes fi if test x"$gpl_escalation" != xno; then echo echo echo "==============================================================" echo " IMPORTANT NOTICE" echo "==============================================================" - echo "You have selected --enable-lwgeom and/or --enable-controlpoints" + echo "You have selected --enable-lwgeom and/or --enable-gcp" echo echo "Both modules strictly depend on code released under the GPLv2+" echo "license, wich is virally infective by definition." echo "Consequently the copy of libspatialite you are going to build" echo "if configured this way *must* be released under the GPLv2+ license." echo echo "If you wish better preserving the initial MPL tri-license you" echo "simply have to reconfigure by specifying the following options:" - echo " --disable-lwgeom --disable-controlpoints" + echo " --disable-lwgeom --disable-gcp" echo "==============================================================" fi Index: spatialite-sql-latest.html ================================================================== --- spatialite-sql-latest.html +++ spatialite-sql-latest.html @@ -14,10 +14,11 @@

SpatiaLite 4.3.0          SQL functions reference list

back