[Git][debian-gis-team/spatialite-tools][upstream] New upstream version 5.0.1~rc0
Bas Couwenberg
gitlab at salsa.debian.org
Tue Jan 26 17:42:53 GMT 2021
Bas Couwenberg pushed to branch upstream at Debian GIS Project / spatialite-tools
Commits:
f8143af9 by Bas Couwenberg at 2021-01-26T18:01:24+01:00
New upstream version 5.0.1~rc0
- - - - -
23 changed files:
- Makefile.am
- Makefile.in
- aclocal.m4
- compile
- config-msvc.h
- + config.h
- config.h.in
- configure
- configure.ac
- exif_loader.c
- shp_doctor.c
- shp_sanitize.c
- spatialite_dxf.c
- spatialite_gml.c
- spatialite_network.c
- spatialite_osm_filter.c
- spatialite_osm_map.c
- spatialite_osm_net.c
- spatialite_osm_overpass.c
- spatialite_osm_raw.c
- spatialite_tool.c
- spatialite_xml_print.c
- spatialite_xml_validator.c
Changes:
=====================================
Makefile.am
=====================================
@@ -1,11 +1,14 @@
ACLOCAL_AMFLAGS = -I m4
-if NO_READOSM
+if READOSM
bin_PROGRAMS = spatialite \
spatialite_tool \
spatialite_network \
shp_doctor shp_sanitize \
exif_loader \
+ spatialite_osm_net \
+ spatialite_osm_map \
+ spatialite_osm_raw \
spatialite_osm_filter \
spatialite_gml \
spatialite_convert \
@@ -23,9 +26,6 @@ bin_PROGRAMS = spatialite \
spatialite_network \
shp_doctor shp_sanitize \
exif_loader \
- spatialite_osm_net \
- spatialite_osm_map \
- spatialite_osm_raw \
spatialite_osm_filter \
spatialite_gml \
spatialite_convert \
@@ -53,8 +53,7 @@ spatialite_xml_load_SOURCES = spatialite_xml_load.c
spatialite_xml2utf8_SOURCES = spatialite_xml2utf8.c
spatialite_xml_collapse_SOURCES = spatialite_xml_collapse.c
spatialite_xml_print_SOURCES = spatialite_xml_print.c
-if NO_READOSM
-else
+if READOSM
spatialite_osm_net_SOURCES = spatialite_osm_net.c
spatialite_osm_map_SOURCES = spatialite_osm_map.c
spatialite_osm_raw_SOURCES = spatialite_osm_raw.c
@@ -64,31 +63,16 @@ spatialite_gml_SOURCES = spatialite_gml.c
spatialite_osm_overpass_SOURCES = spatialite_osm_overpass.c
spatialite_dem_SOURCES = spatialite_dem.c
-spatialite_osm_map_LDADD = @LIBSPATIALITE_LIBS@ \
- @LIBFREEXL_LIBS@ @LIBREADOSM_LIBS@
-spatialite_osm_overpass_LDADD = @LIBSPATIALITE_LIBS@ \
- @LIBFREEXL_LIBS@ @LIBXML2_LIBS@
-spatialite_osm_raw_LDADD = @LIBSPATIALITE_LIBS@ \
- @LIBFREEXL_LIBS@ @LIBREADOSM_LIBS@
-spatialite_osm_net_LDADD = @LIBSPATIALITE_LIBS@ \
- @LIBFREEXL_LIBS@ @LIBREADOSM_LIBS@
-spatialite_gml_LDADD = @LIBSPATIALITE_LIBS@ \
- @LIBFREEXL_LIBS@ \
- -lexpat
-spatialite_dem_LDADD = @LIBSPATIALITE_LIBS@
-spatialite_LDADD = @LIBSPATIALITE_LIBS@ \
- @LIBFREEXL_LIBS@ \
- @READLINE_LIBS@
-spatialite_xml_validator_LDADD = @LIBXML2_LIBS@
-spatialite_xml_load_LDADD = @LIBSPATIALITE_LIBS@ \
- -lexpat
-spatialite_xml_collapse_LDADD = @LIBSPATIALITE_LIBS@
-spatialite_xml_print_LADD = @LIBSPATIALIATE_LIBS@
-LDADD = @LIBSPATIALITE_LIBS@ \
- @LIBFREEXL_LIBS@
+spatialite_osm_map_LDADD = @LIBSPATIALITE_LIBS@ @LIBREADOSM_LIBS@
+spatialite_osm_raw_LDADD = @LIBSPATIALITE_LIBS@ @LIBREADOSM_LIBS@
+spatialite_osm_net_LDADD = @LIBSPATIALITE_LIBS@ @LIBREADOSM_LIBS@
+spatialite_gml_LDADD = @LIBSPATIALITE_LIBS@ -lexpat
+spatialite_LDADD = @LIBSPATIALITE_LIBS@ @READLINE_LIBS@
+spatialite_xml_load_LDADD = @LIBSPATIALITE_LIBS@ -lexpat
+LDADD = @LIBSPATIALITE_LIBS@
EXTRA_DIST = makefile.vc nmake.opt makefile64.vc nmake64.opt \
- config-msvc.h \
+ config.h config.h.in config-msvc.h \
Makefile-static-MinGW \
Makefile-static-mingw32 \
Makefile-static-mingw64 \
=====================================
Makefile.in
=====================================
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -88,41 +88,39 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
- at NO_READOSM_FALSE@bin_PROGRAMS = spatialite$(EXEEXT) \
- at NO_READOSM_FALSE@ spatialite_tool$(EXEEXT) \
- at NO_READOSM_FALSE@ spatialite_network$(EXEEXT) \
- at NO_READOSM_FALSE@ shp_doctor$(EXEEXT) shp_sanitize$(EXEEXT) \
- at NO_READOSM_FALSE@ exif_loader$(EXEEXT) \
- at NO_READOSM_FALSE@ spatialite_osm_net$(EXEEXT) \
- at NO_READOSM_FALSE@ spatialite_osm_map$(EXEEXT) \
- at NO_READOSM_FALSE@ spatialite_osm_raw$(EXEEXT) \
- at NO_READOSM_FALSE@ spatialite_osm_filter$(EXEEXT) \
- at NO_READOSM_FALSE@ spatialite_gml$(EXEEXT) \
- at NO_READOSM_FALSE@ spatialite_convert$(EXEEXT) \
- at NO_READOSM_FALSE@ spatialite_dxf$(EXEEXT) \
- at NO_READOSM_FALSE@ spatialite_xml_validator$(EXEEXT) \
- at NO_READOSM_FALSE@ spatialite_xml_load$(EXEEXT) \
- at NO_READOSM_FALSE@ spatialite_xml2utf8$(EXEEXT) \
- at NO_READOSM_FALSE@ spatialite_xml_collapse$(EXEEXT) \
- at NO_READOSM_FALSE@ spatialite_xml_print$(EXEEXT) \
- at NO_READOSM_FALSE@ spatialite_osm_overpass$(EXEEXT) \
- at NO_READOSM_FALSE@ spatialite_dem$(EXEEXT)
- at NO_READOSM_TRUE@bin_PROGRAMS = spatialite$(EXEEXT) \
- at NO_READOSM_TRUE@ spatialite_tool$(EXEEXT) \
- at NO_READOSM_TRUE@ spatialite_network$(EXEEXT) \
- at NO_READOSM_TRUE@ shp_doctor$(EXEEXT) shp_sanitize$(EXEEXT) \
- at NO_READOSM_TRUE@ exif_loader$(EXEEXT) \
- at NO_READOSM_TRUE@ spatialite_osm_filter$(EXEEXT) \
- at NO_READOSM_TRUE@ spatialite_gml$(EXEEXT) \
- at NO_READOSM_TRUE@ spatialite_convert$(EXEEXT) \
- at NO_READOSM_TRUE@ spatialite_dxf$(EXEEXT) \
- at NO_READOSM_TRUE@ spatialite_xml_validator$(EXEEXT) \
- at NO_READOSM_TRUE@ spatialite_xml_load$(EXEEXT) \
- at NO_READOSM_TRUE@ spatialite_xml2utf8$(EXEEXT) \
- at NO_READOSM_TRUE@ spatialite_xml_collapse$(EXEEXT) \
- at NO_READOSM_TRUE@ spatialite_xml_print$(EXEEXT) \
- at NO_READOSM_TRUE@ spatialite_osm_overpass$(EXEEXT) \
- at NO_READOSM_TRUE@ spatialite_dem$(EXEEXT)
+ at READOSM_FALSE@bin_PROGRAMS = spatialite$(EXEEXT) \
+ at READOSM_FALSE@ spatialite_tool$(EXEEXT) \
+ at READOSM_FALSE@ spatialite_network$(EXEEXT) shp_doctor$(EXEEXT) \
+ at READOSM_FALSE@ shp_sanitize$(EXEEXT) exif_loader$(EXEEXT) \
+ at READOSM_FALSE@ spatialite_osm_filter$(EXEEXT) \
+ at READOSM_FALSE@ spatialite_gml$(EXEEXT) \
+ at READOSM_FALSE@ spatialite_convert$(EXEEXT) \
+ at READOSM_FALSE@ spatialite_dxf$(EXEEXT) \
+ at READOSM_FALSE@ spatialite_xml_validator$(EXEEXT) \
+ at READOSM_FALSE@ spatialite_xml_load$(EXEEXT) \
+ at READOSM_FALSE@ spatialite_xml2utf8$(EXEEXT) \
+ at READOSM_FALSE@ spatialite_xml_collapse$(EXEEXT) \
+ at READOSM_FALSE@ spatialite_xml_print$(EXEEXT) \
+ at READOSM_FALSE@ spatialite_osm_overpass$(EXEEXT) \
+ at READOSM_FALSE@ spatialite_dem$(EXEEXT)
+ at READOSM_TRUE@bin_PROGRAMS = spatialite$(EXEEXT) \
+ at READOSM_TRUE@ spatialite_tool$(EXEEXT) \
+ at READOSM_TRUE@ spatialite_network$(EXEEXT) shp_doctor$(EXEEXT) \
+ at READOSM_TRUE@ shp_sanitize$(EXEEXT) exif_loader$(EXEEXT) \
+ at READOSM_TRUE@ spatialite_osm_net$(EXEEXT) \
+ at READOSM_TRUE@ spatialite_osm_map$(EXEEXT) \
+ at READOSM_TRUE@ spatialite_osm_raw$(EXEEXT) \
+ at READOSM_TRUE@ spatialite_osm_filter$(EXEEXT) \
+ at READOSM_TRUE@ spatialite_gml$(EXEEXT) \
+ at READOSM_TRUE@ spatialite_convert$(EXEEXT) \
+ at READOSM_TRUE@ spatialite_dxf$(EXEEXT) \
+ at READOSM_TRUE@ spatialite_xml_validator$(EXEEXT) \
+ at READOSM_TRUE@ spatialite_xml_load$(EXEEXT) \
+ at READOSM_TRUE@ spatialite_xml2utf8$(EXEEXT) \
+ at READOSM_TRUE@ spatialite_xml_collapse$(EXEEXT) \
+ at READOSM_TRUE@ spatialite_xml_print$(EXEEXT) \
+ at READOSM_TRUE@ spatialite_osm_overpass$(EXEEXT) \
+ at READOSM_TRUE@ spatialite_dem$(EXEEXT)
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
@@ -166,6 +164,7 @@ spatialite_convert_LDADD = $(LDADD)
spatialite_convert_DEPENDENCIES =
am_spatialite_dem_OBJECTS = spatialite_dem.$(OBJEXT)
spatialite_dem_OBJECTS = $(am_spatialite_dem_OBJECTS)
+spatialite_dem_LDADD = $(LDADD)
spatialite_dem_DEPENDENCIES =
spatialite_dxf_SOURCES = spatialite_dxf.c
spatialite_dxf_OBJECTS = spatialite_dxf.$(OBJEXT)
@@ -183,23 +182,24 @@ spatialite_osm_filter_OBJECTS = $(am_spatialite_osm_filter_OBJECTS)
spatialite_osm_filter_LDADD = $(LDADD)
spatialite_osm_filter_DEPENDENCIES =
am__spatialite_osm_map_SOURCES_DIST = spatialite_osm_map.c
- at NO_READOSM_FALSE@am_spatialite_osm_map_OBJECTS = \
- at NO_READOSM_FALSE@ spatialite_osm_map.$(OBJEXT)
+ at READOSM_TRUE@am_spatialite_osm_map_OBJECTS = \
+ at READOSM_TRUE@ spatialite_osm_map.$(OBJEXT)
spatialite_osm_map_OBJECTS = $(am_spatialite_osm_map_OBJECTS)
spatialite_osm_map_DEPENDENCIES =
am__spatialite_osm_net_SOURCES_DIST = spatialite_osm_net.c
- at NO_READOSM_FALSE@am_spatialite_osm_net_OBJECTS = \
- at NO_READOSM_FALSE@ spatialite_osm_net.$(OBJEXT)
+ at READOSM_TRUE@am_spatialite_osm_net_OBJECTS = \
+ at READOSM_TRUE@ spatialite_osm_net.$(OBJEXT)
spatialite_osm_net_OBJECTS = $(am_spatialite_osm_net_OBJECTS)
spatialite_osm_net_DEPENDENCIES =
am_spatialite_osm_overpass_OBJECTS = \
spatialite_osm_overpass.$(OBJEXT)
spatialite_osm_overpass_OBJECTS = \
$(am_spatialite_osm_overpass_OBJECTS)
+spatialite_osm_overpass_LDADD = $(LDADD)
spatialite_osm_overpass_DEPENDENCIES =
am__spatialite_osm_raw_SOURCES_DIST = spatialite_osm_raw.c
- at NO_READOSM_FALSE@am_spatialite_osm_raw_OBJECTS = \
- at NO_READOSM_FALSE@ spatialite_osm_raw.$(OBJEXT)
+ at READOSM_TRUE@am_spatialite_osm_raw_OBJECTS = \
+ at READOSM_TRUE@ spatialite_osm_raw.$(OBJEXT)
spatialite_osm_raw_OBJECTS = $(am_spatialite_osm_raw_OBJECTS)
spatialite_osm_raw_DEPENDENCIES =
am_spatialite_tool_OBJECTS = spatialite_tool.$(OBJEXT)
@@ -214,6 +214,7 @@ am_spatialite_xml_collapse_OBJECTS = \
spatialite_xml_collapse.$(OBJEXT)
spatialite_xml_collapse_OBJECTS = \
$(am_spatialite_xml_collapse_OBJECTS)
+spatialite_xml_collapse_LDADD = $(LDADD)
spatialite_xml_collapse_DEPENDENCIES =
am_spatialite_xml_load_OBJECTS = spatialite_xml_load.$(OBJEXT)
spatialite_xml_load_OBJECTS = $(am_spatialite_xml_load_OBJECTS)
@@ -226,6 +227,7 @@ am_spatialite_xml_validator_OBJECTS = \
spatialite_xml_validator.$(OBJEXT)
spatialite_xml_validator_OBJECTS = \
$(am_spatialite_xml_validator_OBJECTS)
+spatialite_xml_validator_LDADD = $(LDADD)
spatialite_xml_validator_DEPENDENCIES =
AM_V_P = $(am__v_P_ at AM_V@)
am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
@@ -308,8 +310,8 @@ am__can_run_installinfo = \
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
- $(LISP)config.h.in
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \
+ config.h.in
# Read a list of newline-separated strings from the standard input,
# and print each of them once, without duplicates. Input order is
# *not* preserved.
@@ -380,9 +382,6 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
-GEOSCONFIG = @GEOSCONFIG@
-GEOS_CPPFLAGS = @GEOS_CPPFLAGS@
-GEOS_LDFLAGS = @GEOS_LDFLAGS@
GREP = @GREP@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@@ -391,8 +390,6 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LD = @LD@
LDFLAGS = @LDFLAGS@
-LIBFREEXL_CFLAGS = @LIBFREEXL_CFLAGS@
-LIBFREEXL_LIBS = @LIBFREEXL_LIBS@
LIBOBJS = @LIBOBJS@
LIBREADOSM_CFLAGS = @LIBREADOSM_CFLAGS@
LIBREADOSM_LIBS = @LIBREADOSM_LIBS@
@@ -428,8 +425,6 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
RANLIB = @RANLIB@
READLINE_LIBS = @READLINE_LIBS@
-RTTOPO_CFLAGS = @RTTOPO_CFLAGS@
-RTTOPO_LIBS = @RTTOPO_LIBS@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -501,45 +496,22 @@ spatialite_xml_load_SOURCES = spatialite_xml_load.c
spatialite_xml2utf8_SOURCES = spatialite_xml2utf8.c
spatialite_xml_collapse_SOURCES = spatialite_xml_collapse.c
spatialite_xml_print_SOURCES = spatialite_xml_print.c
- at NO_READOSM_FALSE@spatialite_osm_net_SOURCES = spatialite_osm_net.c
- at NO_READOSM_FALSE@spatialite_osm_map_SOURCES = spatialite_osm_map.c
- at NO_READOSM_FALSE@spatialite_osm_raw_SOURCES = spatialite_osm_raw.c
+ at READOSM_TRUE@spatialite_osm_net_SOURCES = spatialite_osm_net.c
+ at READOSM_TRUE@spatialite_osm_map_SOURCES = spatialite_osm_map.c
+ at READOSM_TRUE@spatialite_osm_raw_SOURCES = spatialite_osm_raw.c
spatialite_osm_filter_SOURCES = spatialite_osm_filter.c
spatialite_gml_SOURCES = spatialite_gml.c
spatialite_osm_overpass_SOURCES = spatialite_osm_overpass.c
spatialite_dem_SOURCES = spatialite_dem.c
-spatialite_osm_map_LDADD = @LIBSPATIALITE_LIBS@ \
- @LIBFREEXL_LIBS@ @LIBREADOSM_LIBS@
-
-spatialite_osm_overpass_LDADD = @LIBSPATIALITE_LIBS@ \
- @LIBFREEXL_LIBS@ @LIBXML2_LIBS@
-
-spatialite_osm_raw_LDADD = @LIBSPATIALITE_LIBS@ \
- @LIBFREEXL_LIBS@ @LIBREADOSM_LIBS@
-
-spatialite_osm_net_LDADD = @LIBSPATIALITE_LIBS@ \
- @LIBFREEXL_LIBS@ @LIBREADOSM_LIBS@
-
-spatialite_gml_LDADD = @LIBSPATIALITE_LIBS@ \
- @LIBFREEXL_LIBS@ \
- -lexpat
-
-spatialite_dem_LDADD = @LIBSPATIALITE_LIBS@
-spatialite_LDADD = @LIBSPATIALITE_LIBS@ \
- @LIBFREEXL_LIBS@ \
- @READLINE_LIBS@
-
-spatialite_xml_validator_LDADD = @LIBXML2_LIBS@
-spatialite_xml_load_LDADD = @LIBSPATIALITE_LIBS@ \
- -lexpat
-
-spatialite_xml_collapse_LDADD = @LIBSPATIALITE_LIBS@
-spatialite_xml_print_LADD = @LIBSPATIALIATE_LIBS@
-LDADD = @LIBSPATIALITE_LIBS@ \
- @LIBFREEXL_LIBS@
-
+spatialite_osm_map_LDADD = @LIBSPATIALITE_LIBS@ @LIBREADOSM_LIBS@
+spatialite_osm_raw_LDADD = @LIBSPATIALITE_LIBS@ @LIBREADOSM_LIBS@
+spatialite_osm_net_LDADD = @LIBSPATIALITE_LIBS@ @LIBREADOSM_LIBS@
+spatialite_gml_LDADD = @LIBSPATIALITE_LIBS@ -lexpat
+spatialite_LDADD = @LIBSPATIALITE_LIBS@ @READLINE_LIBS@
+spatialite_xml_load_LDADD = @LIBSPATIALITE_LIBS@ -lexpat
+LDADD = @LIBSPATIALITE_LIBS@
EXTRA_DIST = makefile.vc nmake.opt makefile64.vc nmake64.opt \
- config-msvc.h \
+ config.h config.h.in config-msvc.h \
Makefile-static-MinGW \
Makefile-static-mingw32 \
Makefile-static-mingw64 \
@@ -910,6 +882,10 @@ dist-xz: distdir
tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
$(am__post_remove_distdir)
+dist-zstd: distdir
+ tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst
+ $(am__post_remove_distdir)
+
dist-tarZ: distdir
@echo WARNING: "Support for distribution archives compressed with" \
"legacy program 'compress' is deprecated." >&2
@@ -951,6 +927,8 @@ distcheck: dist
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
+ *.tar.zst*) \
+ zstd -dc $(distdir).tar.zst | $(am__untar) ;;\
esac
chmod -R a-w $(distdir)
chmod u+w $(distdir)
@@ -1171,19 +1149,19 @@ uninstall-am: uninstall-binPROGRAMS
check-am clean clean-binPROGRAMS clean-cscope clean-generic \
clean-libtool cscope cscopelist-am ctags ctags-am dist \
dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
- dist-xz dist-zip distcheck distclean distclean-compile \
- distclean-generic distclean-hdr distclean-libtool \
- distclean-tags distcleancheck distdir distuninstallcheck dvi \
- dvi-am html html-am info info-am install install-am \
- install-binPROGRAMS install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
- uninstall-binPROGRAMS
+ dist-xz dist-zip dist-zstd distcheck distclean \
+ distclean-compile distclean-generic distclean-hdr \
+ distclean-libtool distclean-tags distcleancheck distdir \
+ distuninstallcheck dvi dvi-am html html-am info info-am \
+ install install-am install-binPROGRAMS install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags tags-am uninstall uninstall-am uninstall-binPROGRAMS
.PRECIOUS: Makefile
=====================================
aclocal.m4
=====================================
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.2 -*- Autoconf -*-
-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
+# Copyright (C) 1996-2020 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -364,7 +364,7 @@ AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"],
[AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])])
])dnl PKG_HAVE_DEFINE_WITH_MODULES
-# Copyright (C) 2002-2018 Free Software Foundation, Inc.
+# Copyright (C) 2002-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -379,7 +379,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.16'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.16.1], [],
+m4_if([$1], [1.16.2], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -395,14 +395,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.16.1])dnl
+[AM_AUTOMAKE_VERSION([1.16.2])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
+# Copyright (C) 2001-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -454,7 +454,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd`
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2018 Free Software Foundation, Inc.
+# Copyright (C) 1997-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -485,7 +485,7 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2018 Free Software Foundation, Inc.
+# Copyright (C) 1999-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -676,7 +676,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2018 Free Software Foundation, Inc.
+# Copyright (C) 1999-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -715,7 +715,9 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
done
if test $am_rc -ne 0; then
AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments
- for automatic dependency tracking. Try re-running configure with the
+ for automatic dependency tracking. If GNU make was not used, consider
+ re-running the configure script with MAKE="gmake" (or whatever is
+ necessary). You can also try re-running configure with the
'--disable-dependency-tracking' option to at least be able to build
the package (albeit without support for automatic dependency tracking).])
fi
@@ -742,7 +744,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
+# Copyright (C) 1996-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -939,7 +941,7 @@ for _am_header in $config_headers :; do
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
+# Copyright (C) 2001-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -960,7 +962,7 @@ if test x"${install_sh+set}" != xset; then
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2018 Free Software Foundation, Inc.
+# Copyright (C) 2003-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -982,7 +984,7 @@ AC_SUBST([am__leading_dot])])
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
+# Copyright (C) 1996-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1017,7 +1019,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
+# Copyright (C) 2001-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1060,7 +1062,7 @@ AC_SUBST([am__quote])])
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2018 Free Software Foundation, Inc.
+# Copyright (C) 1997-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1101,7 +1103,7 @@ fi
# Obsolete and "removed" macros, that must however still report explicit
# error messages when used, to smooth transition.
#
-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
+# Copyright (C) 1996-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1128,7 +1130,7 @@ AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES])
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
+# Copyright (C) 2001-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1157,7 +1159,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999-2018 Free Software Foundation, Inc.
+# Copyright (C) 1999-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1204,7 +1206,7 @@ AC_LANG_POP([C])])
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
+# Copyright (C) 2001-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1223,7 +1225,7 @@ AC_DEFUN([AM_RUN_LOG],
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2018 Free Software Foundation, Inc.
+# Copyright (C) 1996-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1304,7 +1306,7 @@ AC_CONFIG_COMMANDS_PRE(
rm -f conftest.file
])
-# Copyright (C) 2009-2018 Free Software Foundation, Inc.
+# Copyright (C) 2009-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1364,7 +1366,7 @@ AC_SUBST([AM_BACKSLASH])dnl
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-# Copyright (C) 2001-2018 Free Software Foundation, Inc.
+# Copyright (C) 2001-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1392,7 +1394,7 @@ fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2018 Free Software Foundation, Inc.
+# Copyright (C) 2006-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1411,7 +1413,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2018 Free Software Foundation, Inc.
+# Copyright (C) 2004-2020 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
=====================================
compile
=====================================
@@ -1,348 +1 @@
-#! /bin/sh
-# Wrapper for compilers which do not understand '-c -o'.
-
-scriptversion=2018-03-07.03; # UTC
-
-# Copyright (C) 1999-2018 Free Software Foundation, Inc.
-# Written by Tom Tromey <tromey at cygnus.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# This file is maintained in Automake, please report
-# bugs to <bug-automake at gnu.org> or send patches to
-# <automake-patches at gnu.org>.
-
-nl='
-'
-
-# We need space, tab and new line, in precisely that order. Quoting is
-# there to prevent tools from complaining about whitespace usage.
-IFS=" "" $nl"
-
-file_conv=
-
-# func_file_conv build_file lazy
-# Convert a $build file to $host form and store it in $file
-# Currently only supports Windows hosts. If the determined conversion
-# type is listed in (the comma separated) LAZY, no conversion will
-# take place.
-func_file_conv ()
-{
- file=$1
- case $file in
- / | /[!/]*) # absolute file, and not a UNC file
- if test -z "$file_conv"; then
- # lazily determine how to convert abs files
- case `uname -s` in
- MINGW*)
- file_conv=mingw
- ;;
- CYGWIN*)
- file_conv=cygwin
- ;;
- *)
- file_conv=wine
- ;;
- esac
- fi
- case $file_conv/,$2, in
- *,$file_conv,*)
- ;;
- mingw/*)
- file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
- ;;
- cygwin/*)
- file=`cygpath -m "$file" || echo "$file"`
- ;;
- wine/*)
- file=`winepath -w "$file" || echo "$file"`
- ;;
- esac
- ;;
- esac
-}
-
-# func_cl_dashL linkdir
-# Make cl look for libraries in LINKDIR
-func_cl_dashL ()
-{
- func_file_conv "$1"
- if test -z "$lib_path"; then
- lib_path=$file
- else
- lib_path="$lib_path;$file"
- fi
- linker_opts="$linker_opts -LIBPATH:$file"
-}
-
-# func_cl_dashl library
-# Do a library search-path lookup for cl
-func_cl_dashl ()
-{
- lib=$1
- found=no
- save_IFS=$IFS
- IFS=';'
- for dir in $lib_path $LIB
- do
- IFS=$save_IFS
- if $shared && test -f "$dir/$lib.dll.lib"; then
- found=yes
- lib=$dir/$lib.dll.lib
- break
- fi
- if test -f "$dir/$lib.lib"; then
- found=yes
- lib=$dir/$lib.lib
- break
- fi
- if test -f "$dir/lib$lib.a"; then
- found=yes
- lib=$dir/lib$lib.a
- break
- fi
- done
- IFS=$save_IFS
-
- if test "$found" != yes; then
- lib=$lib.lib
- fi
-}
-
-# func_cl_wrapper cl arg...
-# Adjust compile command to suit cl
-func_cl_wrapper ()
-{
- # Assume a capable shell
- lib_path=
- shared=:
- linker_opts=
- for arg
- do
- if test -n "$eat"; then
- eat=
- else
- case $1 in
- -o)
- # configure might choose to run compile as 'compile cc -o foo foo.c'.
- eat=1
- case $2 in
- *.o | *.[oO][bB][jJ])
- func_file_conv "$2"
- set x "$@" -Fo"$file"
- shift
- ;;
- *)
- func_file_conv "$2"
- set x "$@" -Fe"$file"
- shift
- ;;
- esac
- ;;
- -I)
- eat=1
- func_file_conv "$2" mingw
- set x "$@" -I"$file"
- shift
- ;;
- -I*)
- func_file_conv "${1#-I}" mingw
- set x "$@" -I"$file"
- shift
- ;;
- -l)
- eat=1
- func_cl_dashl "$2"
- set x "$@" "$lib"
- shift
- ;;
- -l*)
- func_cl_dashl "${1#-l}"
- set x "$@" "$lib"
- shift
- ;;
- -L)
- eat=1
- func_cl_dashL "$2"
- ;;
- -L*)
- func_cl_dashL "${1#-L}"
- ;;
- -static)
- shared=false
- ;;
- -Wl,*)
- arg=${1#-Wl,}
- save_ifs="$IFS"; IFS=','
- for flag in $arg; do
- IFS="$save_ifs"
- linker_opts="$linker_opts $flag"
- done
- IFS="$save_ifs"
- ;;
- -Xlinker)
- eat=1
- linker_opts="$linker_opts $2"
- ;;
- -*)
- set x "$@" "$1"
- shift
- ;;
- *.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
- func_file_conv "$1"
- set x "$@" -Tp"$file"
- shift
- ;;
- *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
- func_file_conv "$1" mingw
- set x "$@" "$file"
- shift
- ;;
- *)
- set x "$@" "$1"
- shift
- ;;
- esac
- fi
- shift
- done
- if test -n "$linker_opts"; then
- linker_opts="-link$linker_opts"
- fi
- exec "$@" $linker_opts
- exit 1
-}
-
-eat=
-
-case $1 in
- '')
- echo "$0: No command. Try '$0 --help' for more information." 1>&2
- exit 1;
- ;;
- -h | --h*)
- cat <<\EOF
-Usage: compile [--help] [--version] PROGRAM [ARGS]
-
-Wrapper for compilers which do not understand '-c -o'.
-Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
-arguments, and rename the output as expected.
-
-If you are trying to build a whole package this is not the
-right script to run: please start by reading the file 'INSTALL'.
-
-Report bugs to <bug-automake at gnu.org>.
-EOF
- exit $?
- ;;
- -v | --v*)
- echo "compile $scriptversion"
- exit $?
- ;;
- cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
- icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
- func_cl_wrapper "$@" # Doesn't return...
- ;;
-esac
-
-ofile=
-cfile=
-
-for arg
-do
- if test -n "$eat"; then
- eat=
- else
- case $1 in
- -o)
- # configure might choose to run compile as 'compile cc -o foo foo.c'.
- # So we strip '-o arg' only if arg is an object.
- eat=1
- case $2 in
- *.o | *.obj)
- ofile=$2
- ;;
- *)
- set x "$@" -o "$2"
- shift
- ;;
- esac
- ;;
- *.c)
- cfile=$1
- set x "$@" "$1"
- shift
- ;;
- *)
- set x "$@" "$1"
- shift
- ;;
- esac
- fi
- shift
-done
-
-if test -z "$ofile" || test -z "$cfile"; then
- # If no '-o' option was seen then we might have been invoked from a
- # pattern rule where we don't need one. That is ok -- this is a
- # normal compilation that the losing compiler can handle. If no
- # '.c' file was seen then we are probably linking. That is also
- # ok.
- exec "$@"
-fi
-
-# Name of file we expect compiler to create.
-cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
-
-# Create the lock directory.
-# Note: use '[/\\:.-]' here to ensure that we don't use the same name
-# that we are using for the .o file. Also, base the name on the expected
-# object file name, since that is what matters with a parallel build.
-lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
-while true; do
- if mkdir "$lockdir" >/dev/null 2>&1; then
- break
- fi
- sleep 1
-done
-# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir '$lockdir'; exit 1" 1 2 15
-
-# Run the compile.
-"$@"
-ret=$?
-
-if test -f "$cofile"; then
- test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
-elif test -f "${cofile}bj"; then
- test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
-fi
-
-rmdir "$lockdir"
-exit $ret
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'before-save-hook 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC0"
-# time-stamp-end: "; # UTC"
-# End:
+/usr/share/automake-1.16/compile
\ No newline at end of file
=====================================
config-msvc.h
=====================================
@@ -1,220 +1,13 @@
-/* config.h. Generated from config.h.in by configure. */
-/* config.h.in. Generated from configure.ac by autoheader. */
+/* ./config-msvc.h.in - manually maintained */
-/* depending on SQLite library version. */
-#define HAVE_DECL_SQLITE_CONFIG_URI 1
+/* Must be =64 in order to enable huge-file support. */
+#undef _FILE_OFFSET_BITS
-/* depending on SQLite library version. */
-#define HAVE_DECL_SQLITE_DBSTATUS_CACHE_HIT 1
+/* Must be defined in order to enable huge-file support. */
+#undef _LARGEFILE_SOURCE
-/* depending on SQLite library version. */
-#define HAVE_DECL_SQLITE_DBSTATUS_CACHE_MISS 1
+/* Must be defined in order to enable huge-file support. */
+#undef _LARGE_FILE
-/* depending on SQLite library version. */
-#define HAVE_DECL_SQLITE_DBSTATUS_CACHE_USED 1
-
-/* depending on SQLite library version. */
-/* #undef HAVE_DECL_SQLITE_DBSTATUS_CACHE_WRITE */
-
-/* depending on SQLite library version. */
-#define HAVE_DECL_SQLITE_DBSTATUS_LOOKASIDE_HIT 1
-
-/* depending on SQLite library version. */
-#define HAVE_DECL_SQLITE_DBSTATUS_LOOKASIDE_MISS_FULL 1
-
-/* depending on SQLite library version. */
-#define HAVE_DECL_SQLITE_DBSTATUS_LOOKASIDE_MISS_SIZE 1
-
-/* depending on SQLite library version. */
-#define HAVE_DECL_SQLITE_DBSTATUS_LOOKASIDE_USED 1
-
-/* depending on SQLite library version. */
-#define HAVE_DECL_SQLITE_DBSTATUS_SCHEMA_USED 1
-
-/* depending on SQLite library version. */
-#define HAVE_DECL_SQLITE_DBSTATUS_STMT_USED 1
-
-/* depending on SQLite library version. */
-#define HAVE_DECL_SQLITE_FCNTL_VFSNAME 1
-
-/* depending on SQLite library version. */
-#define HAVE_DECL_SQLITE_STMTSTATUS_AUTOINDEX 1
-
-/* depending on SQLite library version. */
-#define HAVE_DECL_SQLITE_STMTSTATUS_FULLSCAN_STEP 1
-
-/* depending on SQLite library version. */
-#define HAVE_DECL_SQLITE_STMTSTATUS_SORT 1
-
-/* depending on SQLite library version. */
-#define HAVE_DECL_SQLITE_TESTCTRL_EXPLAIN_STMT 1
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-/* #undef HAVE_DLFCN_H */
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#define HAVE_FCNTL_H 1
-
-/* Define to 1 if you have the `fdatasync' function. */
-/* #undef HAVE_FDATASYNC */
-
-/* Define to 1 if you have the <float.h> header file. */
-#define HAVE_FLOAT_H 1
-
-/* Define to 1 if you have the `ftruncate' function. */
-#define HAVE_FTRUNCATE 1
-
-/* Define to 1 if you have the <geos_c.h> header file. */
-#define HAVE_GEOS_C_H 1
-
-/* Define to 1 if you have the `getcwd' function. */
-#define HAVE_GETCWD 1
-
-/* Define to 1 if you have the `gettimeofday' function. */
-#define HAVE_GETTIMEOFDAY 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the `expat' library (-lexpat). */
-#define HAVE_LIBEXPAT 1
-
-/* Define to 1 if you have the `proj' library (-lproj). */
-#define HAVE_LIBPROJ 1
-
-/* Define to 1 if you have the `localtime_r' function. */
-/* #undef HAVE_LOCALTIME_R */
-
-/* Define to 1 if `lstat' has the bug that it succeeds when given the
- zero-length file name argument. */
-#define HAVE_LSTAT_EMPTY_STRING_BUG 1
-
-/* Define to 1 if you have the <math.h> header file. */
-#define HAVE_MATH_H 1
-
-/* Define to 1 if you have the `memmove' function. */
-#define HAVE_MEMMOVE 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the `memset' function. */
-#define HAVE_MEMSET 1
-
-/* Define to 1 if you have the `readline' function. */
-/* #undef HAVE_READLINE */
-
-/* Define to 1 if you have the `sqrt' function. */
-#define HAVE_SQRT 1
-
-/* Define to 1 if `stat' has the bug that it succeeds when given the
- zero-length file name argument. */
-/* #undef HAVE_STAT_EMPTY_STRING_BUG */
-
-/* Define to 1 if you have the <stddef.h> header file. */
-#define HAVE_STDDEF_H 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdio.h> header file. */
-#define HAVE_STDIO_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the `strcasecmp' function. */
-#define HAVE_STRCASECMP 1
-
-/* Define to 1 if you have the `strerror' function. */
-#define HAVE_STRERROR 1
-
-/* Define to 1 if you have the `strftime' function. */
-#define HAVE_STRFTIME 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the `strncasecmp' function. */
-#define HAVE_STRNCASECMP 1
-
-/* Define to 1 if you have the `strstr' function. */
-#define HAVE_STRSTR 1
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#define HAVE_SYS_TIME_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Define to 1 if `lstat' dereferences a symlink specified with a trailing
- slash. */
-/* #undef LSTAT_FOLLOWS_SLASHED_SYMLINK */
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
- */
-#define LT_OBJDIR ".libs/"
-
-/* Should be defined in order to disable FREEXL support. */
-/* #undef OMIT_FREEXL */
-
-/* Should be defined in order to disable ReadOSM support. */
-/* #undef OMIT_READOSM */
-
-/* Name of package */
-#define PACKAGE "spatialite-tools"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "a.furieri at lqt.it"
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "spatialite-tools"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "spatialite-tools 5.0.0"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "spatialite-tools"
-
-/* Define to the home page for this package. */
-#define PACKAGE_URL ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "5.0.0"
-
-/* must be defined when using libspatialite-amalgamation */
-/* #undef SPATIALITE_AMALGAMATION */
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-#define TIME_WITH_SYS_TIME 1
-
-/* Define to 1 if your <sys/time.h> declares `struct tm'. */
-/* #undef TM_IN_SYS_TIME */
-
-/* Version number of package */
-#define VERSION "5.0.0"
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
-
-/* Define to `long int' if <sys/types.h> does not define. */
-/* #undef off_t */
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-/* #undef size_t */
-
-/* Define to empty if the keyword `volatile' does not work. Warning: valid
- code using `volatile' can become incorrect without. Disable with care. */
-/* #undef volatile */
+/* includes gaiaconfig.h */
+#include <spatialite/gaiaconfig-msvc.h>
=====================================
config.h
=====================================
@@ -0,0 +1,232 @@
+/* config.h. Generated from config.h.in by configure. */
+/* config.h.in. Generated from configure.ac by autoheader. */
+
+/* depending on SQLite library version. */
+#define HAVE_DECL_SQLITE_CONFIG_URI 1
+
+/* depending on SQLite library version. */
+#define HAVE_DECL_SQLITE_DBSTATUS_CACHE_HIT 1
+
+/* depending on SQLite library version. */
+#define HAVE_DECL_SQLITE_DBSTATUS_CACHE_MISS 1
+
+/* depending on SQLite library version. */
+#define HAVE_DECL_SQLITE_DBSTATUS_CACHE_USED 1
+
+/* depending on SQLite library version. */
+#define HAVE_DECL_SQLITE_DBSTATUS_CACHE_WRITE 1
+
+/* depending on SQLite library version. */
+#define HAVE_DECL_SQLITE_DBSTATUS_LOOKASIDE_HIT 1
+
+/* depending on SQLite library version. */
+#define HAVE_DECL_SQLITE_DBSTATUS_LOOKASIDE_MISS_FULL 1
+
+/* depending on SQLite library version. */
+#define HAVE_DECL_SQLITE_DBSTATUS_LOOKASIDE_MISS_SIZE 1
+
+/* depending on SQLite library version. */
+#define HAVE_DECL_SQLITE_DBSTATUS_LOOKASIDE_USED 1
+
+/* depending on SQLite library version. */
+#define HAVE_DECL_SQLITE_DBSTATUS_SCHEMA_USED 1
+
+/* depending on SQLite library version. */
+#define HAVE_DECL_SQLITE_DBSTATUS_STMT_USED 1
+
+/* depending on SQLite library version. */
+#define HAVE_DECL_SQLITE_FCNTL_VFSNAME 1
+
+/* depending on SQLite library version. */
+#define HAVE_DECL_SQLITE_STMTSTATUS_AUTOINDEX 1
+
+/* depending on SQLite library version. */
+#define HAVE_DECL_SQLITE_STMTSTATUS_FULLSCAN_STEP 1
+
+/* depending on SQLite library version. */
+#define HAVE_DECL_SQLITE_STMTSTATUS_SORT 1
+
+/* depending on SQLite library version. */
+#define HAVE_DECL_SQLITE_TESTCTRL_EXPLAIN_STMT 1
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define to 1 if you have the <expat.h> header file. */
+#define HAVE_EXPAT_H 1
+
+/* Define to 1 if you have the <fcntl.h> header file. */
+#define HAVE_FCNTL_H 1
+
+/* Define to 1 if you have the `fdatasync' function. */
+#define HAVE_FDATASYNC 1
+
+/* Define to 1 if you have the <float.h> header file. */
+#define HAVE_FLOAT_H 1
+
+/* Define to 1 if you have the `ftruncate' function. */
+#define HAVE_FTRUNCATE 1
+
+/* Define to 1 if you have the `getcwd' function. */
+#define HAVE_GETCWD 1
+
+/* Define to 1 if you have the `gettimeofday' function. */
+#define HAVE_GETTIMEOFDAY 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the `expat' library (-lexpat). */
+#define HAVE_LIBEXPAT 1
+
+/* Define to 1 if you have the `sqlite3' library (-lsqlite3). */
+#define HAVE_LIBSQLITE3 1
+
+/* Define to 1 if you have the `localtime_r' function. */
+#define HAVE_LOCALTIME_R 1
+
+/* Define to 1 if `lstat' has the bug that it succeeds when given the
+ zero-length file name argument. */
+/* #undef HAVE_LSTAT_EMPTY_STRING_BUG */
+
+/* Define to 1 if you have the <math.h> header file. */
+#define HAVE_MATH_H 1
+
+/* Define to 1 if you have the `memmove' function. */
+#define HAVE_MEMMOVE 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the `memset' function. */
+#define HAVE_MEMSET 1
+
+/* Define to 1 if you have the `readline' function. */
+#define HAVE_READLINE 1
+
+/* Define to 1 if you have the <sqlite3ext.h> header file. */
+#define HAVE_SQLITE3EXT_H 1
+
+/* Define to 1 if you have the <sqlite3.h> header file. */
+#define HAVE_SQLITE3_H 1
+
+/* Define to 1 if you have the `sqrt' function. */
+/* #undef HAVE_SQRT */
+
+/* Define to 1 if `stat' has the bug that it succeeds when given the
+ zero-length file name argument. */
+/* #undef HAVE_STAT_EMPTY_STRING_BUG */
+
+/* Define to 1 if you have the <stddef.h> header file. */
+#define HAVE_STDDEF_H 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdio.h> header file. */
+#define HAVE_STDIO_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the `strcasecmp' function. */
+#define HAVE_STRCASECMP 1
+
+/* Define to 1 if you have the `strerror' function. */
+#define HAVE_STRERROR 1
+
+/* Define to 1 if you have the `strftime' function. */
+#define HAVE_STRFTIME 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the `strncasecmp' function. */
+#define HAVE_STRNCASECMP 1
+
+/* Define to 1 if you have the `strstr' function. */
+#define HAVE_STRSTR 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#define HAVE_SYS_TIME_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to 1 if `lstat' dereferences a symlink specified with a trailing
+ slash. */
+#define LSTAT_FOLLOWS_SLASHED_SYMLINK 1
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+ */
+#define LT_OBJDIR ".libs/"
+
+/* Should be defined in order to disable ReadOSM support. */
+/* #undef OMIT_READOSM */
+
+/* Name of package */
+#define PACKAGE "spatialite-tools"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "a.furieri at lqt.it"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "spatialite-tools"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "spatialite-tools 5.0.1-rc0"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "spatialite-tools"
+
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "5.0.1-rc0"
+
+/* must be defined when using libspatialite-amalgamation */
+/* #undef SPATIALITE_AMALGAMATION */
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+#define TIME_WITH_SYS_TIME 1
+
+/* Define to 1 if your <sys/time.h> declares `struct tm'. */
+/* #undef TM_IN_SYS_TIME */
+
+/* Version number of package */
+#define VERSION "5.0.1-rc0"
+
+/* Must be =64 in order to enable huge-file support. */
+#define _FILE_OFFSET_BITS 64
+
+/* Must be defined in order to enable huge-file support. */
+#define _LARGEFILE_SOURCE 1
+
+/* Must be defined in order to enable huge-file support. */
+#define _LARGE_FILE 1
+
+/* Define to empty if `const' does not conform to ANSI C. */
+/* #undef const */
+
+/* Define to `long int' if <sys/types.h> does not define. */
+/* #undef off_t */
+
+/* Define to `unsigned int' if <sys/types.h> does not define. */
+/* #undef size_t */
+
+/* Define to empty if the keyword `volatile' does not work. Warning: valid
+ code using `volatile' can become incorrect without. Disable with care. */
+/* #undef volatile */
=====================================
config.h.in
=====================================
@@ -1,14 +1,5 @@
/* config.h.in. Generated from configure.ac by autoheader. */
-/* Should be defined in order to enable LIBXML2 support. */
-#undef ENABLE_LIBXML2
-
-/* Should be defined in order to enable MiniZIP support. */
-#undef ENABLE_MINIZIP
-
-/* Should be defined in order to enable RTTOPO support. */
-#undef ENABLE_RTTOPO
-
/* depending on SQLite library version. */
#undef HAVE_DECL_SQLITE_CONFIG_URI
@@ -75,9 +66,6 @@
/* Define to 1 if you have the `ftruncate' function. */
#undef HAVE_FTRUNCATE
-/* Define to 1 if you have the <geos_c.h> header file. */
-#undef HAVE_GEOS_C_H
-
/* Define to 1 if you have the `getcwd' function. */
#undef HAVE_GETCWD
@@ -112,15 +100,6 @@
/* Define to 1 if you have the `memset' function. */
#undef HAVE_MEMSET
-/* Define to 1 if you have the <minizip/unzip.h> header file. */
-#undef HAVE_MINIZIP_UNZIP_H
-
-/* Define to 1 if you have the <proj_api.h> header file. */
-#undef HAVE_PROJ_API_H
-
-/* Define to 1 if you have the <proj.h> header file. */
-#undef HAVE_PROJ_H
-
/* Define to 1 if you have the `readline' function. */
#undef HAVE_READLINE
@@ -190,9 +169,6 @@
*/
#undef LT_OBJDIR
-/* Should be defined in order to disable FREEXL support. */
-#undef OMIT_FREEXL
-
/* Should be defined in order to disable ReadOSM support. */
#undef OMIT_READOSM
@@ -217,9 +193,6 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
-/* Should be defined in order to enable PROJ.6 support. */
-#undef PROJ_NEW
-
/* must be defined when using libspatialite-amalgamation */
#undef SPATIALITE_AMALGAMATION
@@ -235,6 +208,15 @@
/* Version number of package */
#undef VERSION
+/* Must be =64 in order to enable huge-file support. */
+#undef _FILE_OFFSET_BITS
+
+/* Must be defined in order to enable huge-file support. */
+#undef _LARGEFILE_SOURCE
+
+/* Must be defined in order to enable huge-file support. */
+#undef _LARGE_FILE
+
/* Define to empty if `const' does not conform to ANSI C. */
#undef const
=====================================
configure
=====================================
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for spatialite-tools 5.0.0.
+# Generated by GNU Autoconf 2.69 for spatialite-tools 5.0.1-rc0.
#
# Report bugs to <a.furieri at lqt.it>.
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='spatialite-tools'
PACKAGE_TARNAME='spatialite-tools'
-PACKAGE_VERSION='5.0.0'
-PACKAGE_STRING='spatialite-tools 5.0.0'
+PACKAGE_VERSION='5.0.1-rc0'
+PACKAGE_STRING='spatialite-tools 5.0.1-rc0'
PACKAGE_BUGREPORT='a.furieri at lqt.it'
PACKAGE_URL=''
@@ -634,24 +634,17 @@ ac_includes_default="\
ac_subst_vars='am__EXEEXT_FALSE
am__EXEEXT_TRUE
LTLIBOBJS
-RTTOPO_LIBS
-RTTOPO_CFLAGS
LIBXML2_LIBS
LIBXML2_CFLAGS
-NO_READOSM_FALSE
-NO_READOSM_TRUE
+READOSM_FALSE
+READOSM_TRUE
LIBREADOSM_CFLAGS
LIBREADOSM_LIBS
-LIBFREEXL_LIBS
-LIBFREEXL_CFLAGS
LIBSPATIALITE_LIBS
LIBSPATIALITE_CFLAGS
PKG_CONFIG_LIBDIR
PKG_CONFIG_PATH
PKG_CONFIG
-GEOS_CPPFLAGS
-GEOS_LDFLAGS
-GEOSCONFIG
READLINE_LIBS
LIBOBJS
CXXCPP
@@ -791,12 +784,7 @@ with_gnu_ld
with_sysroot
enable_libtool_lock
enable_readline
-with_geosconfig
-enable_freexl
enable_readosm
-enable_libxml2
-enable_minizip
-enable_rttopo
'
ac_precious_vars='build_alias
host_alias
@@ -816,14 +804,10 @@ PKG_CONFIG_PATH
PKG_CONFIG_LIBDIR
LIBSPATIALITE_CFLAGS
LIBSPATIALITE_LIBS
-LIBFREEXL_CFLAGS
-LIBFREEXL_LIBS
LIBREADOSM_CFLAGS
LIBREADOSM_LIBS
LIBXML2_CFLAGS
-LIBXML2_LIBS
-RTTOPO_CFLAGS
-RTTOPO_LIBS'
+LIBXML2_LIBS'
# Initialize some variables set by options.
@@ -1364,7 +1348,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures spatialite-tools 5.0.0 to adapt to many kinds of systems.
+\`configure' configures spatialite-tools 5.0.1-rc0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1435,7 +1419,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of spatialite-tools 5.0.0:";;
+ short | recursive ) echo "Configuration of spatialite-tools 5.0.1-rc0:";;
esac
cat <<\_ACEOF
@@ -1458,11 +1442,7 @@ Optional Features:
optimize for fast installation [default=yes]
--disable-libtool-lock avoid locking (might break parallel builds)
--enable-readline use readline in shell tool (yes, no) [default=yes]
- --enable-freexl enables FreeXL inclusion [default=yes]
--enable-readosm enables ReadOSM inclusion [default=yes]
- --enable-libxml2 enables libxml2 inclusion [default=yes]
- --enable-minizip enables MiniZIP inclusion [default=yes]
- --enable-rttopo enables librttopo inclusion [default=yes]
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@ -1472,7 +1452,6 @@ Optional Packages:
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
--with-sysroot=DIR Search for dependent libraries within DIR
(or the compiler's sysroot if not specified).
- --with-geosconfig=FILE specify an alternative geos-config file
Some influential environment variables:
CC C compiler command
@@ -1495,10 +1474,6 @@ Some influential environment variables:
C compiler flags for LIBSPATIALITE, overriding pkg-config
LIBSPATIALITE_LIBS
linker flags for LIBSPATIALITE, overriding pkg-config
- LIBFREEXL_CFLAGS
- C compiler flags for LIBFREEXL, overriding pkg-config
- LIBFREEXL_LIBS
- linker flags for LIBFREEXL, overriding pkg-config
LIBREADOSM_CFLAGS
C compiler flags for LIBREADOSM, overriding pkg-config
LIBREADOSM_LIBS
@@ -1507,9 +1482,6 @@ Some influential environment variables:
C compiler flags for LIBXML2, overriding pkg-config
LIBXML2_LIBS
linker flags for LIBXML2, overriding pkg-config
- RTTOPO_CFLAGS
- C compiler flags for RTTOPO, overriding pkg-config
- RTTOPO_LIBS linker flags for RTTOPO, overriding pkg-config
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
@@ -1577,7 +1549,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-spatialite-tools configure 5.0.0
+spatialite-tools configure 5.0.1-rc0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2167,7 +2139,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by spatialite-tools $as_me 5.0.0, which was
+It was created by spatialite-tools $as_me 5.0.1-rc0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3038,7 +3010,7 @@ fi
# Define the identity of the package.
PACKAGE='spatialite-tools'
- VERSION='5.0.0'
+ VERSION='5.0.1-rc0'
cat >>confdefs.h <<_ACEOF
@@ -3157,12 +3129,18 @@ fi
ac_config_headers="$ac_config_headers config.h"
-# supporting SPATIALITE_AMALGAMATION
+# enabling huge-file support (64 bit file pointers)
+$as_echo "#define _LARGE_FILE 1" >>confdefs.h
+$as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h
+$as_echo "#define _LARGEFILE_SOURCE 1" >>confdefs.h
+
+
+# supporting SPATIALITE_AMALGAMATION
@@ -17547,310 +17525,6 @@ else
fi
-for ac_header in proj.h
-do :
- ac_fn_c_check_header_mongrel "$LINENO" "proj.h" "ac_cv_header_proj_h" "$ac_includes_default"
-if test "x$ac_cv_header_proj_h" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_PROJ_H 1
-_ACEOF
- proj_new_incl=1
-else
- for ac_header in proj_api.h
-do :
- ac_fn_c_check_header_mongrel "$LINENO" "proj_api.h" "ac_cv_header_proj_api_h" "$ac_includes_default"
-if test "x$ac_cv_header_proj_api_h" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_PROJ_API_H 1
-_ACEOF
- proj_new_incl=0
-else
- as_fn_error $? "cannot find proj_api.h, bailing out" "$LINENO" 5
-fi
-
-done
-
-fi
-
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing proj_normalize_for_visualization" >&5
-$as_echo_n "checking for library containing proj_normalize_for_visualization... " >&6; }
-if ${ac_cv_search_proj_normalize_for_visualization+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char proj_normalize_for_visualization ();
-int
-main ()
-{
-return proj_normalize_for_visualization ();
- ;
- return 0;
-}
-_ACEOF
-for ac_lib in '' proj; do
- if test -z "$ac_lib"; then
- ac_res="none required"
- else
- ac_res=-l$ac_lib
- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
- fi
- if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_search_proj_normalize_for_visualization=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext
- if ${ac_cv_search_proj_normalize_for_visualization+:} false; then :
- break
-fi
-done
-if ${ac_cv_search_proj_normalize_for_visualization+:} false; then :
-
-else
- ac_cv_search_proj_normalize_for_visualization=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_proj_normalize_for_visualization" >&5
-$as_echo "$ac_cv_search_proj_normalize_for_visualization" >&6; }
-ac_res=$ac_cv_search_proj_normalize_for_visualization
-if test "$ac_res" != no; then :
- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
- proj_new_lib=1
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pj_init_plus" >&5
-$as_echo_n "checking for library containing pj_init_plus... " >&6; }
-if ${ac_cv_search_pj_init_plus+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char pj_init_plus ();
-int
-main ()
-{
-return pj_init_plus ();
- ;
- return 0;
-}
-_ACEOF
-for ac_lib in '' proj; do
- if test -z "$ac_lib"; then
- ac_res="none required"
- else
- ac_res=-l$ac_lib
- LIBS="-l$ac_lib -lm -lpthread -lsqlite3 $ac_func_search_save_LIBS"
- fi
- if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_search_pj_init_plus=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext
- if ${ac_cv_search_pj_init_plus+:} false; then :
- break
-fi
-done
-if ${ac_cv_search_pj_init_plus+:} false; then :
-
-else
- ac_cv_search_pj_init_plus=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_pj_init_plus" >&5
-$as_echo "$ac_cv_search_pj_init_plus" >&6; }
-ac_res=$ac_cv_search_pj_init_plus
-if test "$ac_res" != no; then :
- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
- proj_new_lib=0
-else
- as_fn_error $? "'libproj' is required but it doesn't seem to be installed on this system." "$LINENO" 5
-fi
-
-fi
-
-if test $proj_new_incl -eq 1 && test $proj_new_lib -eq 1; then
- $as_echo "#define PROJ_NEW 1" >>confdefs.h
-
-fi
-
-#-----------------------------------------------------------------------
-# --with-geosconfig
-#
-
-# Check whether --with-geosconfig was given.
-if test "${with_geosconfig+set}" = set; then :
- withval=$with_geosconfig; GEOSCONFIG="$withval"
-else
- GEOSCONFIG=""
-fi
-
-if test "x$GEOSCONFIG" = "x"; then
- # GEOSCONFIG was not specified, so search within the current path
- # Extract the first word of "geos-config", so it can be a program name with args.
-set dummy geos-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_GEOSCONFIG+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $GEOSCONFIG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_GEOSCONFIG="$GEOSCONFIG" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_GEOSCONFIG="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-GEOSCONFIG=$ac_cv_path_GEOSCONFIG
-if test -n "$GEOSCONFIG"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GEOSCONFIG" >&5
-$as_echo "$GEOSCONFIG" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- # If we couldn't find geos-config, display an error
- if test "x$GEOSCONFIG" = "x"; then
- as_fn_error $? "could not find geos-config within the current path. You may need to try re-running configure with a --with-geosconfig parameter." "$LINENO" 5
- fi
-else
- # GEOSCONFIG was specified; display a message to the user
- if test "x$GEOSCONFIG" = "xyes"; then
- as_fn_error $? "you must specify a parameter to --with-geosconfig, e.g. --with-geosconfig=/path/to/geos-config" "$LINENO" 5
- else
- if test -f $GEOSCONFIG; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using user-specified geos-config file: $GEOSCONFIG" >&5
-$as_echo "Using user-specified geos-config file: $GEOSCONFIG" >&6; }
- else
- as_fn_error $? "the user-specified geos-config file $GEOSCONFIG does not exist" "$LINENO" 5
- fi
- fi
-fi
-# Extract the linker and include flags
-GEOS_LDFLAGS=`$GEOSCONFIG --ldflags`
-GEOS_CPPFLAGS=-I`$GEOSCONFIG --includes`
-
-
-# Ensure that we can parse geos_c.h
-CPPFLAGS_SAVE="$CPPFLAGS"
-CPPFLAGS="$GEOS_CPPFLAGS"
-for ac_header in geos_c.h
-do :
- ac_fn_c_check_header_mongrel "$LINENO" "geos_c.h" "ac_cv_header_geos_c_h" "$ac_includes_default"
-if test "x$ac_cv_header_geos_c_h" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_GEOS_C_H 1
-_ACEOF
-
-else
- as_fn_error $? "could not find geos_c.h - you may need to specify the directory of a geos-config file using --with-geosconfig" "$LINENO" 5
-fi
-
-done
-
-CPPFLAGS="$CPPFLAGS_SAVE"
-# Ensure we can link against libgeos_c
-LIBS_SAVE="$LIBS"
-LIBS="$GEOS_LDFLAGS"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing GEOSTopologyPreserveSimplify" >&5
-$as_echo_n "checking for library containing GEOSTopologyPreserveSimplify... " >&6; }
-if ${ac_cv_search_GEOSTopologyPreserveSimplify+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char GEOSTopologyPreserveSimplify ();
-int
-main ()
-{
-return GEOSTopologyPreserveSimplify ();
- ;
- return 0;
-}
-_ACEOF
-for ac_lib in '' geos_c; do
- if test -z "$ac_lib"; then
- ac_res="none required"
- else
- ac_res=-l$ac_lib
- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
- fi
- if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_search_GEOSTopologyPreserveSimplify=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext
- if ${ac_cv_search_GEOSTopologyPreserveSimplify+:} false; then :
- break
-fi
-done
-if ${ac_cv_search_GEOSTopologyPreserveSimplify+:} false; then :
-
-else
- ac_cv_search_GEOSTopologyPreserveSimplify=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_GEOSTopologyPreserveSimplify" >&5
-$as_echo "$ac_cv_search_GEOSTopologyPreserveSimplify" >&6; }
-ac_res=$ac_cv_search_GEOSTopologyPreserveSimplify
-if test "$ac_res" != no; then :
- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-else
- as_fn_error $? "could not find libgeos_c - you may need to specify the directory of a geos-config file using --with-geosconfig" "$LINENO" 5
-fi
-
-LIBS="$LIBS_SAVE"
-LIBS=$LIBS$GEOS_LDFLAGS' -lgeos_c'
-
@@ -18050,95 +17724,6 @@ if test "x$(pkg-config --cflags spatialite|grep "DSPATIALITE_AMALGAMATION=1")" !
fi
-#-----------------------------------------------------------------------
-# --enable-freexl
-#
-# Check whether --enable-freexl was given.
-if test "${enable_freexl+set}" = set; then :
- enableval=$enable_freexl;
-else
- enable_freexl=yes
-fi
-
-if test x"$enable_freexl" != "xno"; then
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBFREEXL" >&5
-$as_echo_n "checking for LIBFREEXL... " >&6; }
-
-if test -n "$LIBFREEXL_CFLAGS"; then
- pkg_cv_LIBFREEXL_CFLAGS="$LIBFREEXL_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freexl\""; } >&5
- ($PKG_CONFIG --exists --print-errors "freexl") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_LIBFREEXL_CFLAGS=`$PKG_CONFIG --cflags "freexl" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-if test -n "$LIBFREEXL_LIBS"; then
- pkg_cv_LIBFREEXL_LIBS="$LIBFREEXL_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freexl\""; } >&5
- ($PKG_CONFIG --exists --print-errors "freexl") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_LIBFREEXL_LIBS=`$PKG_CONFIG --libs "freexl" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
- LIBFREEXL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "freexl" 2>&1`
- else
- LIBFREEXL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "freexl" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$LIBFREEXL_PKG_ERRORS" >&5
-
- as_fn_error $? "'libfreexl' is required but it doesn't seem to be installed on this system." "$LINENO" 5
-elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- as_fn_error $? "'libfreexl' is required but it doesn't seem to be installed on this system." "$LINENO" 5
-else
- LIBFREEXL_CFLAGS=$pkg_cv_LIBFREEXL_CFLAGS
- LIBFREEXL_LIBS=$pkg_cv_LIBFREEXL_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
-
-
-else
- $as_echo "#define OMIT_FREEXL 1" >>confdefs.h
-
-fi
-
#-----------------------------------------------------------------------
# --enable-readosm
#
@@ -18284,29 +17869,16 @@ fi
else
$as_echo "#define OMIT_READOSM 1" >>confdefs.h
- NOREADOSM="true"
fi
-
- if test "$NOREADOSM" = "true"; then
- NO_READOSM_TRUE=
- NO_READOSM_FALSE='#'
+ if test x$readosm = xtrue; then
+ READOSM_TRUE=
+ READOSM_FALSE='#'
else
- NO_READOSM_TRUE='#'
- NO_READOSM_FALSE=
+ READOSM_TRUE='#'
+ READOSM_FALSE=
fi
-#-----------------------------------------------------------------------
-# --enable-libxml2
-#
-# Check whether --enable-libxml2 was given.
-if test "${enable_libxml2+set}" = set; then :
- enableval=$enable_libxml2;
-else
- enable_libxml2=yes
-fi
-
-if test x"$enable_libxml2" != "xno"; then
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBXML2" >&5
@@ -18380,184 +17952,6 @@ $as_echo "yes" >&6; }
fi
- $as_echo "#define ENABLE_LIBXML2 1" >>confdefs.h
-
-fi
-
-#-----------------------------------------------------------------------
-# --enable-minizip
-#
-# Check whether --enable-minizip was given.
-if test "${enable_minizip+set}" = set; then :
- enableval=$enable_minizip;
-else
- enable_minizip=yes
-fi
-
-if test x"$enable_minizip" != "xno"; then
- for ac_header in minizip/unzip.h
-do :
- ac_fn_c_check_header_mongrel "$LINENO" "minizip/unzip.h" "ac_cv_header_minizip_unzip_h" "$ac_includes_default"
-if test "x$ac_cv_header_minizip_unzip_h" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_MINIZIP_UNZIP_H 1
-_ACEOF
-
-else
- as_fn_error $? "cannot find minizip/unzip.h, bailing out" "$LINENO" 5
-fi
-
-done
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing unzLocateFile" >&5
-$as_echo_n "checking for library containing unzLocateFile... " >&6; }
-if ${ac_cv_search_unzLocateFile+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char unzLocateFile ();
-int
-main ()
-{
-return unzLocateFile ();
- ;
- return 0;
-}
-_ACEOF
-for ac_lib in '' minizip; do
- if test -z "$ac_lib"; then
- ac_res="none required"
- else
- ac_res=-l$ac_lib
- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
- fi
- if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_search_unzLocateFile=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext
- if ${ac_cv_search_unzLocateFile+:} false; then :
- break
-fi
-done
-if ${ac_cv_search_unzLocateFile+:} false; then :
-
-else
- ac_cv_search_unzLocateFile=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_unzLocateFile" >&5
-$as_echo "$ac_cv_search_unzLocateFile" >&6; }
-ac_res=$ac_cv_search_unzLocateFile
-if test "$ac_res" != no; then :
- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-else
- as_fn_error $? "'libminizip' is required but it doesn't seem to be installed on this system." "$LINENO" 5
-fi
-
- $as_echo "#define ENABLE_MINIZIP 1" >>confdefs.h
-
-fi
-
-#-----------------------------------------------------------------------
-# --enable-rttopo
-#
-# Check whether --enable-rttopo was given.
-if test "${enable_rttopo+set}" = set; then :
- enableval=$enable_rttopo;
-else
- enable_rttopo=yes
-fi
-
-if test x"$enable_rttopo" != "xno"; then
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for RTTOPO" >&5
-$as_echo_n "checking for RTTOPO... " >&6; }
-
-if test -n "$RTTOPO_CFLAGS"; then
- pkg_cv_RTTOPO_CFLAGS="$RTTOPO_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"rttopo\""; } >&5
- ($PKG_CONFIG --exists --print-errors "rttopo") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_RTTOPO_CFLAGS=`$PKG_CONFIG --cflags "rttopo" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-if test -n "$RTTOPO_LIBS"; then
- pkg_cv_RTTOPO_LIBS="$RTTOPO_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"rttopo\""; } >&5
- ($PKG_CONFIG --exists --print-errors "rttopo") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_RTTOPO_LIBS=`$PKG_CONFIG --libs "rttopo" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
- RTTOPO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "rttopo" 2>&1`
- else
- RTTOPO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "rttopo" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$RTTOPO_PKG_ERRORS" >&5
-
- as_fn_error $? "'librttopo' is required but it doesn't seem to be installed on this system." "$LINENO" 5
-elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- as_fn_error $? "'librttopo' is required but it doesn't seem to be installed on this system." "$LINENO" 5
-else
- RTTOPO_CFLAGS=$pkg_cv_RTTOPO_CFLAGS
- RTTOPO_LIBS=$pkg_cv_RTTOPO_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
-
-
- $as_echo "#define ENABLE_RTTOPO 1" >>confdefs.h
-
-fi
# checks for SQLite version-depending constants
ac_fn_c_check_decl "$LINENO" "SQLITE_CONFIG_URI" "ac_cv_have_decl_SQLITE_CONFIG_URI" "#include <sqlite3.h>
@@ -18817,8 +18211,8 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${NO_READOSM_TRUE}" && test -z "${NO_READOSM_FALSE}"; then
- as_fn_error $? "conditional \"NO_READOSM\" was never defined.
+if test -z "${READOSM_TRUE}" && test -z "${READOSM_FALSE}"; then
+ as_fn_error $? "conditional \"READOSM\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
@@ -19218,7 +18612,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by spatialite-tools $as_me 5.0.0, which was
+This file was extended by spatialite-tools $as_me 5.0.1-rc0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -19284,7 +18678,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-spatialite-tools config.status 5.0.0
+spatialite-tools config.status 5.0.1-rc0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -20473,7 +19867,9 @@ $as_echo X/"$am_mf" |
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "Something went wrong bootstrapping makefile fragments
- for automatic dependency tracking. Try re-running configure with the
+ for automatic dependency tracking. If GNU make was not used, consider
+ re-running the configure script with MAKE=\"gmake\" (or whatever is
+ necessary). You can also try re-running configure with the
'--disable-dependency-tracking' option to at least be able to build
the package (albeit without support for automatic dependency tracking).
See \`config.log' for more details" "$LINENO" 5; }
=====================================
configure.ac
=====================================
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.61)
-AC_INIT(spatialite-tools, 5.0.0, a.furieri at lqt.it)
+AC_INIT(spatialite-tools, 5.0.1-rc0, a.furieri at lqt.it)
AC_LANG(C)
AC_CONFIG_MACRO_DIR([m4])
@@ -10,21 +10,22 @@ AM_INIT_AUTOMAKE
AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
+# enabling huge-file support (64 bit file pointers)
+AH_TEMPLATE([_LARGE_FILE],
+ [Must be defined in order to enable huge-file support.])
+AC_DEFINE(_LARGE_FILE)
+AH_TEMPLATE([_FILE_OFFSET_BITS],
+ [Must be =64 in order to enable huge-file support.])
+AC_DEFINE(_FILE_OFFSET_BITS, 64)
+AH_TEMPLATE([_LARGEFILE_SOURCE],
+ [Must be defined in order to enable huge-file support.])
+AC_DEFINE(_LARGEFILE_SOURCE)
+
# supporting SPATIALITE_AMALGAMATION
AH_TEMPLATE([SPATIALITE_AMALGAMATION],
[must be defined when using libspatialite-amalgamation])
-AH_TEMPLATE([OMIT_FREEXL],
- [Should be defined in order to disable FREEXL support.])
AH_TEMPLATE([OMIT_READOSM],
[Should be defined in order to disable ReadOSM support.])
-AH_TEMPLATE([ENABLE_LIBXML2],
- [Should be defined in order to enable LIBXML2 support.])
-AH_TEMPLATE([ENABLE_MINIZIP],
- [Should be defined in order to enable MiniZIP support.])
-AH_TEMPLATE([ENABLE_RTTOPO],
- [Should be defined in order to enable RTTOPO support.])
-AH_TEMPLATE([PROJ_NEW],
- [Should be defined in order to enable PROJ.6 support.])
AH_TEMPLATE([HAVE_DECL_SQLITE_CONFIG_URI],
[depending on SQLite library version.])
AH_TEMPLATE([HAVE_DECL_SQLITE_DBSTATUS_LOOKASIDE_USED],
@@ -128,56 +129,6 @@ AC_SUBST(READLINE_LIBS)
AC_CHECK_HEADERS(expat.h,, [AC_MSG_ERROR([cannot find expat.h, bailing out])])
AC_CHECK_LIB(expat,XML_ParserCreate,,AC_MSG_ERROR(['expat' is required but it doesn't seem to be installed on this system.]))
-AC_CHECK_HEADERS(proj.h, [proj_new_incl=1],
- [AC_CHECK_HEADERS(proj_api.h, [proj_new_incl=0], [AC_MSG_ERROR([cannot find proj_api.h, bailing out])])])
-AC_SEARCH_LIBS(proj_normalize_for_visualization, proj, [proj_new_lib=1],
- [AC_SEARCH_LIBS(pj_init_plus, proj, [proj_new_lib=0], [AC_MSG_ERROR(['libproj' is required but it doesn't seem to be installed on this system.])], [-lm -lpthread -lsqlite3])])
-if test $proj_new_incl -eq 1 && test $proj_new_lib -eq 1; then
- AC_DEFINE(PROJ_NEW)
-fi
-
-#-----------------------------------------------------------------------
-# --with-geosconfig
-#
-AC_ARG_WITH([geosconfig],
- [AS_HELP_STRING([--with-geosconfig=FILE], [specify an alternative geos-config file])],
- [GEOSCONFIG="$withval"], [GEOSCONFIG=""])
-if test "x$GEOSCONFIG" = "x"; then
- # GEOSCONFIG was not specified, so search within the current path
- AC_PATH_PROG([GEOSCONFIG], [geos-config])
- # If we couldn't find geos-config, display an error
- if test "x$GEOSCONFIG" = "x"; then
- AC_MSG_ERROR([could not find geos-config within the current path. You may need to try re-running configure with a --with-geosconfig parameter.])
- fi
-else
- # GEOSCONFIG was specified; display a message to the user
- if test "x$GEOSCONFIG" = "xyes"; then
- AC_MSG_ERROR([you must specify a parameter to --with-geosconfig, e.g. --with-geosconfig=/path/to/geos-config])
- else
- if test -f $GEOSCONFIG; then
- AC_MSG_RESULT([Using user-specified geos-config file: $GEOSCONFIG])
- else
- AC_MSG_ERROR([the user-specified geos-config file $GEOSCONFIG does not exist])
- fi
- fi
-fi
-# Extract the linker and include flags
-GEOS_LDFLAGS=`$GEOSCONFIG --ldflags`
-GEOS_CPPFLAGS=-I`$GEOSCONFIG --includes`
-AC_SUBST([GEOS_LDFLAGS])
-AC_SUBST([GEOS_CPPFLAGS])
-# Ensure that we can parse geos_c.h
-CPPFLAGS_SAVE="$CPPFLAGS"
-CPPFLAGS="$GEOS_CPPFLAGS"
-AC_CHECK_HEADERS([geos_c.h],, [AC_MSG_ERROR([could not find geos_c.h - you may need to specify the directory of a geos-config file using --with-geosconfig])])
-CPPFLAGS="$CPPFLAGS_SAVE"
-# Ensure we can link against libgeos_c
-LIBS_SAVE="$LIBS"
-LIBS="$GEOS_LDFLAGS"
-AC_SEARCH_LIBS(GEOSTopologyPreserveSimplify,geos_c,,AC_MSG_ERROR([could not find libgeos_c - you may need to specify the directory of a geos-config file using --with-geosconfig]))
-LIBS="$LIBS_SAVE"
-LIBS=$LIBS$GEOS_LDFLAGS' -lgeos_c'
-
PKG_CHECK_MODULES([LIBSPATIALITE], [spatialite], , AC_MSG_ERROR(['libspatialite' is required but it doesn't seem to be installed on this system.]))
AC_SUBST(LIBSPATIALITE_CFLAGS)
# testing for libspatialite-amalgamation
@@ -186,20 +137,6 @@ if test "x$(pkg-config --cflags spatialite|grep "DSPATIALITE_AMALGAMATION=1")" !
fi
AC_SUBST(LIBSPATIALITE_LIBS)
-#-----------------------------------------------------------------------
-# --enable-freexl
-#
-AC_ARG_ENABLE(freexl, [AS_HELP_STRING(
- [--enable-freexl], [enables FreeXL inclusion [default=yes]])],
- [], [enable_freexl=yes])
-if test x"$enable_freexl" != "xno"; then
- PKG_CHECK_MODULES([LIBFREEXL], [freexl], , AC_MSG_ERROR(['libfreexl' is required but it doesn't seem to be installed on this system.]))
- AC_SUBST(LIBFREEXL_CFLAGS)
- AC_SUBST(LIBFREEXL_LIBS)
-else
- AC_DEFINE(OMIT_FREEXL)
-fi
-
#-----------------------------------------------------------------------
# --enable-readosm
#
@@ -213,48 +150,12 @@ if test x"$enable_readosm" != "xno"; then
AC_SUBST(LIBREADOSM_LIBS)
else
AC_DEFINE(OMIT_READOSM)
- NOREADOSM="true"
fi
+AM_CONDITIONAL([READOSM], [test x$readosm = xtrue])
-AM_CONDITIONAL([NO_READOSM], [test "$NOREADOSM" = "true"])
-
-#-----------------------------------------------------------------------
-# --enable-libxml2
-#
-AC_ARG_ENABLE(libxml2, [AS_HELP_STRING(
- [--enable-libxml2], [enables libxml2 inclusion [default=yes]])],
- [], [enable_libxml2=yes])
-if test x"$enable_libxml2" != "xno"; then
- PKG_CHECK_MODULES([LIBXML2], [libxml-2.0], , AC_MSG_ERROR(['libxml2' is required but it doesn't seem to be installed on this system.]))
- AC_SUBST(LIBXML2_CFLAGS)
- AC_SUBST(LIBXML2_LIBS)
- AC_DEFINE(ENABLE_LIBXML2)
-fi
-
-#-----------------------------------------------------------------------
-# --enable-minizip
-#
-AC_ARG_ENABLE(minizip, [AS_HELP_STRING(
- [--enable-minizip], [enables MiniZIP inclusion [default=yes]])],
- [], [enable_minizip=yes])
-if test x"$enable_minizip" != "xno"; then
- AC_CHECK_HEADERS(minizip/unzip.h,, [AC_MSG_ERROR([cannot find minizip/unzip.h, bailing out])])
- AC_SEARCH_LIBS(unzLocateFile, minizip,,AC_MSG_ERROR(['libminizip' is required but it doesn't seem to be installed on this system.]))
- AC_DEFINE(ENABLE_MINIZIP)
-fi
-
-#-----------------------------------------------------------------------
-# --enable-rttopo
-#
-AC_ARG_ENABLE(rttopo, [AS_HELP_STRING(
- [--enable-rttopo], [enables librttopo inclusion [default=yes]])],
- [], [enable_rttopo=yes])
-if test x"$enable_rttopo" != "xno"; then
- PKG_CHECK_MODULES([RTTOPO], [rttopo], , AC_MSG_ERROR(['librttopo' is required but it doesn't seem to be installed on this system.]))
- AC_SUBST(RTTOPO_CFLAGS)
- AC_SUBST(RTTOPO_LIBS)
- AC_DEFINE(ENABLE_RTTOPO)
-fi
+PKG_CHECK_MODULES([LIBXML2], [libxml-2.0], , AC_MSG_ERROR(['libxml2' is required but it doesn't seem to be installed on this system.]))
+AC_SUBST(LIBXML2_CFLAGS)
+AC_SUBST(LIBXML2_LIBS)
# checks for SQLite version-depending constants
AC_CHECK_DECL([SQLITE_CONFIG_URI],
=====================================
exif_loader.c
=====================================
@@ -1445,7 +1445,7 @@ do_version ()
/* printing version infos */
fprintf( stderr, "\nVersion infos\n");
fprintf( stderr, "===========================================\n");
- fprintf (stderr, "exif_loader .: %s\n", VERSION);
+ fprintf (stderr, "exif_loader .: %s\n", SPATIALITE_VERSION);
fprintf (stderr, "target CPU ..: %s\n", spatialite_target_cpu ());
fprintf (stderr, "libspatialite: %s\n", spatialite_version ());
fprintf (stderr, "libsqlite3 ..: %s\n", sqlite3_libversion ());
=====================================
shp_doctor.c
=====================================
@@ -1475,7 +1475,7 @@ do_version ()
/* printing version infos */
fprintf( stderr, "\nVersion infos\n");
fprintf( stderr, "===========================================\n");
- fprintf (stderr, "shp_doctor ..: %s\n", VERSION);
+ fprintf (stderr, "shp_doctor ..: %s\n", SPATIALITE_VERSION);
fprintf (stderr, "target CPU ..: %s\n", spatialite_target_cpu ());
fprintf (stderr, "libspatialite: %s\n", spatialite_version ());
fprintf (stderr, "libsqlite3 ..: %s\n", sqlite3_libversion ());
=====================================
shp_sanitize.c
=====================================
@@ -4136,7 +4136,7 @@ do_version ()
/* printing version infos */
fprintf( stderr, "\nVersion infos\n");
fprintf( stderr, "===========================================\n");
- fprintf (stderr, "shp_sanitize : %s\n", VERSION);
+ fprintf (stderr, "shp_sanitize : %s\n", SPATIALITE_VERSION);
fprintf (stderr, "target CPU ..: %s\n", spatialite_target_cpu ());
fprintf (stderr, "libspatialite: %s\n", spatialite_version ());
fprintf (stderr, "libsqlite3 ..: %s\n", sqlite3_libversion ());
=====================================
spatialite_dxf.c
=====================================
@@ -112,7 +112,7 @@ do_version ()
/* printing version infos */
fprintf( stderr, "\nVersion infos\n");
fprintf( stderr, "===========================================\n");
- fprintf (stderr, "spatialite_dxf: %s\n", VERSION);
+ fprintf (stderr, "spatialite_dxf: %s\n", SPATIALITE_VERSION);
fprintf (stderr, "target CPU ...: %s\n", spatialite_target_cpu ());
fprintf (stderr, "libspatialite : %s\n", spatialite_version ());
fprintf (stderr, "libsqlite3 ...: %s\n", sqlite3_libversion ());
=====================================
spatialite_gml.c
=====================================
@@ -1588,7 +1588,7 @@ do_version ()
XML_Expat_Version expat;
fprintf( stderr, "\nVersion infos\n");
fprintf( stderr, "===========================================\n");
- fprintf (stderr, "spatialite_gml: %s\n", VERSION);
+ fprintf (stderr, "spatialite_gml: %s\n", SPATIALITE_VERSION);
fprintf (stderr, "target CPU ...: %s\n", spatialite_target_cpu ());
fprintf (stderr, "libspatialite : %s\n", spatialite_version ());
fprintf (stderr, "libsqlite3 ...: %s\n", sqlite3_libversion ());
=====================================
spatialite_network.c
=====================================
@@ -2557,7 +2557,7 @@ do_version ()
/* printing version infos */
fprintf( stderr, "\nVersion infos\n");
fprintf( stderr, "===========================================\n");
- fprintf (stderr, "spatialite_network: %s\n", VERSION);
+ fprintf (stderr, "spatialite_network: %s\n", SPATIALITE_VERSION);
fprintf (stderr, "target CPU .......: %s\n", spatialite_target_cpu ());
fprintf (stderr, "libspatialite ....: %s\n", spatialite_version ());
fprintf (stderr, "libsqlite3 .......: %s\n", sqlite3_libversion ());
=====================================
spatialite_osm_filter.c
=====================================
@@ -1604,7 +1604,7 @@ do_version ()
/* printing version infos */
fprintf( stderr, "\nVersion infos\n");
fprintf( stderr, "===========================================\n");
- fprintf (stderr, "spatialite_osm_filter: %s\n", VERSION);
+ fprintf (stderr, "spatialite_osm_filter: %s\n", SPATIALITE_VERSION);
fprintf (stderr, "target CPU ..........: %s\n", spatialite_target_cpu ());
fprintf (stderr, "libspatialite .......: %s\n", spatialite_version ());
fprintf (stderr, "libsqlite3 ..........: %s\n", sqlite3_libversion ());
=====================================
spatialite_osm_map.c
=====================================
@@ -2536,7 +2536,7 @@ do_version ()
/* printing version infos */
fprintf( stderr, "\nVersion infos\n");
fprintf( stderr, "===========================================\n");
- fprintf (stderr, "spatialite_osm_map: %s\n", VERSION);
+ fprintf (stderr, "spatialite_osm_map: %s\n", SPATIALITE_VERSION);
fprintf (stderr, "target CPU .......: %s\n", spatialite_target_cpu ());
fprintf (stderr, "libspatialite ....: %s\n", spatialite_version ());
fprintf (stderr, "libsqlite3 .......: %s\n", sqlite3_libversion ());
=====================================
spatialite_osm_net.c
=====================================
@@ -2248,7 +2248,7 @@ do_version ()
/* printing version infos */
fprintf( stderr, "\nVersion infos\n");
fprintf( stderr, "===========================================\n");
- fprintf (stderr, "spatialite_osm_net: %s\n", VERSION);
+ fprintf (stderr, "spatialite_osm_net: %s\n", SPATIALITE_VERSION);
fprintf (stderr, "target CPU .......: %s\n", spatialite_target_cpu ());
fprintf (stderr, "libspatialite ....: %s\n", spatialite_version ());
fprintf (stderr, "libsqlite3 .......: %s\n", sqlite3_libversion ());
=====================================
spatialite_osm_overpass.c
=====================================
@@ -4012,7 +4012,7 @@ do_version ()
/* printing version infos */
fprintf( stderr, "\nVersion infos\n");
fprintf( stderr, "===========================================\n");
- fprintf (stderr, "spatialite_osm_overpass: %s\n", VERSION);
+ fprintf (stderr, "spatialite_osm_overpass: %s\n", SPATIALITE_VERSION);
fprintf (stderr, "target CPU ............: %s\n", spatialite_target_cpu ());
fprintf (stderr, "libspatialite .........: %s\n", spatialite_version ());
fprintf (stderr, "libsqlite3 ............: %s\n", sqlite3_libversion ());
=====================================
spatialite_osm_raw.c
=====================================
@@ -940,7 +940,7 @@ do_version ()
/* printing version infos */
fprintf( stderr, "\nVersion infos\n");
fprintf( stderr, "===========================================\n");
- fprintf (stderr, "spatialite_osm_raw: %s\n", VERSION);
+ fprintf (stderr, "spatialite_osm_raw: %s\n", SPATIALITE_VERSION);
fprintf (stderr, "target CPU .......: %s\n", spatialite_target_cpu ());
fprintf (stderr, "libspatialite ....: %s\n", spatialite_version ());
fprintf (stderr, "libsqlite3 .......: %s\n", sqlite3_libversion ());
=====================================
spatialite_tool.c
=====================================
@@ -235,7 +235,7 @@ do_version ()
/* printing version infos */
fprintf( stderr, "\nVersion infos\n");
fprintf( stderr, "===========================================\n");
- fprintf (stderr, "exif_loader .: %s\n", VERSION);
+ fprintf (stderr, "exif_loader .: %s\n", SPATIALITE_VERSION);
fprintf (stderr, "target CPU ..: %s\n", spatialite_target_cpu ());
fprintf (stderr, "libspatialite: %s\n", spatialite_version ());
fprintf (stderr, "libsqlite3 ..: %s\n", sqlite3_libversion ());
=====================================
spatialite_xml_print.c
=====================================
@@ -933,7 +933,7 @@ do_version ()
/* printing version infos */
fprintf( stderr, "\nVersion infos\n");
fprintf( stderr, "===========================================\n");
- fprintf (stderr, "spatialite_xml_print: %s\n", VERSION);
+ fprintf (stderr, "spatialite_xml_print: %s\n", SPATIALITE_VERSION);
fprintf (stderr, "target CPU .........: %s\n", spatialite_target_cpu ());
fprintf (stderr, "libspatialite ......: %s\n", spatialite_version ());
fprintf (stderr, "libsqlite3 .........: %s\n", sqlite3_libversion ());
=====================================
spatialite_xml_validator.c
=====================================
@@ -34,6 +34,8 @@
#include "config.h"
#endif
+#include <spatialite/gaiaconfig.h>
+
#ifdef ENABLE_LIBXML2 /* only if LIBXML2 is enabled */
#include <libxml/parser.h>
View it on GitLab: https://salsa.debian.org/debian-gis-team/spatialite-tools/-/commit/f8143af91467cd1f6b5479a36821d3c637901396
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/spatialite-tools/-/commit/f8143af91467cd1f6b5479a36821d3c637901396
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20210126/8c10133d/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list