Problem: CI still thinks libsodium is default

Solution: build by default with tweetnacl, and add sub-build project
to test libsodium

.travis.yml

@@ -9,7 +9,7 @@ os:
 env:
 - BUILD_TYPE=default
 - BUILD_TYPE=android
-- BUILD_TYPE=tweetnacl
+- BUILD_TYPE=libsodium
 - BUILD_TYPE=cmake
 
 sudo: false

builds/tweetnacl/ci_build.sh → builds/libsodium/ci_build.sh

@@ -13,11 +13,17 @@ CONFIG_OPTS+=("LDFLAGS=-L${BUILD_PREFIX}/lib")
 CONFIG_OPTS+=("PKG_CONFIG_PATH=${BUILD_PREFIX}/lib/pkgconfig")
 CONFIG_OPTS+=("--prefix=${BUILD_PREFIX}")
 
+#   Build required projects first
+
+#   libsodium
+git clone --depth 1 -b stable git://github.com/jedisct1/libsodium.git
+( cd libsodium; ./autogen.sh; ./configure --prefix=$BUILD_PREFIX; make check; make install)
+
 #   Build and check this project
 (
     cd ../..;
     ./autogen.sh &&
-    ./configure "${CONFIG_OPTS[@]}" --with-tweetnacl=yes &&
+    ./configure "${CONFIG_OPTS[@]}" --with-libsodium=yes &&
     make &&
     ( if make check; then true; else cat test-suite.log; exit 1; fi ) &&
     make install

ci_build.sh

@@ -14,16 +14,10 @@ if [ $BUILD_TYPE == "default" ]; then
     CONFIG_OPTS+=("PKG_CONFIG_PATH=${BUILD_PREFIX}/lib/pkgconfig")
     CONFIG_OPTS+=("--prefix=${BUILD_PREFIX}")
 
-    #   Build required projects first
-
-    #   libsodium
-    git clone --depth 1 -b stable git://github.com/jedisct1/libsodium.git
-    ( cd libsodium; ./autogen.sh; ./configure --prefix=$BUILD_PREFIX; make check; make install)
-
     #   Build and check this project
     (
         ./autogen.sh &&
-        ./configure "${CONFIG_OPTS[@]}" --with-libsodium=yes &&
+        ./configure "${CONFIG_OPTS[@]}" &&
         make &&
         ( if make check; then true; else cat test-suite.log; exit 1; fi ) &&
         make install