nrabulinski/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

* Use SQLite 3.7.4.

Browse source
This commit is contained in:
Eelco Dolstra 2010-12-10 11:45:56 +00:00
parent e4720b1a79
commit 4d57776813
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
configure.ac
View file

@ -247,12 +247,12 @@ AC_ARG_WITH(sqlite, AC_HELP_STRING([--with-sqlite=PATH],
[prefix of SQLite]), [prefix of SQLite]),
sqlite=$withval, sqlite=) sqlite=$withval, sqlite=)
AM_CONDITIONAL(HAVE_SQLITE, test -n "$sqlite") AM_CONDITIONAL(HAVE_SQLITE, test -n "$sqlite")
SQLITE_VERSION=3.7.2 SQLITE_VERSION=3070400
AC_SUBST(SQLITE_VERSION) AC_SUBST(SQLITE_VERSION)
if test -z "$sqlite"; then if test -z "$sqlite"; then
sqlite_lib='${top_builddir}/externals/sqlite-$(SQLITE_VERSION)/libsqlite3.la' sqlite_lib='${top_builddir}/externals/sqlite-autoconf-$(SQLITE_VERSION)/libsqlite3.la'
sqlite_include='-I${top_builddir}/externals/sqlite-$(SQLITE_VERSION)' sqlite_include='-I${top_builddir}/externals/sqlite-autoconf-$(SQLITE_VERSION)'
sqlite_bin='${top_builddir}/externals/sqlite-$(SQLITE_VERSION)' sqlite_bin='${top_builddir}/externals/sqlite-autoconf-$(SQLITE_VERSION)'
else else
sqlite_lib="-L$sqlite/lib -lsqlite3" sqlite_lib="-L$sqlite/lib -lsqlite3"
sqlite_include="-I$sqlite/include" sqlite_include="-I$sqlite/include"

4
externals/Makefile.am vendored
View file

@ -29,8 +29,8 @@ endif
# SQLite # SQLite
SQLITE = sqlite-$(SQLITE_VERSION) SQLITE = sqlite-autoconf-$(SQLITE_VERSION)
SQLITE_TAR = sqlite-amalgamation-$(SQLITE_VERSION).tar.gz SQLITE_TAR = sqlite-autoconf-$(SQLITE_VERSION).tar.gz
$(SQLITE_TAR): $(SQLITE_TAR):
@echo "Nix requires the SQLite library to build." @echo "Nix requires the SQLite library to build."