Author: blair
Date: Thu Apr 18 18:19:37 2013
New Revision: 1469513
URL: http://svn.apache.org/r1469513
Log:
configure.ac: don't recommend using tar/gunzip to unpack a zip.
* configure.ac:
Add note to update build/ac-macros/sqlite.m4 if changing
SQLITE_URL's file extension.
* build/ac-macros/sqlite.m4:
Recommend using unzip since SQLITE_URL ends in .zip.
Modified:
subversion/trunk/build/ac-macros/sqlite.m4
subversion/trunk/configure.ac
Modified: subversion/trunk/build/ac-macros/sqlite.m4
URL:
http://svn.apache.org/viewvc/subversion/trunk/build/ac-macros/sqlite.m4?rev=1469513&r1=1469512&r2=1469513&view=diff
==============================================================================
--- subversion/trunk/build/ac-macros/sqlite.m4 (original)
+++ subversion/trunk/build/ac-macros/sqlite.m4 Thu Apr 18 18:19:37 2013
@@ -243,8 +243,8 @@ AC_DEFUN(SVN_DOWNLOAD_SQLITE,
echo ""
echo "get the sqlite ${SQLITE_RECOMMENDED_VER} amalgamation from:"
echo " ${SQLITE_URL}"
- echo "unpack the archive using tar/gunzip and rename the"
- echo "resulting directory to:"
+ echo "unpack the archive using unzip and rename the resulting"
+ echo "directory to:"
echo "$abs_srcdir/sqlite-amalgamation"
echo ""
AC_MSG_ERROR([Subversion requires SQLite])
Modified: subversion/trunk/configure.ac
URL:
http://svn.apache.org/viewvc/subversion/trunk/configure.ac?rev=1469513&r1=1469512&r2=1469513&view=diff
==============================================================================
--- subversion/trunk/configure.ac (original)
+++ subversion/trunk/configure.ac Thu Apr 18 18:19:37 2013
@@ -144,7 +144,9 @@ fi
dnl Find Apache with a recent-enough magic module number
SVN_FIND_APACHE(20020903)
-dnl Search for SQLite
+dnl Search for SQLite. If you change SQLITE_URL from a .zip to
+dnl something else also update build/ac-macros/sqlite.m4 to reflect
+dnl the correct command to unpack the downloaded file.
SQLITE_MINIMUM_VER="3.7.12"
SQLITE_RECOMMENDED_VER="3.7.15.1"
SQLITE_URL="http://www.sqlite.org/sqlite-amalgamation-$(printf %d%02d%02d%02d
$(echo ${SQLITE_RECOMMENDED_VER} | sed -e 's/\./ /g')).zip"