guile-cvs on Debian/unstable

[Jan Nieuwenhuizen]

It seems that Guile won't accept automake-1.7; and automake 1.6a is
not detected on Debian GNU/Linux.

Below the patch I used.  I must be missing something, is none of you
running Debian?

Greetings,
Jan.


2002-10-10  Jan Nieuwenhuizen  <address@hidden>

        * autogen.sh: Accept automake-1.6a, for Debian unstable.
        
        * guile-aclocal.sh: Likewise for aclocal-1.6a.


Index: autogen.sh
===================================================================
RCS file: /cvsroot/guile/guile/guile-core/autogen.sh,v
retrieving revision 1.27
diff -p -u -r1.27 autogen.sh
--- autogen.sh  5 Oct 2002 11:52:07 -0000       1.27
+++ autogen.sh  10 Oct 2002 12:48:15 -0000
@@ -76,7 +76,7 @@ fi
 
 
 # configure.in reqs automake-1.6; try to find it
-for suf in "-1.6" "1.6" ""  false; do
+for suf in "-1.6" "1.6" "-1.6a" ""  false; do
   version=`automake$suf --version 2>/dev/null | head -1 | awk '{print $NF}' | 
awk -F. '{print $1 * 10 + $2}'`
   if test "0$version" -eq 16; then
     automake=automake$suf
Index: guile-aclocal.sh
===================================================================
RCS file: /cvsroot/guile/guile/guile-core/guile-aclocal.sh,v
retrieving revision 1.2
diff -p -u -r1.2 guile-aclocal.sh
--- guile-aclocal.sh    26 Apr 2002 18:05:08 -0000      1.2
+++ guile-aclocal.sh    10 Oct 2002 12:48:15 -0000
@@ -4,4 +4,23 @@
 # invocation of aclocal is specified.  It is called from both
 # autogen.sh and the Makefile.
 
-aclocal -I guile-config
+################################################################
+
+#detect aclocal version
+
+
+# configure.in reqs aclocal-1.6; try to find it
+for suf in "-1.6" "1.6" "-1.6a" ""  false; do
+  version=`aclocal$suf --version 2>/dev/null | head -1 | awk '{print $NF}' | 
awk -F. '{print $1 * 10 + $2}'`
+  if test "0$version" -eq 16; then
+    aclocal=aclocal$suf
+    break
+  fi
+done
+
+if test -z "$aclocal"; then
+    echo "ERROR: Please install aclocal 1.6.x"
+    exit 1
+fi
+
+$aclocal -I guile-config

-- 
Jan Nieuwenhuizen <address@hidden> | GNU LilyPond - The music typesetter
http://www.xs4all.nl/~jantien       | http://www.lilypond.org