diff -r c52a13d1e989 -r ba9431028671 test/configure --- a/test/configure Wed Dec 24 13:53:03 2025 +0100 +++ b/test/configure Wed Dec 24 14:25:24 2025 +0100 @@ -85,7 +85,7 @@ printhelp() { echo "Usage: $0 [OPTIONS]..." - if [ $has_config_vars__ -eq 1 ] ; then + if [ $has_overridable_config_vars__ -eq 1 ] ; then echo echo "Configuration:" fi @@ -148,27 +148,26 @@ touch "$TEMP_DIR/features" # config variables -has_config_vars__=0 +has_overridable_config_vars__=0 if true \ ; then : if [ -z "$prefix__initialized__" ] ; then - has_config_vars__=1 + has_overridable_config_vars__=1 prefix__initialized__=1 prefix='/usr' fi if [ -z "$exec_prefix__initialized__" ] ; then - has_config_vars__=1 + has_overridable_config_vars__=1 exec_prefix__initialized__=1 exec_prefix='' fi if [ -z "$libdir__initialized__" ] ; then - has_config_vars__=1 + has_overridable_config_vars__=1 libdir__initialized__=1 libdir='' fi if [ -z "$HOST__initialized__" ] ; then - has_config_vars__=1 HOST__initialized__=1 HOST=`uname -n` fi @@ -178,7 +177,6 @@ ; then : if [ -z "$PWD__initialized__" ] ; then - has_config_vars__=1 PWD__initialized__=1 PWD='pwd' fi @@ -188,7 +186,6 @@ ; then : if [ -z "$PWD__initialized__" ] ; then - has_config_vars__=1 PWD__initialized__=1 PWD='pwd -W' fi @@ -315,17 +312,13 @@ # generate vars.mk -if [ $has_config_vars__ -eq 1 ]; then - echo '# configuration' > "$TEMP_DIR/vars.mk" - echo "prefix=$prefix" >> "$TEMP_DIR/vars.mk" - echo "exec_prefix=$exec_prefix" >> "$TEMP_DIR/vars.mk" - echo "libdir=$libdir" >> "$TEMP_DIR/vars.mk" - echo "HOST=$HOST" >> "$TEMP_DIR/vars.mk" - echo "PWD=$PWD" >> "$TEMP_DIR/vars.mk" - echo >> "$TEMP_DIR/vars.mk" -else - echo > "$TEMP_DIR/vars.mk" -fi +echo '# configuration' > "$TEMP_DIR/vars.mk" +echo "prefix=$prefix" >> "$TEMP_DIR/vars.mk" +echo "exec_prefix=$exec_prefix" >> "$TEMP_DIR/vars.mk" +echo "libdir=$libdir" >> "$TEMP_DIR/vars.mk" +echo "HOST=$HOST" >> "$TEMP_DIR/vars.mk" +echo "PWD=$PWD" >> "$TEMP_DIR/vars.mk" +echo >> "$TEMP_DIR/vars.mk" # # DEPENDENCIES @@ -695,7 +688,7 @@ if [ -n "$TOOLCHAIN_CSTD" ]; then echo " default C std: $TOOLCHAIN_CSTD" fi -if [ $has_config_vars__ -eq 1 ]; then +if [ $has_overridable_config_vars__ -eq 1 ]; then echo echo "Config:" if [ -n "$prefix__initialized__" ]; then