Mercurial > hg > ascension / file diff

--- a/configure	Sun Nov 30 16:52:33 2025 +0100
+++ b/configure	Wed Dec 31 17:50:20 2025 +0100
@@ -85,11 +85,14 @@
 printhelp()
 {
     echo "Usage: $0 [OPTIONS]..."
-    echo 'Configuration:'
+    if [ $has_overridable_config_vars__ -eq 1 ] ; then
+        echo
+        echo "Configuration:"
+    fi
 if true \
       ; then
     :
-    if test -z "$TOOLKIT_HOME__described__"; then
+    if [ -z "$TOOLKIT_HOME__described__" ] ; then
         TOOLKIT_HOME__described__=1
         cat << '__EOF__'
   --toolkit-home          location of the toolkit installation (default: /usr)
@@ -124,14 +127,16 @@
 touch "$TEMP_DIR/features"
 
 # config variables
+has_overridable_config_vars__=0
 if true \
       ; then
     :
-    if test -z "$srcdir__initialized__"; then
+    if [ -z "$srcdir__initialized__" ] ; then
         srcdir__initialized__=1
         srcdir=`pwd`
     fi
-    if test -z "$TOOLKIT_HOME__initialized__"; then
+    if [ -z "$TOOLKIT_HOME__initialized__" ] ; then
+        has_overridable_config_vars__=1
         TOOLKIT_HOME__initialized__=1
         TOOLKIT_HOME='/usr'
     fi
@@ -254,18 +259,15 @@
 
 
 # generate vars.mk
-cat > "$TEMP_DIR/vars.mk" << __EOF__
-srcdir=$srcdir
-TOOLKIT_HOME=$TOOLKIT_HOME
-__EOF__
-
+echo '# configuration' > "$TEMP_DIR/vars.mk"
+echo "srcdir=$srcdir" >> "$TEMP_DIR/vars.mk"
+echo "TOOLKIT_HOME=$TOOLKIT_HOME" >> "$TEMP_DIR/vars.mk"
+echo >> "$TEMP_DIR/vars.mk"
 
 #
 # DEPENDENCIES
 #
 
-
-
 # create buffer for make variables required by dependencies
 echo > "$TEMP_DIR/make.mk"
 
@@ -449,7 +451,7 @@
         if [ -z "$PKG_CONFIG" ]; then
             break
         fi
-        if test_pkg_config "ucx" "3.2" "" "" ; then
+        if test_pkg_config "ucx" "4.0" "" "" ; then
             TEMP_CFLAGS="$TEMP_CFLAGS `"$PKG_CONFIG" --cflags ucx`"
             TEMP_LDFLAGS="$TEMP_LDFLAGS `"$PKG_CONFIG" --libs ucx`"
         else
@@ -693,10 +695,14 @@
 if [ -n "$TOOLCHAIN_CSTD" ]; then
     echo "  default C std:  $TOOLCHAIN_CSTD"
 fi
-echo
-echo "Config:"
-    printf '  %-16s' 'toolkit-home:'
-    echo "$TOOLKIT_HOME"
+if [ $has_overridable_config_vars__ -eq 1 ]; then
+    echo
+    echo "Config:"
+    if [ -n "$TOOLKIT_HOME__initialized__" ]; then
+        printf '  %-16s' 'toolkit-home:'
+        echo "$TOOLKIT_HOME"
+    fi
+fi
 echo
 echo "Features:"
 printf '  %-16s' 'asan:'