--- a/configure.rc	Wed Nov 09 14:46:38 2022 +0100
+++ b/configure.rc	Sat Nov 19 15:45:41 2022 +0100
@@ -1,7 +1,7 @@
 #!/bin/rc
 #//////////////////////////////////////////////////////////////////////////////
 #
-# Copyright (c) 2007-2010 Daniel Adler <dadler@uni-goettingen.de>, 
+# Copyright (c) 2007-2022 Daniel Adler <dadler@uni-goettingen.de>, 
 #                         Tassilo Philipp <tphilipp@potion-studios.com>
 #
 # Permission to use, copy, modify, and distribute this software for any
@@ -21,26 +21,21 @@
 # --- configure settings ------------------------------------------------------
 
 PACKAGE=dyncall
-CONFIG_PREFIX=/usr/local #@@@
+
 
-# --- output error message ----------------------------------------------------
+# --- message helpers ----------------------------------------------------
 fn error {
   echo error: $*
   exit 1
 }
-
-# --- output warning message --------------------------------------------------
-
 fn warning {
   echo warning: $*
 }
-
-# --- output info message -----------------------------------------------------
-
 fn info {
   echo $*
 }
 
+
 # --- print usage -------------------------------------------------------------
 
 fn usage {
@@ -61,14 +56,12 @@
   #echo '  --tool-pcc         use Portable C Compiler'
   #echo 
   #echo '  --asm-xa           use Plan9 Assemblers (0a, 1a, 2a, etc.)'
-  #echo
-  #echo '  --config-release   build release version (default)'
-  #echo '  --config-debug     build debug version'
   echo
   exit 0
 }
 
-# --- guess operating system -------------------------------------------------
+
+# --- guess os, arch, ... -------------------------------------------------
 
 CONFIG_OS=()
 fn guess_os {
@@ -76,8 +69,6 @@
   info 'guess os '$CONFIG_OS
 }
 
-# --- guess architecture -----------------------------------------------------
-
 CONFIG_ARCH=()
 fn guess_arch {
   CONFIG_ARCH='x86'
@@ -98,8 +89,6 @@
   info 'guess arch '$CONFIG_ARCH
 }
 
-# --- guess tool chain -------------------------------------------------------
-
 CONFIG_TOOL=()
 fn guess_tool {
   #CONFIG_TOOL=`{grep CC /$objtype/mkfile | sed s/CC.//}
@@ -107,51 +96,12 @@
   info 'guess tool '$CONFIG_TOOL
 }
 
-# --- guess assembler --------------------------------------------------------
-
 CONFIG_ASM=()
 fn guess_asm {
   CONFIG_ASM=`{grep AS /$objtype/mkfile | sed s/AS.//}
   info 'guess assembler '$CONFIG_ASM
 }
 
-# --- process arguments ------------------------------------------------------
-
-fn args {
-  while(! ~ $#* 0 && ~ $1 -*) {
-    OPT=$1
-    shift
-
-    switch($OPT) {
-      case --help -h
-        usage
-      #case --target-x86
-        #CONFIG_ARCH='x86'
-      #case --target-x64
-        #CONFIG_ARCH='x64'
-      #case --target-ppc32
-        #CONFIG_ARCH='ppc32'
-      #case --target-arm-arm
-        #CONFIG_ARCH='arm32_arm'
-      #case --target-arm-thumb
-        #CONFIG_ARCH='arm32_thumb'
-      #case --tool-pcc
-        #CONFIG_TOOL=pcc
-        #CONFIG_ASM=2a
-      #case --tool-xa
-        #CONFIG_ASM=2a
-      #case --config-release
-        #CONFIG_CONFIG=release
-      #case --config-debug
-        #CONFIG_CONFIG=debug
-      case *
-        warning 'unknown option '$OPT
-    }
-  }
-}
-
-# --- guess variables --------------------------------------------------------
-
 fn guess {
   if(~ $#CONFIG_OS 0) {
     guess_os
@@ -180,55 +130,58 @@
       error 'no assembler tool'
     }
   }
-
-  if(~ $#CONFIG_CONFIG 0) {
-    CONFIG_CONFIG=release
-  }
-}
-  
-# --- set default variables --------------------------------------------------
-
-fn set_defaults {
-  CONFIG_HOST=$CONFIG_OS
 }
 
-# --- derive variables -------------------------------------------------------
+
+# --- process arguments ------------------------------------------------------
+
+fn args {
+  while(! ~ $#* 0 && ~ $1 -*) {
+    OPT=$1
+    shift
 
-fn derive_vars {
-  BUILD_HOST=$CONFIG_HOST
-  if(! ~ $CONFIG_HOST $CONFIG_OS) {
-    BUILD_HOST=$CONFIG_HOST'_'$CONFIG_OS
+    switch($OPT) {
+      case --help -h
+        usage
+      #case --target-x86
+        #CONFIG_ARCH='x86'
+      #case --target-x64
+        #CONFIG_ARCH='x64'
+      #case --target-ppc32
+        #CONFIG_ARCH='ppc32'
+      #case --target-arm-arm
+        #CONFIG_ARCH='arm32_arm'
+      #case --target-arm-thumb
+        #CONFIG_ARCH='arm32_thumb'
+      #case --tool-pcc
+        #CONFIG_TOOL=pcc
+        #CONFIG_ASM=2a
+      #case --tool-xa
+        #CONFIG_ASM=2a
+      case *
+        warning 'unknown option '$OPT
+    }
   }
 }
 
-# --- write ConfigVars files ------------------------------------------------
+
 
-fn output {
-  echo '#auto-generated by '$PACKAGE'/configure' >$1
-  echo 'CONFIG_PACKAGE='$PACKAGE >>$1
-  echo 'CONFIG_HOST='$CONFIG_HOST >>$1
-  echo 'CONFIG_OS='$CONFIG_OS >>$1
-  echo 'CONFIG_ARCH='$CONFIG_ARCH >>$1
-  echo 'CONFIG_TOOL='$CONFIG_TOOL >>$1
-  echo 'CONFIG_ASM='$CONFIG_ASM >>$1
-  echo 'CONFIG_CONFIG='$CONFIG_CONFIG >>$1
-  echo 'CONFIG_PREFIX='$CONFIG_PREFIX >>$1
-  if(! ~ $#CONFIG_BUILDPREFIX 0) {
-    echo 'CONFIG_BUILDPREFIX='$CONFIG_BUILDPREFIX >>$1
-  }
-  echo '' >>$1
+args $*
+info '* configure package '$PACKAGE
+guess
+
+CONFIG_HOST=$CONFIG_OS
+BUILD_HOST=$CONFIG_HOST
+if(! ~ $CONFIG_HOST $CONFIG_OS) {
+  BUILD_HOST=$CONFIG_HOST'_'$CONFIG_OS
 }
 
-# --- main -------------------------------------------------------------------
+echo '#auto-generated by '$PACKAGE'/configure' >$1
+echo 'CONFIG_PACKAGE='$PACKAGE >>$1
+echo 'CONFIG_HOST='$CONFIG_HOST >>$1
+echo 'CONFIG_OS='$CONFIG_OS >>$1
+echo 'CONFIG_ARCH='$CONFIG_ARCH >>$1
+echo 'CONFIG_TOOL='$CONFIG_TOOL >>$1
+echo 'CONFIG_ASM='$CONFIG_ASM >>$1
+echo '' >>$1
 
-fn main {
-  args $*
-  info '* configure package '$PACKAGE
-  guess
-  set_defaults
-  derive_vars
-  output ConfigVars 
-}
-
-main $*
-