ugh ugh

diff --git a/ChangeLog b/ChangeLog
index 81c32e13f6e74bf2cc5f96641fe790e0e128f92f..b7cb5ea969542c30c2e3a4ae9ed7f33962803cd2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-14  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * stepmake/aclocal.m4: Check for $GUILE_CONFIG; allows
+        circumvention of Debian packaging bug.
+
 2003-04-13  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * flex-2.5.31 hits Debian/unstable.  Fixes below.

diff --git a/aclocal.m4 b/aclocal.m4
index f72cb501a7b503f7cc70f3bfe55163614ba1ec95..11c8f4845767ee58ca6f4a4e0147ccc2d911e837 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,7 +1,4 @@
-dnl aclocal.m4   -*-shell-script-*-
-dnl WARNING WARNING WARNING
-dnl do not edit! this is aclocal.m4, generated from /home/janneke/lily/stepmake/aclocal.m4
-dnl aclocal.m4   -*-shell-script-*-
+:dnl aclocal.m4   -*-shell-script-*-
 dnl StepMake subroutines for configure.in
 
 
@@ -424,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])