[release] some more work on the release build

configure.ac

@@ -148,7 +148,7 @@ esac
 AS_VAR_SET(ALL_LDFLAGS, "$SQLITE3_LDFLAGS $READLINE_LDFLAGS $LDFLAGS")
 
 AS_VAR_SET(static_lib_list,
-           ["libncurses.a libreadline.a libsqlite3.a libz.a libtinfo.a"])
+           ["libncurses.a libncursesw.a libreadline.a libsqlite3.a libz.a libtinfo.a"])
 AS_VAR_SET(static_lib_list,
            ["$static_lib_list libpcre.a libpcrecpp.a libncursesw.a libbz2.a"])
 AS_VAR_SET(static_lib_list,
@@ -176,13 +176,23 @@ if test x"${enable_static}" != x"no"; then
         -L*)
                 libdir=`echo $libflag | sed -e 's/-L//'`
                 for slib in $static_lib_list; do
-                    if test -e "$libdir/$slib"; then
+                    if test -e "$libdir/$slib" -a ! -e "src/static-libs/$slib"; then
                         ln -sf "$libdir/$slib" src/static-libs/.
                     fi
                 done
         ;;
         esac
     done
+
+    for slib in $static_lib_list; do
+        AC_MSG_CHECKING(for static library $slib)
+        if test -e "src/static-libs/$slib"; then
+            found_slib=`readlink src/static-libs/$slib`
+            AC_MSG_RESULT($found_slib)
+        else
+            AC_MSG_RESULT(not found)
+        fi
+    done
 fi
 AC_SUBST(STATIC_LDFLAGS)
 

release/Makefile

@@ -9,11 +9,31 @@ outbox:
 clean-outbox: outbox
 	rm -f outbox/*
 
-.PHONY: linux freebsd pkger
+PACKAGE_URLS = \
+	http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.gz \
+	http://ftp.gnu.org/gnu/automake/automake-1.15.tar.gz \
+	https://ftp.gnu.org/gnu/make/make-4.2.1.tar.gz \
+	ftp://invisible-island.net/ncurses/ncurses-5.9.tar.gz \
+	ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.38.tar.gz \
+	ftp://ftp.cwru.edu/pub/bash/readline-6.3.tar.gz \
+	http://zlib.net/zlib-1.2.8.tar.gz \
+	http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz \
+	http://sqlite.org/2016/sqlite-autoconf-3130000.tar.gz \
+	http://openssl.skazkaforyou.com/source/openssl-1.0.1t.tar.gz \
+	http://www.libssh2.org/download/libssh2-1.7.0.tar.gz \
+	http://curl.haxx.se/download/curl-7.48.0.tar.gz
+
+.PHONY: linux freebsd pkger download-pkgs
 
 %-vm: %
 	cd vagrant-static && vagrant up $<
 
+download-pkgs:
+	mkdir -p vagrant-static/pkgs && cd vagrant-static/pkgs && \
+	for pkg in $(PACKAGE_URLS); do \
+		wget -N $${pkg}; \
+	done
+
 %-build: % %-vm
 	cd vagrant-static && vagrant ssh $< -c "/vagrant/build.sh ${SRC_VERSION}"
 
@@ -52,3 +72,4 @@ push:
 
 clean:
 	cd vagrant-static && vagrant destroy -f
+	rm -rf vagrant-static/pkgs

release/vagrant-static/provision.sh

@@ -9,21 +9,6 @@ export PATH=${FAKE_ROOT}/bin:${PATH}
 
 cd ~/github
 
-PACKAGE_URLS="\
-    http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.gz \
-    http://ftp.gnu.org/gnu/automake/automake-1.15.tar.gz \
-    https://ftp.gnu.org/gnu/make/make-4.2.1.tar.gz \
-    ftp://invisible-island.net/ncurses/ncurses-5.9.tar.gz \
-    ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.38.tar.gz \
-    ftp://ftp.cwru.edu/pub/bash/readline-6.3.tar.gz \
-    http://zlib.net/zlib-1.2.8.tar.gz \
-    http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz \
-    http://sqlite.org/2016/sqlite-autoconf-3130000.tar.gz \
-    http://openssl.skazkaforyou.com/source/openssl-1.0.1t.tar.gz \
-    http://www.libssh2.org/download/libssh2-1.7.0.tar.gz \
-    http://curl.haxx.se/download/curl-7.48.0.tar.gz \
-    "
-
 SQLITE_CFLAGS="\
     -DSQLITE_ENABLE_COLUMN_METADATA \
     -DSQLITE_SOUNDEX \
@@ -32,15 +17,10 @@ SQLITE_CFLAGS="\
     -DSQLITE_ENABLE_JSON1 \
     "
 
-cd ~/packages
-
-for url in $PACKAGE_URLS; do
-    wget --no-check-certificate -N $url
-done
 
 cd ~/extract
 
-for pkg in ~/packages/*.tar.gz; do
+for pkg in /vagrant/pkgs/*.tar.gz; do
     tar xfz $pkg
 done