build.sh, build_matrix.sh: Use always no/yes, no more disable/enable

This change harmonizes the setup.

Run examples are now:
./build_matrix.sh
CC=clang ./build.sh
CMAKE=yes ./build.sh
CC=clang CMAKE=yes REMOTE=yes ./build.sh

2 files changed, 7 insertions, 7 deletions

diff --git a/build.sh b/build.sh
index 6df82809..fc79daeb 100755
--- a/build.sh
+++ b/build.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # This script runs one build with exported variables setup: CC, CMAKE and
-# REMOTE (default: gcc, no (cmake), disable (remote)).
+# REMOTE (default: gcc, no (cmake), no (remote)).
 
 set -e
 
@@ -9,8 +9,8 @@ set -e
 CC=${CC:-gcc}
 # CMAKE: no or yes
 CMAKE=${CMAKE:-no}
-# REMOTE: disable or enable
-REMOTE=${REMOTE:-disable}
+# REMOTE: no or yes
+REMOTE=${REMOTE:-no}
 # Install directory prefix
 PREFIX=/tmp/local
 
@@ -26,7 +26,7 @@ travis_fold() {
 LABEL="$CC.$CMAKE.$REMOTE"
 if [ "$CMAKE" = yes ]; then
     # ENABLE_REMOTE is only used by cmake
-    if [ "$REMOTE" = enable ]; then
+    if [ "$REMOTE" = yes ]; then
         ENABLE_REMOTE="-DENABLE_REMOTE=ON"
     else
         ENABLE_REMOTE=""
@@ -35,7 +35,7 @@ fi
 if [ "$CMAKE" = no ]; then
     echo '$ ./configure [...]'
     travis_fold start configure
-    ./configure --prefix=$PREFIX "--$REMOTE-remote"
+    ./configure --prefix=$PREFIX --enable-remote=$REMOTE
     travis_fold end configure
 else
     # Remove the leftovers from any earlier in-source builds, so this
diff --git a/build_matrix.sh b/build_matrix.sh
index 4feab80e..538f6210 100755
--- a/build_matrix.sh
+++ b/build_matrix.sh
@@ -2,7 +2,7 @@
 
 # This script executes the matrix loops, exclude tests and cleaning.
 # It calls the build.sh script which runs one build with exported variables
-# setup: CC, CMAKE and REMOTE (default: gcc, no (cmake), disable (remote)).
+# setup: CC, CMAKE and REMOTE (default: gcc, no (cmake), no (remote)).
 
 set -e
 
@@ -34,7 +34,7 @@ for CC in gcc clang; do
     if [ "$CC" = gcc ] && [ "$TRAVIS_OS_NAME" = osx ]; then continue; fi
     for CMAKE in no yes; do
         export CMAKE
-        for REMOTE in disable enable; do
+        for REMOTE in no yes; do
             export REMOTE
             echo_magenta "===== SETUP: compiler:$CC cmake:$CMAKE remote:$REMOTE ====="
             # LABEL is needed to build the travis fold labels