* format-page.py (button_active_template, button_template): Use

non-mangled text and activeness.

* stepmake/aclocal.m4: Check for $GUILE_CONFIG; allows
 circumvention of Debian packaging bug.

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index 8851cc4e7a872d144d7ba2997bab278d2c716e2a..1abbe7cf82291b012b0de821a9bb0a2e91a89b8f 100644 (file)
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -421,7 +421,7 @@ AC_DEFUN([STEPMAKE_GUILE_FLAGS], [
 AC_DEFUN(STEPMAKE_GUILE_DEVEL, [
     ## First, let's just see if we can find Guile at all.
     AC_MSG_CHECKING([for guile-config])
-    for guile_config in guile-config $target-guile-config $build-guile-config; do
+    for guile_config in $GUILE_CONFIG guile-config $target-guile-config $build-guile-config; do
        AC_MSG_RESULT([$guile_config])
        if ! $guile_config --version > /dev/null 2>&1 ; then
            AC_MSG_WARN([cannot execute $guile_config])