test-web: skip tests if no tornado

[bup.git] / config / configure

diff --git a/config/configure b/config/configure
index a2afb83778825e55eb42e7ce53dabc054f77b16a..1ea6757a3df313c29f5d27b4f7db0f1c00a622b5 100755 (executable)
--- a/config/configure
+++ b/config/configure
@@ -37,7 +37,7 @@ if ! AC_PROG_CC; then
     exit 1
 fi
 
-MAKE="$(bup_find_prog make $MAKE)"
+MAKE="$(bup_find_prog make "$MAKE")"
 if test -z "$MAKE"; then
     MAKE="$(bup_find_prog gmake "$GMAKE")"
 fi
@@ -56,6 +56,8 @@ if [ -z "$MAKE_VERSION" ]; then
 fi
 expr "$MAKE_VERSION" '>=' '3.81' || AC_FAIL "ERROR: $MAKE must be >= version 3.81"
 
+AC_SUB bup_make "$MAKE"
+
 bup_python="$PYTHON"
 test -z "$bup_python" && bup_python="$(bup_find_prog python2.7 '')"
 test -z "$bup_python" && bup_python="$(bup_find_prog python2.6 '')"
@@ -64,10 +66,7 @@ test -z "$bup_python" && bup_python="$(bup_find_prog python '')"
 if test -z "$bup_python"; then
     AC_FAIL "ERROR: unable to find python"
 else
-    echo "#!/bin/sh" > ../cmd/python-cmd.sh
-    printf "exec %q \"\$@\"" "$bup_python" >> ../cmd/python-cmd.sh
-    chmod u+x ../cmd/python-cmd.sh
-    cd ../cmd && ln -sf python-cmd.sh bup-python
+    AC_SUB bup_python "$bup_python"
 fi
 
 if test -z "$(bup_find_prog git '')"; then
@@ -157,4 +156,9 @@ AC_CHECK_FIELD stat st_ctimensec sys/types.h sys/stat.h unistd.h
 
 AC_CHECK_FIELD tm tm_gmtoff time.h
 
+__config_files="$__config_files config.vars.sh"
+
 AC_OUTPUT config.vars
+
+printf 'bup_make=%q\n' "$MAKE" > config.vars.sh
+printf 'bup_python=%q\n' "$bup_python" >> config.vars.sh