fix build errors on fresh checkout

* meta/guile-tools: We can't use srfi-1, because on a fresh checkout
  the srfi-1 shlib isn't built yet. Bummer.

* meta/uninstalled-env.in: Fix up the DYLD lines for BSDen.

* module/scripts/snart-guile-m4-docs.scm: Fix expected arguments.

diff --git a/meta/guile-tools b/meta/guile-tools
index 6df88ef..c30f026 100755 (executable)
--- a/meta/guile-tools
+++ b/meta/guile-tools
@@ -22,8 +22,15 @@ exec guile $GUILE_FLAGS -e '(@@ (guile-tools) main)' -s "$0" "$@"
 ;;;; License along with this library; if not, write to the Free Software
 ;;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-(define-module (guile-tools)
-  #:use-module (srfi srfi-1))
+(define-module (guile-tools))
+
+;; We can't import srfi-1, unfortunately, as we are used early in the
+;; boot process, before the srfi-1 shlib is built.
+
+(define (fold kons seed seq)
+  (if (null? seq)
+      seed
+      (fold kons (kons (car seq) seed) (cdr seq))))
 
 (define (help)
   (display "\

diff --git a/meta/uninstalled-env.in b/meta/uninstalled-env.in
index 02c0e31..56bbc30 100644 (file)
--- a/meta/uninstalled-env.in
+++ b/meta/uninstalled-env.in
@@ -80,7 +80,7 @@ for dir in $subdirs_with_ltlibs ; do
 done
 LTDL_LIBRARY_PATH="${ltdl_prefix}$LTDL_LIBRARY_PATH"
 export LTDL_LIBRARY_PATH
-DYLD_LIBRARY_PATH="${dyld_prefix}${top_builddir}/libguile/.libs:$DYLD_LIBRARY_PATH"
+DYLD_LIBRARY_PATH="${dyld_prefix}$DYLD_LIBRARY_PATH"
 export DYLD_LIBRARY_PATH
 
 if [ x"$PKG_CONFIG_PATH" = x ]

diff --git a/module/scripts/snarf-guile-m4-docs.scm b/module/scripts/snarf-guile-m4-docs.scm
index 11fb82b..614fc0f 100644 (file)
--- a/module/scripts/snarf-guile-m4-docs.scm
+++ b/module/scripts/snarf-guile-m4-docs.scm
@@ -63,7 +63,7 @@
                       (else (car line)))
                     acc)))))
 
-(define (snarf-guile-m4-docs . args)
+(define (snarf-guile-m4-docs args)
   (let* ((p (open-file (car args) "r"))
          (next (lambda () (read-line p))))
     (let loop ((line (next)) (acc #f))