@@ -25,11 +25,37 @@
 (declare (uses mtargs))
 
 (use regex regex-case)
 
 (module configfmod
-*	
+	(
+	 configf:map-all-hier-alist
+	 configf:read-refdb
+	 lookup
+	 configf:lookup
+	 get-section
+	 configf:get-section
+	 configf:lookup-number
+	 read-config
+	 runconfigs-get
+	 configf:section-vars
+	 configf:read-alist
+	 configf:config->alist
+	 configf:alist->config
+	 configf:set-section-var
+
+	 find-and-read-config
+	 common:args-get-target
+	 configf:eval-string-in-environment
+
+	 read-config-set!
+	 configf:read-file
+
+	 configf:system
+	 configf:config->ini
+	 shell
+	)
 
 (import scheme
         chicken
 	extras
 	files
@@ -203,10 +229,12 @@
 	      (if match ;; (and match (list? match)(> (length match) 1))
 		  (cadr match)
 		  #f))
 	    ))
       #f))
+
+(define lookup configf:lookup)
 
 ;; use to have definitive setting:
 ;;  [foo]
 ;;  var yes
 ;;
@@ -234,10 +262,12 @@
 	'()
 	(map car sectdat))))
 
 (define (configf:get-section cfgdat section)
   (hash-table-ref/default cfgdat section '()))
+
+(define get-section configf:get-section)
 
 (define (configf:set-section-var cfgdat section var val)
   (let ((sectdat (configf:get-section cfgdat section)))
     (hash-table-set! cfgdat section
                      (configf:assoc-safe-add sectdat var val))))
@@ -473,8 +503,44 @@
     (let ((configdat  (if configfile 
 			  (read-config configfile #f #t environ-patt: environ-patt post-section-procs: (list (cons "^fields$" set-fields)) #f))))
       (if toppath (change-directory curr-dir))
       (list configdat toppath configfile fname))))
 
+
+;;======================================================================
+;; Lookup a value in runconfigs based on -reqtarg or -target
+;; 
+(define (runconfigs-get config var)
+  (let ((targ (common:args-get-target))) ;; (or (args:get-arg "-reqtarg")(args:get-arg "-target")(getenv "MT_TARGET"))))
+    (if targ
+	(or (configf:lookup config targ var)
+	    (configf:lookup config "default" var))
+	(configf:lookup config "default" var))))
+
+(define (common:args-get-target #!key (split #f)(exit-if-bad #f))
+  (let* ((keys    (if (hash-table? *configdat*) (common:get-fields *configdat*) '()))
+	 (numkeys (length keys))
+	 (target  (or (args:get-arg "-reqtarg")
+		      (args:get-arg "-target")
+		      (getenv "MT_TARGET")))
+	 (tlist   (if target (string-split target "/" #t) '()))
+	 (valid   (if target
+		      (or (null? keys) ;; probably don't know our keys yet
+			  (and (not (null? tlist))
+			       (eq? numkeys (length tlist))
+			       (null? (filter string-null? tlist))))
+		      #f)))
+    (if valid
+	(if split
+	    tlist
+	    target)
+	(if target
+	    (begin
+	      (debug:print-error 0 *default-log-port* "Invalid target, spaces or blanks not allowed \"" target "\", target should be: " (string-intersperse keys "/") ", have " tlist " for elements")
+	      (if exit-if-bad (exit 1))
+	      #f)
+	    #f))))
+
+(include "configf-guts.scm")
 
 )