diff -r b77d51b3c9bb -r 4486849e6a6c test/make/configure.vm
--- a/test/make/configure.vm	Sat Sep 02 18:39:09 2023 +0200
+++ b/test/make/configure.vm	Sat Sep 02 19:07:25 2023 +0200
@@ -53,13 +53,13 @@
 OS_VERSION=`uname -r`
 
 TEMP_DIR=".tmp-`uname -n`"
-mkdir -p $TEMP_DIR
+mkdir -p "$TEMP_DIR"
 if [ $? -ne 0 ]; then
     echo "Cannot create tmp dir"
     echo "Abort"
 fi
-touch $TEMP_DIR/options
-touch $TEMP_DIR/features
+touch "$TEMP_DIR/options"
+touch "$TEMP_DIR/features"
 
 # features
 #foreach( $feature in $features )
@@ -114,10 +114,10 @@
 }
 
 #
-# parse arguments 
+# parse arguments
 #
 #set( $D = '$' )
-for ARG in $@
+for ARG in "$@"
 do
     case "$ARG" in
         "--prefix="*)         PREFIX=${D}{ARG#--prefix=} ;;
@@ -133,7 +133,7 @@
         "--includedir="*)     INCLUDEDIR=${D}{ARG#--includedir=} ;;
         "--infodir="*)        INFODIR=${D}{ARG#--infodir=} ;;
         "--mandir"*)          MANDIR=${D}{ARG#--mandir} ;;
-        "--help"*) printhelp; rm -Rf $TEMP_DIR; exit 1 ;;
+        "--help"*) printhelp; rm -Rf "$TEMP_DIR"; exit 1 ;;
     #foreach( $opt in $options )
         "--${opt.getArgument()}="*) ${opt.getVarName()}=${D}{ARG#--${opt.getArgument()}=} ;;
     #end
@@ -141,7 +141,7 @@
         "--enable-${feature.arg}") ${feature.getVarName()}=on ;;
         "--disable-${feature.arg}") unset ${feature.getVarName()} ;;
     #end
-        "-"*) echo "unknown option: $ARG"; rm -Rf $TEMP_DIR; exit 1 ;;
+        "-"*) echo "unknown option: $ARG"; rm -Rf "$TEMP_DIR"; exit 1 ;;
     esac
 done
 
@@ -190,19 +190,19 @@
 # Simple uname based platform detection
 # $PLATFORM is used for platform dependent dependency selection
 printf "detect platform... "
-if [ $OS = SunOS ]; then
+if [ "$OS" = "SunOS" ]; then
     PLATFORM="solaris sunos unix svr4"
 fi
-if [ $OS = Linux ]; then
+if [ "$OS" = "Linux" ]; then
     PLATFORM="linux unix"
 fi
-if [ $OS = FreeBSD ]; then
+if [ "$OS" = "FreeBSD" ]; then
     PLATFORM="freebsd bsd unix"
 fi
-if [ $OS = Darwin ]; then
+if [ "$OS" = "Darwin" ]; then
     PLATFORM="macos osx bsd unix"
 fi
-echo $OS | grep "MINGW" > /dev/null
+echo "$OS" | grep -i "MINGW" > /dev/null
 if [ $? -eq 0 ]; then
     PLATFORM="windows mingw"
 fi
