[librasterlite2] 01/04: Imported Upstream version 1.0.0~rc0+devel1

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository librasterlite2.

commit 433134dcb670bd8451302ef186acd262cabef500
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Jun 29 19:43:02 2015 +0200

    Imported Upstream version 1.0.0~rc0+devel1
---
 Makefile.am                  |  2 +-
 Makefile.in                  | 10 +++++-----
 headers/rasterlite2/sqlite.h |  5 +++++
 src/Makefile.am              |  4 ++--
 src/Makefile.in              |  4 ++--
 5 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 3428c56..2c51a5a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS = headers src test tools
 EXTRA_DIST = mainpage.doxy Android_R4.3.0.mk rasterlite2-4.3.0.mk \
 	Makefile-static-MinGW
 
-AUTOMAKE_OPTIONS = dist-zip
+AUTOMAKE_OPTIONS = dist-zip foreign
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = rasterlite2.pc
diff --git a/Makefile.in b/Makefile.in
index bd4ecf4..84e77f8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -383,7 +383,7 @@ SUBDIRS = headers src test tools
 EXTRA_DIST = mainpage.doxy Android_R4.3.0.mk rasterlite2-4.3.0.mk \
 	Makefile-static-MinGW
 
-AUTOMAKE_OPTIONS = dist-zip
+AUTOMAKE_OPTIONS = dist-zip foreign
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = rasterlite2.pc
 MOSTLYCLEANFILES = rasterlite2_cov.info 
@@ -397,15 +397,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/headers/rasterlite2/sqlite.h b/headers/rasterlite2/sqlite.h
index b7292c9..55fa6df 100644
--- a/headers/rasterlite2/sqlite.h
+++ b/headers/rasterlite2/sqlite.h
@@ -52,4 +52,9 @@ extern const sqlite3_api_routines *sqlite3_api;
 #include <sqlite3.h>
 #endif
 
+#ifndef SQLITE_DETERMINISTIC
+/* probably SQLite < 3.8.3 - attempting to fix */
+#define SQLITE_DETERMINISTIC	SQLITE_UTF8
+#endif
+
 #endif
diff --git a/src/Makefile.am b/src/Makefile.am
index 6398558..feffa3e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,7 +25,7 @@ if MINGW
 librasterlite2_la_LDFLAGS = -avoid-version -no-undefined
 librasterlite2_la_LIBADD += -lm
 else
-librasterlite2_la_LDFLAGS = -version-info 0:0:0
+librasterlite2_la_LDFLAGS = -version-info 1:0:0
 librasterlite2_la_LIBADD += -lpthread -lm
 endif
 
@@ -50,7 +50,7 @@ if MINGW
 mod_rasterlite2_la_LDFLAGS = -module -avoid-version -no-undefined
 mod_rasterlite2_la_LIBADD += -lm
 else
-mod_rasterlite2_la_LDFLAGS = -module -version-info 0:0:0
+mod_rasterlite2_la_LDFLAGS = -module -version-info 1:0:0
 mod_rasterlite2_la_LIBADD += -lpthread -lm
 endif
 
diff --git a/src/Makefile.in b/src/Makefile.in
index d3acb32..7078fb5 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -406,7 +406,7 @@ librasterlite2_la_SOURCES = rasterlite2.c rl2raw.c rl2codec.c \
 librasterlite2_la_LIBADD = @LIBPNG_LIBS@ @LIBWEBP_LIBS@ @LIBLZMA_LIBS@ \
 	@LIBCAIRO_LIBS@ @LIBCURL_LIBS@ @LIBXML2_LIBS@ \
 	@LIBFREETYPE2_LIBS@ $(am__append_1) $(am__append_2)
- at MINGW_FALSE@librasterlite2_la_LDFLAGS = -version-info 0:0:0
+ at MINGW_FALSE@librasterlite2_la_LDFLAGS = -version-info 1:0:0
 @MINGW_TRUE at librasterlite2_la_LDFLAGS = -avoid-version -no-undefined
 mod_rasterlite2_la_SOURCES = rasterlite2.c rl2raw.c rl2codec.c \
 	rl2jpeg.c rl2png.c rl2gif.c rl2webp.c rl2tiff.c rl2wms.c \
@@ -422,7 +422,7 @@ mod_rasterlite2_la_LIBADD = @LIBPNG_LIBS@ @LIBWEBP_LIBS@ \
 mod_rasterlite2_la_CPPFLAGS = @CFLAGS@ -I$(top_srcdir)/headers -I. \
 	-DLOADABLE_EXTENSION
 mod_rasterlite2_la_LIBTOOLFLAGS = --tag=disable-static
- at MINGW_FALSE@mod_rasterlite2_la_LDFLAGS = -module -version-info 0:0:0
+ at MINGW_FALSE@mod_rasterlite2_la_LDFLAGS = -module -version-info 1:0:0
 @MINGW_TRUE at mod_rasterlite2_la_LDFLAGS = -module -avoid-version -no-undefined
 MOSTLYCLEANFILES = *.gcna *.gcno *.gcda
 all: all-am

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/librasterlite2.git