This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch experimental
in repository spatialite-tools.
commit 92c93643168a435ff236cfe9e3150aed3432bba5
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Sat Jun 27 16:06:08 2015 +0200
Imported Upstream version 4.3.0~rc1
---
Makefile.am | 2 +-
Makefile.in | 10 +++----
config.h.in | 9 ++++++
configure | 97 +++++++++++++++++++++++++++++++++++++++++++++++++++++-------
configure.ac | 7 ++++-
shell.c | 7 +++++
6 files changed, 115 insertions(+), 17 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 40feb76..1bc4c7e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -85,5 +85,5 @@ EXTRA_DIST = makefile.vc nmake.opt \
Makefile-static-Linux \
Makefile-static-MacOsX
-AUTOMAKE_OPTIONS = dist-zip
+AUTOMAKE_OPTIONS = dist-zip foreign
diff --git a/Makefile.in b/Makefile.in
index 621da79..13d46a6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -500,7 +500,7 @@ EXTRA_DIST = makefile.vc nmake.opt \
Makefile-static-Linux \
Makefile-static-MacOsX
-AUTOMAKE_OPTIONS = dist-zip
+AUTOMAKE_OPTIONS = dist-zip foreign
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -512,15 +512,15 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@
$(srcdir)/Makefile.am $(am__confi
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
- $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
+ echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
+ $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
&& exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu Makefile
+ $(AUTOMAKE) --foreign Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
diff --git a/config.h.in b/config.h.in
index 227f579..332fc2c 100644
--- a/config.h.in
+++ b/config.h.in
@@ -87,6 +87,9 @@
/* Define to 1 if you have the `proj' library (-lproj). */
#undef HAVE_LIBPROJ
+/* Define to 1 if you have the `sqlite3' library (-lsqlite3). */
+#undef HAVE_LIBSQLITE3
+
/* Define to 1 if you have the `localtime_r' function. */
#undef HAVE_LOCALTIME_R
@@ -109,6 +112,12 @@
/* Define to 1 if you have the `readline' function. */
#undef HAVE_READLINE
+/* Define to 1 if you have the <sqlite3ext.h> header file. */
+#undef HAVE_SQLITE3EXT_H
+
+/* Define to 1 if you have the <sqlite3.h> header file. */
+#undef HAVE_SQLITE3_H
+
/* Define to 1 if you have the `sqrt' function. */
#undef HAVE_SQRT
diff --git a/configure b/configure
index 7502ad8..c3cd839 100755
--- a/configure
+++ b/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 4.3.0-RC0.
+# Generated by GNU Autoconf 2.69 for spatialite-tools 4.3.0-RC1.
#
# Report bugs to <a.furi...@lqt.it>.
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='spatialite-tools'
PACKAGE_TARNAME='spatialite-tools'
-PACKAGE_VERSION='4.3.0-RC0'
-PACKAGE_STRING='spatialite-tools 4.3.0-RC0'
+PACKAGE_VERSION='4.3.0-RC1'
+PACKAGE_STRING='spatialite-tools 4.3.0-RC1'
PACKAGE_BUGREPORT='a.furi...@lqt.it'
PACKAGE_URL=''
@@ -1358,7 +1358,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 4.3.0-RC0 to adapt to many kinds of
systems.
+\`configure' configures spatialite-tools 4.3.0-RC1 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1429,7 +1429,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of spatialite-tools 4.3.0-RC0:";;
+ short | recursive ) echo "Configuration of spatialite-tools 4.3.0-RC1:";;
esac
cat <<\_ACEOF
@@ -1566,7 +1566,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-spatialite-tools configure 4.3.0-RC0
+spatialite-tools configure 4.3.0-RC1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2156,7 +2156,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 4.3.0-RC0, which was
+It was created by spatialite-tools $as_me 4.3.0-RC1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3027,7 +3027,7 @@ fi
# Define the identity of the package.
PACKAGE='spatialite-tools'
- VERSION='4.3.0-RC0'
+ VERSION='4.3.0-RC1'
cat >>confdefs.h <<_ACEOF
@@ -4775,6 +4775,34 @@ fi
done
+for ac_header in sqlite3.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "sqlite3.h" "ac_cv_header_sqlite3_h"
"$ac_includes_default"
+if test "x$ac_cv_header_sqlite3_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_SQLITE3_H 1
+_ACEOF
+
+else
+ as_fn_error $? "cannot find sqlite3.h, bailing out" "$LINENO" 5
+fi
+
+done
+
+for ac_header in sqlite3ext.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "sqlite3ext.h"
"ac_cv_header_sqlite3ext_h" "$ac_includes_default"
+if test "x$ac_cv_header_sqlite3ext_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_SQLITE3EXT_H 1
+_ACEOF
+
+else
+ as_fn_error $? "cannot find sqlite3ext.h, bailing out" "$LINENO" 5
+fi
+
+done
+
# Checks for programs.
ac_ext=cpp
@@ -17248,6 +17276,55 @@ fi
done
+# Checks for installed libraries
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_prepare_v2 in
-lsqlite3" >&5
+$as_echo_n "checking for sqlite3_prepare_v2 in -lsqlite3... " >&6; }
+if ${ac_cv_lib_sqlite3_sqlite3_prepare_v2+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsqlite3 -lm $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 sqlite3_prepare_v2 ();
+int
+main ()
+{
+return sqlite3_prepare_v2 ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_sqlite3_sqlite3_prepare_v2=yes
+else
+ ac_cv_lib_sqlite3_sqlite3_prepare_v2=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
$ac_cv_lib_sqlite3_sqlite3_prepare_v2" >&5
+$as_echo "$ac_cv_lib_sqlite3_sqlite3_prepare_v2" >&6; }
+if test "x$ac_cv_lib_sqlite3_sqlite3_prepare_v2" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBSQLITE3 1
+_ACEOF
+
+ LIBS="-lsqlite3 $LIBS"
+
+else
+ as_fn_error $? "'libsqlite3' is required but it doesn't seem to be installed
on this system." "$LINENO" 5
+fi
+
+
ac_config_files="$ac_config_files Makefile"
@@ -18794,7 +18871,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 4.3.0-RC0, which was
+This file was extended by spatialite-tools $as_me 4.3.0-RC1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -18860,7 +18937,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 4.3.0-RC0
+spatialite-tools config.status 4.3.0-RC1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index e9dfa04..28e6b0e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.61)
-AC_INIT(spatialite-tools, 4.3.0-RC0, a.furi...@lqt.it)
+AC_INIT(spatialite-tools, 4.3.0-RC1, a.furi...@lqt.it)
AC_LANG(C)
AC_CONFIG_MACRO_DIR([m4])
@@ -67,6 +67,8 @@ AC_CHECK_HEADERS(stddef.h,, [AC_MSG_ERROR([cannot find
stddef.h, bailing out])])
AC_CHECK_HEADERS(stdint.h,, [AC_MSG_ERROR([cannot find stdint.h, bailing
out])])
AC_CHECK_HEADERS(sys/time.h,, [AC_MSG_ERROR([cannot find sys/time.h, bailing
out])])
AC_CHECK_HEADERS(unistd.h,, [AC_MSG_ERROR([cannot find unistd.h, bailing
out])])
+AC_CHECK_HEADERS(sqlite3.h,, [AC_MSG_ERROR([cannot find sqlite3.h, bailing
out])])
+AC_CHECK_HEADERS(sqlite3ext.h,, [AC_MSG_ERROR([cannot find sqlite3ext.h,
bailing out])])
# Checks for programs.
AC_PROG_CXX
@@ -93,6 +95,9 @@ AC_FUNC_MEMCMP
AC_FUNC_STAT
AC_FUNC_STRFTIME
AC_CHECK_FUNCS([memset sqrt strcasecmp strerror strncasecmp strstr fdatasync
ftruncate getcwd gettimeofday localtime_r memmove strerror])
+
+# Checks for installed libraries
+AC_CHECK_LIB(sqlite3,sqlite3_prepare_v2,,AC_MSG_ERROR(['libsqlite3' is
required but it doesn't seem to be installed on this system.]),-lm)
AC_CONFIG_FILES([Makefile])
diff --git a/shell.c b/shell.c
index c8e76cc..5f09052 100644
--- a/shell.c
+++ b/shell.c
@@ -4192,11 +4192,18 @@ int main(int argc, char **argv){
/* initializing the SpatiaLite's internal cache */
splite_cache = spatialite_alloc_connection ();
+/*
+ * sandro: 2015-06-26
+ *
+ * disabling version check as suggested by Fedora and Debian maintainers
+ *
if( strcmp(sqlite3_sourceid(),SQLITE_SOURCE_ID)!=0 ){
fprintf(stderr, "SQLite header and source version mismatch\n%s\n%s\n",
sqlite3_sourceid(), SQLITE_SOURCE_ID);
exit(1);
}
+*/
+
Argv0 = argv[0];
main_init(&data);
/*
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/spatialite-tools.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
