# HG changeset patch
# User Mike Becker <universe@uap-core.de>
# Date 1734270353 -3600
# Node ID 33bc4ae5d7cf46a400f0e7d47d497d4722a68526
# Parent  c82d46627c723a7650f571de223116feeaa7f74d
improve error text when option is used without value - fixes #519

diff -r c82d46627c72 -r 33bc4ae5d7cf src/main/resources/make/configure.vm
--- a/src/main/resources/make/configure.vm	Sun Dec 15 14:35:58 2024 +0100
+++ b/src/main/resources/make/configure.vm	Sun Dec 15 14:45:53 2024 +0100
@@ -207,11 +207,12 @@
         "--infodir="*)        infodir=${D}{ARG#--infodir=} ;;
         "--mandir"*)          mandir=${D}{ARG#--mandir} ;;
         "--localedir"*)       localedir=${D}{ARG#--localedir} ;;
-        "--help"*) printhelp; abort_configure ;;
-        "--debug")           BUILD_TYPE="debug" ;;
-        "--release")         BUILD_TYPE="release" ;;
+        "--help"*)            printhelp; abort_configure ;;
+        "--debug")            BUILD_TYPE="debug" ;;
+        "--release")          BUILD_TYPE="release" ;;
     #foreach( $opt in $options )
         "--${opt.argument}="*) ${opt.varName}=${D}{ARG#--${opt.argument}=} ;;
+        "--${opt.argument}")  echo "option '$ARG' needs a value:"; echo "  $ARG=${opt.valuesString}"; abort_configure ;;
     #end
     #foreach( $feature in $features )
         "--enable-${feature.arg}") ${feature.varName}=on ;;
diff -r c82d46627c72 -r 33bc4ae5d7cf test/configure
--- a/test/configure	Sun Dec 15 14:35:58 2024 +0100
+++ b/test/configure	Sun Dec 15 14:45:53 2024 +0100
@@ -186,9 +186,9 @@
         "--infodir="*)        infodir=${ARG#--infodir=} ;;
         "--mandir"*)          mandir=${ARG#--mandir} ;;
         "--localedir"*)       localedir=${ARG#--localedir} ;;
-        "--help"*) printhelp; abort_configure ;;
-        "--debug")           BUILD_TYPE="debug" ;;
-        "--release")         BUILD_TYPE="release" ;;
+        "--help"*)            printhelp; abort_configure ;;
+        "--debug")            BUILD_TYPE="debug" ;;
+        "--release")          BUILD_TYPE="release" ;;
         "--enable-pg") FEATURE_PG=on ;;
         "--disable-pg") unset FEATURE_PG ;;
         "-"*) echo "unknown option: $ARG"; abort_configure ;;
diff -r c82d46627c72 -r 33bc4ae5d7cf test/configure2
--- a/test/configure2	Sun Dec 15 14:35:58 2024 +0100
+++ b/test/configure2	Sun Dec 15 14:45:53 2024 +0100
@@ -181,10 +181,11 @@
         "--infodir="*)        infodir=${ARG#--infodir=} ;;
         "--mandir"*)          mandir=${ARG#--mandir} ;;
         "--localedir"*)       localedir=${ARG#--localedir} ;;
-        "--help"*) printhelp; abort_configure ;;
-        "--debug")           BUILD_TYPE="debug" ;;
-        "--release")         BUILD_TYPE="release" ;;
+        "--help"*)            printhelp; abort_configure ;;
+        "--debug")            BUILD_TYPE="debug" ;;
+        "--release")          BUILD_TYPE="release" ;;
         "--toolkit="*) OPT_TOOLKIT=${ARG#--toolkit=} ;;
+        "--toolkit")  echo "option '$ARG' needs a value:"; echo "  $ARG=(gtk3|cli|gtk2|wpf)"; abort_configure ;;
         "--enable-db") FEATURE_DB=on ;;
         "--disable-db") unset FEATURE_DB ;;
         "--enable-gui") FEATURE_GUI=on ;;
diff -r c82d46627c72 -r 33bc4ae5d7cf test/make/configure.vm
--- a/test/make/configure.vm	Sun Dec 15 14:35:58 2024 +0100
+++ b/test/make/configure.vm	Sun Dec 15 14:45:53 2024 +0100
@@ -207,11 +207,12 @@
         "--infodir="*)        infodir=${D}{ARG#--infodir=} ;;
         "--mandir"*)          mandir=${D}{ARG#--mandir} ;;
         "--localedir"*)       localedir=${D}{ARG#--localedir} ;;
-        "--help"*) printhelp; abort_configure ;;
-        "--debug")           BUILD_TYPE="debug" ;;
-        "--release")         BUILD_TYPE="release" ;;
+        "--help"*)            printhelp; abort_configure ;;
+        "--debug")            BUILD_TYPE="debug" ;;
+        "--release")          BUILD_TYPE="release" ;;
     #foreach( $opt in $options )
         "--${opt.argument}="*) ${opt.varName}=${D}{ARG#--${opt.argument}=} ;;
+        "--${opt.argument}")  echo "option '$ARG' needs a value:"; echo "  $ARG=${opt.valuesString}"; abort_configure ;;
     #end
     #foreach( $feature in $features )
         "--enable-${feature.arg}") ${feature.varName}=on ;;