Merge branch 'master' into Gtk

diff --cc src/configure.ac
Simple merge

diff --cc src/cref/redpkg.scm
index 6b545f6018f0a9cf70045975be89937a0d9d2b42,be0d0e45f0247a8f844a9d0029bb70b72de675b1..732c715c71ea7e12a5b42f5912e5185fd4294114
--- 1/src/cref/redpkg.scm
--- 2/src/cref/redpkg.scm
+++ b/src/cref/redpkg.scm
@@@ -372,15 -376,8 +376,15 @@@ USA
                        package
                        (append! (package-description/finalizations package)
                                 (list finalization))))))
 +              ((DEPENDS-ON)
 +               (if (not (check-list (cdr option) string?))
 +                   (error "Illegal depends-on" (cdr option)))
 +               (set-package-description/depends-on!
 +                package
 +                (append! (package-description/depends-on package)
 +                         (map parse-filename (cdr option)))))
                (else
-                (error "Unrecognized option keyword:" (car option)))))
+                (warn "Unexpected option:" option))))
            options))
  \f
  (define (parse-name name)