Index: configf.scm ================================================================== --- configf.scm +++ configf.scm @@ -148,21 +148,25 @@ res) (regex-case inl (configf:comment-rx _ (loop (configf:read-line inp res allow-system) curr-section-name #f #f)) (configf:blank-l-rx _ (loop (configf:read-line inp res allow-system) curr-section-name #f #f)) - (configf:include-rx ( x include-file ) (if (file-exists? include-file) - (let ((curr-dir (current-directory)) - (conf-dir (pathname-directory include-file)) - (incfname (pathname-strip-directory include-file))) - (push-directory conf-dir) - (read-config incfname res allow-system environ-patt: environ-patt curr-section: curr-section-name sections: sections) - (pop-directory) - (loop (configf:read-line inp res allow-system) curr-section-name #f #f)) - (begin - (debug:print 0 "INFO: include file " include-file " not found (called from " path ")") - (loop (configf:read-line inp res allow-system) curr-section-name #f #f)))) + (configf:include-rx ( x include-file ) (let* ((curr-dir (current-directory)) + (full-conf (if (absolute-pathname? include-file) + include-file + (conc curr-dir "/" include-file))) + (conf-dir (pathname-directory include-file)) + (incfname (pathname-strip-directory include-file))) + (if (file-exists? full-conf) + (begin + ;; (push-directory conf-dir) + (read-config full-conf res allow-system environ-patt: environ-patt curr-section: curr-section-name sections: sections) + ;; (pop-directory) + (loop (configf:read-line inp res allow-system) curr-section-name #f #f)) + (begin + (debug:print 0 "INFO: include file " include-file " not found (called from " path ")") + (loop (configf:read-line inp res allow-system) curr-section-name #f #f))))) (configf:section-rx ( x section-name ) (loop (configf:read-line inp res allow-system) ;; if we have the sections list then force all settings into "" and delete it later? (if (or (not sections) (member section-name sections)) section-name "") ;; stick everything into "" Index: megatest-version.scm ================================================================== --- megatest-version.scm +++ megatest-version.scm @@ -1,7 +1,7 @@ ;; Always use two digit decimal ;; 1.01, 1.02...1.10,1.11 ... 1.99,2.00.. (declare (unit megatest-version)) -(define megatest-version 1.5406) +(define megatest-version 1.5407)