Mercurial > hg > ucx / file diff

--- a/make/configure.vm	Sun Dec 15 15:22:45 2024 +0100
+++ b/make/configure.vm	Sun Dec 15 15:23:29 2024 +0100
@@ -107,22 +107,24 @@
   --mandir=DIR            man documentation [DATAROOTDIR/man]
   --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
 
+Build Types:
+--debug                 add extra compile flags for debug builds
+--release               add extra compile flags for release builds
 #if( $options.size() > 0 )
+
 Options:
-  --debug                 add extra compile flags for debug builds
-  --release               add extra compile flags for release builds
 #foreach( $opt in $options )
   --${opt.argument}=${opt.valuesString}
 #end
-
 #end
 #if( $features.size() > 0 )
+
 Optional Features:
 #foreach( $feature in $features )
 ${feature.helpText}
 #end
+#end
 
-#end
 __EOF__
 }
 
@@ -207,11 +209,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 ;;
@@ -408,9 +411,9 @@
 ERROR=0
 #if( $dependencies.size() > 0 )
 # unnamed dependencies
-TEMP_CFLAGS=
-TEMP_CXXFLAGS=
-TEMP_LDFLAGS=
+TEMP_CFLAGS="$CFLAGS"
+TEMP_CXXFLAGS="$CXXFLAGS"
+TEMP_LDFLAGS="$LDFLAGS"
 #foreach( $dependency in $dependencies )
 while true
 do
@@ -643,6 +646,11 @@
             DEPENDENCIES_FAILED="option '${opt.argument}' $DEPENDENCIES_FAILED"
         fi
     #end
+    else
+        echo
+        echo "Invalid option value - usage:"
+        echo "  --${opt.argument}=${opt.valuesString}"
+        abort_configure
     fi
 fi
 #end