[llvm-commits] CVS: llvm/autoconf/AutoRegen.sh

[Reid Spencer]

Changes in directory llvm/autoconf:

AutoRegen.sh updated: 1.12 -> 1.13
---
Log message:

Tighten this script up a bit.


---
Diffs of the changes:  (+7 -15)

 AutoRegen.sh |   22 +++++++---------------
 1 files changed, 7 insertions(+), 15 deletions(-)


Index: llvm/autoconf/AutoRegen.sh
diff -u llvm/autoconf/AutoRegen.sh:1.12 llvm/autoconf/AutoRegen.sh:1.13
--- llvm/autoconf/AutoRegen.sh:1.12	Tue Dec 21 23:56:41 2004
+++ llvm/autoconf/AutoRegen.sh	Wed May 31 20:08:28 2006
@@ -7,22 +7,14 @@
 configfile=configure.ac
 test -d autoconf && test -f autoconf/$configfile && cd autoconf
 test -f $configfile || die "Can't find 'autoconf' dir; please cd into it first"
-autoconf --version | egrep '2\.59' > /dev/null
-if test $? -ne 0 ; then
-  die "Your autoconf was not detected as being 2.59"
-fi
-aclocal --version | egrep '1\.9\.2' > /dev/null
-if test $? -ne 0 ; then
-  die "Your aclocal was not detected as being 1.9.2"
-fi
-autoheader --version | egrep '2\.59' > /dev/null
-if test $? -ne 0 ; then
-  die "Your autoheader was not detected as being 2.59"
-fi
+autoconf --version | grep '2\.59' > /dev/null
+test $? -eq 0 || die "Your autoconf was not detected as being 2.59"
+aclocal --version | grep '^aclocal.*1\.9\.2' > /dev/null
+test $? -eq 0 || die "Your aclocal was not detected as being 1.9.2"
+autoheader --version | grep '^autoheader.*2\.59' > /dev/null
+test $? -eq 0 || die "Your autoheader was not detected as being 2.59"
 libtool --version | grep '1\.5\.10' > /dev/null
-if test $? -ne 0 ; then
-  die "Your libtool was not detected as being 1.5.10"
-fi
+test $? -eq 0 || die "Your libtool was not detected as being 1.5.10"
 echo ""
 echo "### NOTE: ############################################################"
 echo "### If you get *any* warnings from autoconf below you MUST fix the"