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

[Reid Spencer]

Changes in directory llvm-test/autoconf:

AutoRegen.sh updated: 1.4 -> 1.5
configure.ac updated: 1.32 -> 1.33
---
Log message:

For PR875: http://llvm.org/PR875 :
Make the SPEC2000 and SPEC95 checks look for a dir ending in "benchspec"


---
Diffs of the changes:  (+23 -4)

 AutoRegen.sh |    2 +-
 configure.ac |   25 ++++++++++++++++++++++---
 2 files changed, 23 insertions(+), 4 deletions(-)


Index: llvm-test/autoconf/AutoRegen.sh
diff -u llvm-test/autoconf/AutoRegen.sh:1.4 llvm-test/autoconf/AutoRegen.sh:1.5
--- llvm-test/autoconf/AutoRegen.sh:1.4	Wed Dec 29 13:12:55 2004
+++ llvm-test/autoconf/AutoRegen.sh	Mon Aug 14 18:10:49 2006
@@ -5,7 +5,7 @@
 }
 test -d autoconf && test -f autoconf/configure.ac && cd autoconf
 test -f configure.ac || die "Can't find 'autoconf' dir; please cd into it first"
-autoconf --version | egrep '2\.5[0-9]' > /dev/null
+autoconf --version | egrep '2\.[5-6][0-9]' > /dev/null
 if test $? -ne 0 ; then
 	die "Your autoconf was not detected as being 2.5x"
 fi


Index: llvm-test/autoconf/configure.ac
diff -u llvm-test/autoconf/configure.ac:1.32 llvm-test/autoconf/configure.ac:1.33
--- llvm-test/autoconf/configure.ac:1.32	Mon Apr 17 19:02:53 2006
+++ llvm-test/autoconf/configure.ac	Mon Aug 14 18:10:49 2006
@@ -76,6 +76,26 @@
 EXTERNAL_BENCHMARK(alp,${LLVM_EXTERNALS}/alp)
 EXTERNAL_BENCHMARK(nurbs,${LLVM_EXTERNALS}/nurbs)
 
+dnl Check that the paths of provided external benchmark dirs make sense
+if test -n "$SPEC2000_ROOT" ; then
+  if test -d "$SPEC2000_ROOT" ; then
+    if test `basename '${SPEC2000_ROOT%benchspec}'` != "benchspec"; then
+      AC_MSG_ERROR([SPEC 2000 directory must end in 'benchspec'])
+    fi
+  else
+    AC_MSG_ERROR([SPEC 2000 option must specify a directory])
+  fi
+fi
+if test -n "$SPEC95_ROOT" ; then
+  if test -d "$SPEC95_ROOT" ; then
+    if test `basename '${SPEC95_ROOT%benchspec}'` != "benchspec"; then
+      AC_MSG_ERROR([SPEC 95 directory must end in 'benchspec'])
+    fi
+  else
+    AC_MSG_ERROR([SPEC 95 option must specify a directory])
+  fi
+fi
+
 dnl LLC Diff Option
 AC_ARG_ENABLE(llc_diffs,
   AS_HELP_STRING(--enable-llc_diffs,
@@ -101,9 +121,8 @@
 
 dnl Check for GNU Make.  We use its extensions too, so don't build without it
 AC_CHECK_GNU_MAKE
-if test -z "$llvm_cv_gnu_make_command"
-then
-	AC_MSG_ERROR([GNU Make required but not found])
+if test -z "$llvm_cv_gnu_make_command" ; then
+  AC_MSG_ERROR([GNU Make required but not found])
 fi
 
 dnl Checks for other tools