-for CACAO_AUTOMAKE in automake automake-1.9 automake19; do
- if ${CACAO_AUTOMAKE} --version > /dev/null 2>&1; then
- CACAO_AUTOMAKE_VERSION=`${CACAO_AUTOMAKE} --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
-# echo ${CACAO_AUTOMAKE_VERSION}
- case ${CACAO_AUTOMAKE_VERSION} in
+# Test for a aclocal.
+
+HAVE_ACLOCAL=false
+
+for ACLOCAL in aclocal aclocal-1.10 aclocal-1.9 aclocal19; do
+ if ${ACLOCAL} --version > /dev/null 2>&1; then
+ ACLOCAL_VERSION=`${ACLOCAL} --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
+# echo ${ACLOCAL_VERSION}
+ case ${ACLOCAL_VERSION} in
+ 1.9* | 1.1[0-9]* )
+ HAVE_ACLOCAL=true
+ break;
+ ;;
+ esac
+ fi
+done
+
+# Test for a automake.
+
+HAVE_AUTOMAKE=false
+
+for AUTOMAKE in automake automake-1.10 automake-1.9 automake19; do
+ if ${AUTOMAKE} --version > /dev/null 2>&1; then
+ AUTOMAKE_VERSION=`${AUTOMAKE} --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
+# echo ${AUTOMAKE_VERSION}
+ case ${AUTOMAKE_VERSION} in