about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2010-12-10T11·45+0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2010-12-10T11·45+0000
commit4d5777681309947041ecc297074f4ce537547553 (patch)
treef80159c9886f0356c3c744baa706542832716d0b
parente4720b1a79f549b3bcb0e33fe999d02d12e3ed23 (diff)
* Use SQLite 3.7.4.
-rw-r--r--configure.ac8
-rw-r--r--externals/Makefile.am4
2 files changed, 6 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac
index c2599a75f1ba..2a8bedb0d1f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -247,12 +247,12 @@ AC_ARG_WITH(sqlite, AC_HELP_STRING([--with-sqlite=PATH],
   [prefix of SQLite]),
   sqlite=$withval, sqlite=)
 AM_CONDITIONAL(HAVE_SQLITE, test -n "$sqlite")
-SQLITE_VERSION=3.7.2
+SQLITE_VERSION=3070400
 AC_SUBST(SQLITE_VERSION)
 if test -z "$sqlite"; then
-  sqlite_lib='${top_builddir}/externals/sqlite-$(SQLITE_VERSION)/libsqlite3.la'
-  sqlite_include='-I${top_builddir}/externals/sqlite-$(SQLITE_VERSION)'
-  sqlite_bin='${top_builddir}/externals/sqlite-$(SQLITE_VERSION)'
+  sqlite_lib='${top_builddir}/externals/sqlite-autoconf-$(SQLITE_VERSION)/libsqlite3.la'
+  sqlite_include='-I${top_builddir}/externals/sqlite-autoconf-$(SQLITE_VERSION)'
+  sqlite_bin='${top_builddir}/externals/sqlite-autoconf-$(SQLITE_VERSION)'
 else
   sqlite_lib="-L$sqlite/lib -lsqlite3"
   sqlite_include="-I$sqlite/include"
diff --git a/externals/Makefile.am b/externals/Makefile.am
index bdc29fcb5251..563f5424df10 100644
--- a/externals/Makefile.am
+++ b/externals/Makefile.am
@@ -29,8 +29,8 @@ endif
 
 # SQLite
 
-SQLITE = sqlite-$(SQLITE_VERSION)
-SQLITE_TAR = sqlite-amalgamation-$(SQLITE_VERSION).tar.gz
+SQLITE = sqlite-autoconf-$(SQLITE_VERSION)
+SQLITE_TAR = sqlite-autoconf-$(SQLITE_VERSION).tar.gz
 
 $(SQLITE_TAR):
 	@echo "Nix requires the SQLite library to build."