Index: get-deps.sh
===================================================================
--- get-deps.sh	(revision 1374565)
+++ get-deps.sh	(working copy)
@@ -27,8 +27,8 @@
 APR_UTIL=apr-util-1.4.1
 SERF=serf-1.0.1
 ZLIB=zlib-1.2.7
-SQLITE_VERSION=3.7.12
-SQLITE=sqlite-amalgamation-$(printf %u%02u%02u%02u $(echo $SQLITE_VERSION | sed -e "s/\./ /g"))
+SQLITE_VERSION=3.7.13
+SQLITE=sqlite-autoconf-$(printf %u%02u%02u%02u $(echo $SQLITE_VERSION | sed -e "s/\./ /g"))
 
 HTTPD=httpd-2.2.22
 APR_ICONV=apr-iconv-1.2.1
@@ -48,68 +48,84 @@
 # helpers
 usage() {
     echo "Usage: $0"
-    echo "Usage: $0 [ apr | serf | zlib | sqlite ] ..."
+    echo "Usage: $0 [ apr | serf | sqlite | zlib ] ..."
     exit $1
 }
 
-# getters
+# getters - these all check for local source directory. If one doesn't
+#	exist, they then "get" a reference tarball reference tarball,
+#	and expand the tarball into that local source directory where
+#	autoconf can detect them.
 get_apr() {
-    cd $TEMPDIR
-    test -d $BASEDIR/apr      || $HTTP_FETCH $APACHE_MIRROR/apr/$APR.tar.bz2
-    test -d $BASEDIR/apr-util || $HTTP_FETCH $APACHE_MIRROR/apr/$APR_UTIL.tar.bz2
-    cd $BASEDIR
+    cd $TEMPDIR || return 1
+    test -d $BASEDIR/apr && return
 
-    test -d $BASEDIR/apr      || bzip2 -dc $TEMPDIR/$APR.tar.bz2 | tar -xf -
-    test -d $BASEDIR/apr-util || bzip2 -dc $TEMPDIR/$APR_UTIL.tar.bz2 | tar -xf -
+    $HTTP_FETCH $APACHE_MIRROR/apr/$APR.tar.bz2
+    cd $BASEDIR || return 1
 
-    test -d $BASEDIR/apr      || mv $APR apr
-    test -d $BASEDIR/apr-util || mv $APR_UTIL apr-util
+    rm -rf apr && \
+        bzip2 -dc $TEMPDIR/$APR.tar.bz2 | tar -xf - && \
+	mv $APR apr
+
+    # Include this in get_apr, makes it easier to match components
+    get_apr_util
 }
 
+get_apr_util() {
+    test -d $BASEDIR/apr-util && return
+
+    cd $TEMPDIR || return 1
+    test -d $BASEDIR/apr-util || $HTTP_FETCH $APACHE_MIRROR/apr/$APR_UTIL.tar.bz2
+    cd $BASEDIR || return 1
+
+    rm -rf apr-util && \
+	bzip2 -dc $TEMPDIR/$APR_UTIL.tar.bz2 | tar -xf - && \
+	mv $APR_UTIL apr-util
+}
+
 get_serf() {
     test -d $BASEDIR/serf && return
 
-    cd $TEMPDIR
+    cd $TEMPDIR || return 1
     $HTTP_FETCH http://serf.googlecode.com/files/$SERF.tar.bz2
-    cd $BASEDIR
+    cd $BASEDIR || return 1
 
-    bzip2 -dc $TEMPDIR/$SERF.tar.bz2 | tar -xf -
-
+    rm -rf serf && \
+	bzip2 -dc $TEMPDIR/$SERF.tar.bz2 | tar -xf - && \
     mv $SERF serf
 }
 
 get_zlib() {
     test -d $BASEDIR/zlib && return
 
-    cd $TEMPDIR
+    cd $TEMPDIR || return 1
     $HTTP_FETCH http://www.zlib.net/$ZLIB.tar.bz2
-    cd $BASEDIR
+    cd $BASEDIR || return 1
 
-    bzip2 -dc $TEMPDIR/$ZLIB.tar.bz2 | tar -xf -
-
+    rm -rf zlib && \
+	bzip2 -dc $TEMPDIR/$ZLIB.tar.bz2 | tar -xf - && \
     mv $ZLIB zlib
 }
 
 get_sqlite() {
     test -d $BASEDIR/sqlite-amalgamation && return
 
-    cd $TEMPDIR
-    $HTTP_FETCH http://www.sqlite.org/$SQLITE.zip
-    cd $BASEDIR
+    cd $TEMPDIR || return 1
+    $HTTP_FETCH http://www.sqlite.org/$SQLITE.tar.gz
+    cd $BASEDIR || return 1
 
-    unzip -q $TEMPDIR/$SQLITE.zip
-
+    rm -rf sqlite-amalgamation && \
+       gzip -dc $TEMPDIR/$SQLITE.tar.gz | tar -xf - && \
     mv $SQLITE sqlite-amalgamation
-
 }
 
 # main()
 get_deps() {
     mkdir -p $TEMPDIR
 
-    for i in neon zlib serf sqlite-amalgamation apr apr-util; do
+    for i in apr apr-util serf sqlite-amalgamation zlib; do
       if [ -d $i ]; then
-        echo "Local directory '$i' already exists; the downloaded copy won't be used" >&2
+        echo "Local directory '$i' already exists; will not download" >&2
       fi
     done
 
Index: configure.ac
===================================================================
--- configure.ac	(revision 1374565)
+++ configure.ac	(working copy)
@@ -144,10 +144,9 @@
 SVN_FIND_APACHE(20020903)
 
 dnl Search for SQLite
-SQLITE_MINIMUM_VER="3.7.12"
-SQLITE_RECOMMENDED_VER="3.7.12"
-SQLITE_RECOMMENDED_VER_URL="3071200"
-SQLITE_URL="http://www.sqlite.org/sqlite-amalgamation-${SQLITE_RECOMMENDED_VER_URL}.zip"
+SQLITE_MINIMUM_VER="3.7.13"
+SQLITE_RECOMMENDED_VER="3.7.13"
+SQLITE_URL="http://www.sqlite.org/sqlite-autoconf-3071300.tar.gz"
 
 SVN_LIB_SQLITE(${SQLITE_MINIMUM_VER}, ${SQLITE_RECOMMENDED_VER},
                ${SQLITE_URL})