* autogen.sh: Check for automake-1.1x.

diff --git a/autogen.sh b/autogen.sh
index bc112236be1b7d10704a4eb44d20086b09aeb27f..fe1b20efc5893c0562681bcfc9e4536c46f381a6 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -33,7 +33,7 @@ for CACAO_ACLOCAL in aclocal aclocal-1.9 aclocal19; do
         CACAO_ACLOCAL_VERSION=`${CACAO_ACLOCAL} --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
 #        echo ${CACAO_ACLOCAL_VERSION}
         case ${CACAO_ACLOCAL_VERSION} in
-            1.9* )
+            1.9* | 1.1[0-9]* )
                 CACAO_HAVE_ACLOCAL=true
                 break;
                 ;;
@@ -43,7 +43,7 @@ done
 
 if test ${CACAO_HAVE_ACLOCAL} = false; then
     echo "No proper aclocal was found."
-    echo "You must have automake 1.9 installed."
+    echo "You must have automake 1.9 or later installed."
     exit 1
 fi
 
@@ -57,7 +57,7 @@ for CACAO_AUTOHEADER in autoheader autoheader259; do
         CACAO_AUTOHEADER_VERSION=`${CACAO_AUTOHEADER} --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
 #        echo ${CACAO_AUTOHEADER_VERSION}
         case ${CACAO_AUTOHEADER_VERSION} in
-            2.59* | 2.6* )
+            2.59* | 2.6[0-9]* )
                 CACAO_HAVE_AUTOHEADER=true
                 break;
                 ;;

diff --git a/src/vm/jit/alpha/codegen.c b/src/vm/jit/alpha/codegen.c
index 6e4d76e695f831343e3be2ac73c702ea72f2c9fc..d15ef45f1a0a6633798c0f1f2e3e30025d14d8a5 100644 (file)
--- a/src/vm/jit/alpha/codegen.c
+++ b/src/vm/jit/alpha/codegen.c
@@ -31,7 +31,7 @@
             Christian Ullrich
             Edwin Steiner
 
-   $Id: codegen.c 6171 2006-12-11 11:47:42Z twisti $
+   $Id: codegen.c 6165 2006-12-10 22:07:02Z twisti $
 
 */