* Use SQLite 3.7.4.

viric · Dec 10, 2010 · 4d57776 · 4d57776
1 parent e4720b1
commit 4d57776
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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."