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

[Bill Wendling]

Changes in directory llvm-test/autoconf:

configure.ac updated: 1.36 -> 1.37
---
Log message:

Added support for SPEC2006.


---
Diffs of the changes:  (+13 -0)

 configure.ac |   13 +++++++++++++
 1 files changed, 13 insertions(+)


Index: llvm-test/autoconf/configure.ac
diff -u llvm-test/autoconf/configure.ac:1.36 llvm-test/autoconf/configure.ac:1.37
--- llvm-test/autoconf/configure.ac:1.36	Wed Aug 16 17:09:23 2006
+++ llvm-test/autoconf/configure.ac	Fri Sep  1 19:04:00 2006
@@ -33,8 +33,11 @@
 AC_CONFIG_MAKEFILE(External/Povray/Makefile)
 AC_CONFIG_MAKEFILE(External/SPEC/Makefile)
 AC_CONFIG_MAKEFILE(External/SPEC/Makefile.spec)
+AC_CONFIG_MAKEFILE(External/SPEC/Makefile.spec2006)
 AC_CONFIG_MAKEFILE(External/SPEC/Makefile.spec2000)
 AC_CONFIG_MAKEFILE(External/SPEC/Makefile.spec95)
+AC_CONFIG_MAKEFILE(External/SPEC/CFP2006/Makefile)
+AC_CONFIG_MAKEFILE(External/SPEC/CINT2006/Makefile)
 AC_CONFIG_MAKEFILE(External/SPEC/CFP2000/Makefile)
 AC_CONFIG_MAKEFILE(External/SPEC/CINT2000/Makefile)
 AC_CONFIG_MAKEFILE(External/SPEC/CFP95/Makefile)
@@ -69,6 +72,7 @@
 dnl Configure the default locations of the external benchmarks
 EXTERNAL_BENCHMARK(spec95,${LLVM_EXTERNALS}/spec95/benchspec)
 EXTERNAL_BENCHMARK(spec2000,${LLVM_EXTERNALS}/speccpu2000/benchspec)
+EXTERNAL_BENCHMARK(spec2006,${LLVM_EXTERNALS}/speccpu2006/benchspec)
 EXTERNAL_BENCHMARK(povray,${LLVM_EXTERNALS}/povray31)
 EXTERNAL_BENCHMARK(namd,${LLVM_EXTERNALS}/spec_namd)
 EXTERNAL_BENCHMARK(sweep3d,${LLVM_EXTERNALS}/sweep3d)
@@ -77,6 +81,15 @@
 EXTERNAL_BENCHMARK(nurbs,${LLVM_EXTERNALS}/nurbs)
 
 dnl Check that the paths of provided external benchmark dirs make sense
+if test -n "$SPEC2006_ROOT" ; then
+  if test -d "$SPEC2006_ROOT" ; then
+    if test `basename "$SPEC2006_ROOT"` != "benchspec"; then
+      AC_MSG_ERROR([SPEC 2006 directory must end in 'benchspec'])
+    fi
+  else
+    AC_MSG_ERROR([SPEC 2006 option must specify a directory])
+  fi
+fi
 if test -n "$SPEC2000_ROOT" ; then
   if test -d "$SPEC2000_ROOT" ; then
     if test `basename "$SPEC2000_ROOT"` != "benchspec"; then