It's been a while, so out of caution I'd appreciate review on this
before I commit, even though it's a fairly trivial patch. Thanks!
[[[
Bring the SQLite amalgamation download instructions up to date.
* configure.ac
(SQLITE_AMALGAMATION_URL): New name for SQLITE_URL. Also new value,
because the old url was already obsolete.
* build/ac-macros/sqlite.m4: Same, and...
(SVN_LIB_SQLITE): ...update the instructions for fetching and
unpacking the SQLite amalgamation.
]]]
Index: build/ac-macros/sqlite.m4
===================================================================
--- build/ac-macros/sqlite.m4 (revision 1190140)
+++ build/ac-macros/sqlite.m4 (working copy)
@@ -43,7 +43,7 @@
[
SQLITE_MINIMUM_VER="$1"
SQLITE_RECOMMENDED_VER="$2"
- SQLITE_URL="$3"
+ SQLITE_AMALGAMATION_URL="$3"
SQLITE_PKGNAME="sqlite3"
SVN_SQLITE_MIN_VERNUM_PARSE
@@ -239,11 +239,10 @@
echo ""
echo "or"
echo ""
- echo "get the sqlite ${SQLITE_RECOMMENDED_VER} amalgamation from:"
- echo " ${SQLITE_URL}"
- echo "unpack the archive using tar/gunzip and copy sqlite3.c from the"
- echo "resulting directory to:"
- echo "$abs_srcdir/sqlite-amalgamation/sqlite3.c"
+ echo "get the sqlite ${SQLITE_RECOMMENDED_VER} (or later) amalgamation from:"
+ echo " ${SQLITE_AMALGAMATION_URL}"
+ echo "unzip the archive, and copy sqlite3.c from the resulting directory to:"
+ echo " $abs_srcdir/sqlite-amalgamation/sqlite3.c"
echo ""
AC_MSG_ERROR([Subversion requires SQLite])
])
Index: configure.ac
===================================================================
--- configure.ac (revision 1190140)
+++ configure.ac (working copy)
@@ -168,9 +168,9 @@
dnl Search for SQLite
SQLITE_MINIMUM_VER="3.6.18"
SQLITE_RECOMMENDED_VER="3.7.6.3"
-SQLITE_URL="http://www.sqlite.org/sqlite-amalgamation-${SQLITE_RECOMMENDED_VER}.tar.gz";
+SQLITE_AMALGAMATION_URL="http://sqlite.org/download.html";
SVN_LIB_SQLITE(${SQLITE_MINIMUM_VER}, ${SQLITE_RECOMMENDED_VER},
- ${SQLITE_URL})
+ ${SQLITE_AMALGAMATION_URL})
dnl Set up a number of directories ---------------------
