From 8050ee91bc4ef3653bae8d2e56f3612256a30cda Mon Sep 17 00:00:00 2001
From: yangsheng <yangsheng>
Date: Thu, 4 Sep 2008 09:52:20 +0000
Subject: [PATCH] Branch b1_6 b=13876 i=sheng.yang, brian(llnl)

Detect available autoconf version.
---
 build/autogen.sh | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/build/autogen.sh b/build/autogen.sh
index 71c05e4..32526dd 100644
--- a/build/autogen.sh
+++ b/build/autogen.sh
@@ -105,15 +105,21 @@ for dir in $OPTIONAL_DIRS; do
     fi
 done
 
-check_version automake automake-1.7 "1.7.8"
+for AMVER in 1.7 1.8 1.9 1.10; do
+     [ "$(which automake-$AMVER 2> /dev/null)" ] && break
+done
+
+[ "$AMVER" = "1.10" ] && AMOPT="-W no-portability"
+
+check_version automake automake-$AMVER "1.7.8"
 check_version autoconf autoconf "2.57"
 
-echo "Running aclocal-1.7 $ACLOCAL_FLAGS..."
-aclocal-1.7 $ACLOCAL_FLAGS || exit 1
+echo "Running aclocal-$AMVER $ACLOCAL_FLAGS..."
+aclocal-$AMVER $ACLOCAL_FLAGS || exit 1
 echo "Running autoheader..."
 autoheader || exit 1
-echo "Running automake-1.7..."
-automake-1.7 -a -c || exit 1
+echo "Running automake-$AMVER..."
+automake-$AMVER -a -c $AMOPT || exit 1
 echo "Running autoconf..."
 autoconf || exit 1
 
-- 
1.8.3.1