@@ -20,10 +20,11 @@
 
 (declare (unit configfmod))
 (declare (uses debugprint))
 (declare (uses commonmod))
 (declare (uses processmod))
+(declare (uses mtargs))
 
 (use regex regex-case)
 
 (module configfmod
 *	
@@ -46,11 +47,13 @@
 	
 	)
 
 (import debugprint
 	commonmod
-	processmod)
+	processmod
+	(prefix mtargs args:)
+	)
 
 ;; Run a shell command and return the output as a string
 (define (shell cmd)
   (let* ((output (process:cmd-run->list cmd))
 	 (res    (car output))
@@ -430,11 +433,15 @@
       (debug:print 0 *default-log-port* "read of alist " fname " failed. exn=" exn)
       #f)
     (configf:alist->config
      (with-input-from-file fname read))))
 
-  
+(define read-config (lambda ()(assert #f "FATAL: read-config proc not set!")))
+
+(define (read-config-set! proc)
+  (set! read-config proc))
+
 ;; convert hierarchial list to ini format
 ;;
 (define (configf:config->ini data)
   (map 
    (lambda (section)
@@ -447,9 +454,27 @@
 		     (fname (if (> (length dat-pair) 2)(caddr dat-pair) #f)))
 		(if fname (print "# " var "=>" fname))
 		(print var " " val)))
 	    section-dat))) ;;       (print "section-dat: " section-dat))
    (hash-table->alist data)))
+
+;; pathenvvar will set the named var to the path of the config
+(define (find-and-read-config fname #!key (environ-patt #f)(given-toppath #f)(pathenvvar #f))
+  (let* ((curr-dir   (current-directory))
+         (configinfo (find-config fname toppath: given-toppath))
+	 (toppath    (car configinfo))
+	 (configfile (cadr configinfo))
+	 (set-fields (lambda (curr-section next-section ht path)
+		       (let ((field-names (if ht (common:get-fields ht) '()))
+			     (target      (or (getenv "MT_TARGET")(args:get-arg "-reqtarg")(args:get-arg "-target"))))
+			 (debug:print-info 9 *default-log-port* "set-fields with field-names=" field-names " target=" target " curr-section=" curr-section " next-section=" next-section " path=" path " ht=" ht)
+			 (if (not (null? field-names))(keys:target-set-args field-names target #f))))))
+    (if toppath (change-directory toppath)) 
+    (if (and toppath pathenvvar)(setenv pathenvvar toppath))
+    (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))))
 
 
 )