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

[Misha Brukman]

Changes in directory llvm-test/autoconf:

configure.ac updated: 1.3 -> 1.4
---
Log message:

* Makefile.common is NOT auto-generated, needs to be copied over
* Makefile.config IS auto-generated
* Copy over Makefile.tests and all TEST.* Makefiles into the object tree
* Alphabetize Makefile directories included
* Bring back AC_DEFUN(EXTERNAL_BENCHMARK, ...) to support SPEC 95 and 2k


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

Index: llvm-test/autoconf/configure.ac
diff -u llvm-test/autoconf/configure.ac:1.3 llvm-test/autoconf/configure.ac:1.4
--- llvm-test/autoconf/configure.ac:1.3	Mon Sep  6 03:33:42 2004
+++ llvm-test/autoconf/configure.ac	Mon Sep  6 22:31:29 2004
@@ -5,16 +5,26 @@
 AC_CONFIG_AUX_DIR([autoconf])
 
 dnl Verify that the source directory is valid
-AC_CONFIG_SRCDIR(["Makefile.common.in"])
+AC_CONFIG_SRCDIR(["Makefile.config.in"])
 
 dnl Do special configuration of Makefiles
 AC_CONFIG_MAKEFILE(Makefile)
-AC_CONFIG_MAKEFILE(Makefile.tests)
+AC_CONFIG_MAKEFILE(Makefile.common)
 AC_CONFIG_MAKEFILE(Makefile.programs)
-AC_CONFIG_MAKEFILE(SingleSource/Makefile)
-AC_CONFIG_MAKEFILE(SingleSource/Makefile.singlesrc)
-AC_CONFIG_MAKEFILE(MultiSource/Makefile)
-AC_CONFIG_MAKEFILE(MultiSource/Makefile.multisrc)
+AC_CONFIG_MAKEFILE(Makefile.tests)
+AC_CONFIG_MAKEFILE(TEST.aa.Makefile)
+AC_CONFIG_MAKEFILE(TEST.dsgraph.report)
+AC_CONFIG_MAKEFILE(TEST.aa.report)
+AC_CONFIG_MAKEFILE(TEST.example.Makefile)
+AC_CONFIG_MAKEFILE(TEST.nightly.Makefile)
+AC_CONFIG_MAKEFILE(TEST.buildrepo.Makefile)
+AC_CONFIG_MAKEFILE(TEST.jit.Makefile)
+AC_CONFIG_MAKEFILE(TEST.nightly.report)
+AC_CONFIG_MAKEFILE(TEST.dsgraph.Makefile)
+AC_CONFIG_MAKEFILE(TEST.jit.report)
+AC_CONFIG_MAKEFILE(TEST.typesafe.Makefile)
+AC_CONFIG_MAKEFILE(TEST.dsgraph.gnuplot)
+AC_CONFIG_MAKEFILE(TEST.vtl.Makefile)
 AC_CONFIG_MAKEFILE(External/Makefile)
 AC_CONFIG_MAKEFILE(External/Makefile.external)
 AC_CONFIG_MAKEFILE(External/Povray/Makefile)
@@ -25,6 +35,10 @@
 AC_CONFIG_MAKEFILE(External/SPEC/CFP2000/Makefile)
 AC_CONFIG_MAKEFILE(External/SPEC/CINT2000/Makefile)
 AC_CONFIG_MAKEFILE(External/SPEC/CINT95/Makefile)
+AC_CONFIG_MAKEFILE(MultiSource/Makefile)
+AC_CONFIG_MAKEFILE(MultiSource/Makefile.multisrc)
+AC_CONFIG_MAKEFILE(SingleSource/Makefile)
+AC_CONFIG_MAKEFILE(SingleSource/Makefile.singlesrc)
 
 dnl **************************************************************************
 dnl * Set the location of various third-party software packages
@@ -96,6 +110,48 @@
 dnl Determine if the linker supports the -R option.
 AC_LINK_USE_R
 
+AC_DEFUN(EXTERNAL_BENCHMARK,
+[m4_define([allcapsname],translit($1,a-z,A-Z))
+ AC_ARG_ENABLE($1,
+ AC_HELP_STRING([--enable-$1=ARG],
+                [Use $1 as a benchmark (srcs in DIR)]),
+ checkresult=$enableval,
+ checkresult=auto)
+AC_MSG_CHECKING([for $1 benchmark sources])
+case "$checkresult" in
+auto|yes)
+    defaultdir=$2
+  if test -d "$defaultdir"
+  then
+    AC_SUBST(allcapsname()[_ROOT],[$defaultdir])
+    AC_SUBST([USE_]allcapsname(),[USE_]allcapsname()=1)
+        checkresult="yes, found in $defaultdir"
+    else
+        checkresult=no
+    fi
+    ;;
+no)
+    AC_SUBST(allcapsname()[_ROOT],[])
+    AC_SUBST([USE_]allcapsname(),[])
+    checkresult=no
+    ;;
+*)  if test -d "$checkresult"
+    then
+        AC_SUBST(allcapsname()[_ROOT],"$checkresult")
+        AC_SUBST([USE_]allcapsname(),[USE_]allcapsname()=1)
+        checkresult="yes, in $checkresult"
+    else
+        AC_SUBST(allcapsname()[_ROOT],[])
+        AC_SUBST([USE_]allcapsname(),[])
+        checkresult="no, not found in $checkresult"
+    fi
+    ;;
+esac
+AC_MSG_RESULT($checkresult)
+m4_undefine([allcapsname])
+])
+
+
 EXTERNAL_BENCHMARK(spec95,/home/vadve/shared/benchmarks/spec95/benchspec)
 EXTERNAL_BENCHMARK(spec2000,/home/vadve/shared/benchmarks/speccpu2000/benchspec)
 EXTERNAL_BENCHMARK(povray,/home/vadve/shared/benchmarks/povray31)
@@ -116,4 +172,4 @@
 AC_ARG_WITH(papi,AC_HELP_STRING([--with-papi],[Location of PAPI]),AC_SUBST(PAPIDIR,[$withval]),AC_SUBST(PAPIDIR,[/home/vadve/shared/Sparc/papi-2.3.4.1]))
 
 dnl Create the output files
-AC_OUTPUT(Makefile.common)
+AC_OUTPUT(Makefile.config)