From ac984301eb527bd1f5d6793b8b99df7f24d8eeb8 Mon Sep 17 00:00:00 2001 From: twisti Date: Fri, 15 Dec 2006 23:53:01 +0000 Subject: [PATCH 1/1] * autogen.sh: Check for automake-1.1x. --- autogen.sh | 6 +++--- src/vm/jit/alpha/codegen.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/autogen.sh b/autogen.sh index bc112236b..fe1b20efc 100755 --- 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 6e4d76e69..d15ef45f1 100644 --- 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 $ */ -- 2.25.1