Add config.vars.sh for bup_make and bup_python

During configure create a config/config.vars.sh file including (for now)
properly shell escaped bup_make and bup_python definitions so that we
can use them in other schell scripts.

Signed-off-by: Rob Browning <rlb@defaultvalue.org>
Tested-by: Rob Browning <rlb@defaultvalue.org>

diff --git a/config/config.vars.in b/config/config.vars.in
index d8481fb4b20084d851adb1d75b51942a90af94b9..6e01995bd94052bc9be46bf5772606e2678bf94e 100644 (file)
--- a/config/config.vars.in
+++ b/config/config.vars.in
@@ -1,3 +1,4 @@
 CONFIGURE_FILES=@CONFIGURE_FILES@
 GENERATED_FILES=@GENERATED_FILES@
+bup_make=@bup_make@
 bup_python=@bup_python@

diff --git a/config/configure b/config/configure
index e630bedfcdce0bb8c6432d755428cccdda9e40c9..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 '')"
@@ -154,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