@@ -222,7 +222,7 @@
 {
     for p in $PLATFORM
     do
-        if [ $p = $1 ]; then
+        if [ "$p" = "$1" ]; then
             return 0
         fi
     done
@@ -232,7 +232,7 @@
 {
     for p in $PLATFORM
     do
-        if [ $p = $1 ]; then
+        if [ "$p" = "$1" ]; then
             return 1
         fi
     done
@@ -240,7 +240,7 @@
 }
 
 # generate config.mk and config.h
-cat > $TEMP_DIR/config.mk << __EOF__
+cat > "$TEMP_DIR/config.mk" << __EOF__
 #
 # config.mk generated by configure
 #
@@ -293,7 +293,7 @@
 
 __EOF__
 
-echo > $TEMP_DIR/make.mk
+echo > "$TEMP_DIR/make.mk"
 
 ENV_CFLAGS=$CFLAGS
 ENV_LDFLAGS=$LDFLAGS
@@ -304,15 +304,15 @@
 . make/toolchain.sh
 
 # add user specified flags to config.mk
-echo >> $TEMP_DIR/config.mk
-if [ ! -z "${ENV_CFLAGS}" ]; then
-    echo "CFLAGS += $ENV_CFLAGS" >> $TEMP_DIR/config.mk
+echo >> "$TEMP_DIR/config.mk"
+if [ -n "${ENV_CFLAGS}" ]; then
+    echo "CFLAGS += $ENV_CFLAGS" >> "$TEMP_DIR/config.mk"
 fi
-if [ ! -z "${ENV_CXXFLAGS}" ]; then
-    echo "CXXFLAGS += $ENV_CXXFLAGS" >> $TEMP_DIR/config.mk
+if [ -n "${ENV_CXXFLAGS}" ]; then
+    echo "CXXFLAGS += $ENV_CXXFLAGS" >> "$TEMP_DIR/config.mk"
 fi
-if [ ! -z "${ENV_LDFLAGS}" ]; then
-    echo "LDFLAGS += $ENV_LDFLAGS" >> $TEMP_DIR/config.mk
+if [ -n "${ENV_LDFLAGS}" ]; then
+    echo "LDFLAGS += $ENV_LDFLAGS" >> "$TEMP_DIR/config.mk"
 fi
 
 #
@@ -343,7 +343,7 @@
         fi
         #end
         #foreach( $test in $sub.tests )
-            $test > /dev/null
+        $test > /dev/null
         if [ $? -ne 0 ]; then
         break
         fi
@@ -365,19 +365,19 @@
             break
         fi
         #else
-        TEMP_$flags.varName="$TEMP_$flags.varName $flags.value"    
+        TEMP_$flags.varName="$TEMP_$flags.varName $flags.value"
         #end
         #end
         #if ( $sub.make.length() > 0 )
         cat >> $TEMP_DIR/make.mk << __EOF__
-# Dependency: $dependency.name        
+# Dependency: $dependency.name
 $sub.make
 __EOF__
         #end
         echo yes
         return 0
     done
-    
+
     #end
     echo no
     return 1
@@ -423,7 +423,7 @@
         TEMP_CFLAGS="$TEMP_CFLAGS `$PKG_CONFIG --cflags $pkg.getPkgConfigParam()`"
         TEMP_LDFLAGS="$TEMP_LDFLAGS `$PKG_CONFIG --libs $pkg.getPkgConfigParam()`"
         #end
-        
+
         #foreach( $flags in $dependency.flags )
         #if( $flags.exec )
         $flags.value > /dev/null
@@ -434,31 +434,31 @@
             break
         fi
         #else
-        TEMP_$flags.varName="$TEMP_$flags.varName $flags.value"    
+        TEMP_$flags.varName="$TEMP_$flags.varName $flags.value"
         #end
         #end
         #if ( $dependency.make.length() > 0 )
-        cat >> $TEMP_DIR/make.mk << __EOF__
+        cat >> "$TEMP_DIR/make.mk" << __EOF__
 $dependency.make
 __EOF__
         #end
-        
+
         break
     done
-    
+
     break
 done
 #end
 
 # add general dependency flags to config.mk
-echo >> $TEMP_DIR/config.mk
-if [ ! -z "${TEMP_CFLAGS}" ]; then
+echo >> "$TEMP_DIR/config.mk"
+if [ -n "${TEMP_CFLAGS}" ]; then
     echo "CFLAGS += $TEMP_CFLAGS" >> $TEMP_DIR/config.mk
 fi
-if [ ! -z "${TEMP_CXXFLAGS}" ]; then
+if [ -n "${TEMP_CXXFLAGS}" ]; then
     echo "CXXFLAGS += $TEMP_CXXFLAGS" >> $TEMP_DIR/config.mk
 fi
-if [ ! -z "${TEMP_LDFLAGS}" ]; then
+if [ -n "${TEMP_LDFLAGS}" ]; then
     echo "LDFLAGS += $TEMP_LDFLAGS" >> $TEMP_DIR/config.mk
 fi
 #end
@@ -484,7 +484,7 @@
         TEMP_CFLAGS="$TEMP_CFLAGS ${def.toFlags()}"
     #end
     #if( $val.hasMake() )
-    cat >> $TEMP_DIR/make.mk << __EOF__
+    cat >> "$TEMP_DIR/make.mk" << __EOF__
 $val.make
 __EOF__
     #end
@@ -520,13 +520,13 @@
 
 # Features
 #foreach( $feature in $target.features )
-if [ ! -z "$${feature.getVarName()}" ]; then
+if [ -n "$${feature.getVarName()}" ]; then
 #foreach( $dependency in $feature.dependencies )
     # check dependency
     dependency_$dependency
     if [ $? -ne 0 ]; then
         # "auto" features can fail and are just disabled in this case
-        if [ $${feature.getVarName()} != "auto" ]; then
+        if [ "$${feature.getVarName()}" != "auto" ]; then
             DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED ${dependency} "
             ERROR=1
         fi
@@ -538,8 +538,8 @@
 #foreach( $opt in $target.options )
 # Option: --${opt.argument}
 if [ -z ${D}${opt.getVarName()} ]; then
-    SAVED_ERROR=$ERROR
-    SAVED_DEPENDENCIES_FAILED=$DEPENDENCIES_FAILED
+    SAVED_ERROR="$ERROR"
+    SAVED_DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED"
     ERROR=0
     while true
     do
@@ -549,7 +549,7 @@
         #end
         $optdef.func
         if [ $? -eq 0 ]; then
-            echo "  ${opt.argument}: ${optdef.valueName}" >> $TEMP_DIR/options
+            echo "  ${opt.argument}: ${optdef.valueName}" >> "$TEMP_DIR/options"
             ERROR=0
             break
         fi
@@ -562,13 +562,13 @@
     if [ $ERROR -ne 0 ]; then
         SAVED_ERROR=1
     fi
-    ERROR=$SAVED_ERROR
-    DEPENDENCIES_FAILED=$SAVED_DEPENDENCIES_FAILED=
+    ERROR="$SAVED_ERROR"
+    DEPENDENCIES_FAILED="$SAVED_DEPENDENCIES_FAILED"
 else
     if false; then
         false
     #foreach( $optval in $opt.values )
-    elif [ ${D}${opt.getVarName()} = "${optval.value}" ]; then
+    elif [ "${D}${opt.getVarName()}" = "${optval.value}" ]; then
         echo "  ${opt.argument}: ${D}${opt.getVarName()}" >> $TEMP_DIR/options
         $optval.func
         if [ $? -ne 0 ]; then
@@ -579,23 +579,23 @@
 fi
 #end
 
-echo >> $TEMP_DIR/config.mk
-if [ ! -z "${TEMP_CFLAGS}" ]; then
-    echo "${target.getCFlags()}  += $TEMP_CFLAGS" >> $TEMP_DIR/config.mk
+echo >> "$TEMP_DIR/config.mk"
+if [ -n "${TEMP_CFLAGS}" ]; then
+    echo "${target.getCFlags()}  += $TEMP_CFLAGS" >> "$TEMP_DIR/config.mk"
 fi
-if [ ! -z "${TEMP_CXXFLAGS}" ]; then
-    echo "${target.getCXXFlags()} += $TEMP_CXXFLAGS" >> $TEMP_DIR/config.mk
+if [ -n "${TEMP_CXXFLAGS}" ]; then
+    echo "${target.getCXXFlags()} += $TEMP_CXXFLAGS" >> "$TEMP_DIR/config.mk"
 fi
-if [ ! -z "${TEMP_LDFLAGS}" ]; then
-    echo "${target.getLDFlags()} += $TEMP_LDFLAGS" >> $TEMP_DIR/config.mk
+if [ -n "${TEMP_LDFLAGS}" ]; then
+    echo "${target.getLDFlags()} += $TEMP_LDFLAGS" >> "$TEMP_DIR/config.mk"
 fi
 
 #end
 if [ $ERROR -ne 0 ]; then
     echo
     echo "Error: Unresolved dependencies"
-    echo $DEPENDENCIES_FAILED
-    rm -Rf $TEMP_DIR
+    echo "$DEPENDENCIES_FAILED"
+    rm -Rf "$TEMP_DIR"
     exit 1
 fi
 
@@ -606,10 +606,10 @@
 echo "  TOOLCHAIN: $TOOLCHAIN_NAME"
 #if ( $options.size() > 0 )
 echo "Options:"
-cat $TEMP_DIR/options
+cat "$TEMP_DIR/options"
 #end
 echo
-cat $TEMP_DIR/config.mk $TEMP_DIR/make.mk > config.mk
-rm -Rf $TEMP_DIR
+cat "$TEMP_DIR/config.mk" "$TEMP_DIR/make.mk" > config.mk
+rm -Rf "$TEMP_DIR"