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

[Reid Spencer]

Changes in directory llvm-test/autoconf:

AutoRegen.sh updated: 1.1 -> 1.2
configure.ac updated: 1.2 -> 1.3
---
Log message:

Include the External programs in the configuration.


---
Diffs of the changes:  (+12 -42)

Index: llvm-test/autoconf/AutoRegen.sh
diff -u llvm-test/autoconf/AutoRegen.sh:1.1 llvm-test/autoconf/AutoRegen.sh:1.2
--- llvm-test/autoconf/AutoRegen.sh:1.1	Sat Sep  4 15:38:06 2004
+++ llvm-test/autoconf/AutoRegen.sh	Mon Sep  6 03:33:42 2004
@@ -6,7 +6,9 @@
 test -d autoconf && test -f autoconf/configure.ac && cd autoconf
 [ -f configure.ac ] || die "Can't find 'autoconf' dir; please cd into it first"
 echo "Regenerating aclocal.m4 with aclocal"
-aclocal || die "aclocal failed"
+rm -f aclocal.m4
+cwd=`pwd`
+aclocal -I $cwd/m4 || die "aclocal failed"
 autoconf --version | egrep '2\.5[0-9]' > /dev/null
 if test $? -ne 0
 then


Index: llvm-test/autoconf/configure.ac
diff -u llvm-test/autoconf/configure.ac:1.2 llvm-test/autoconf/configure.ac:1.3
--- llvm-test/autoconf/configure.ac:1.2	Sat Sep  4 15:38:06 2004
+++ llvm-test/autoconf/configure.ac	Mon Sep  6 03:33:42 2004
@@ -16,6 +16,15 @@
 AC_CONFIG_MAKEFILE(MultiSource/Makefile)
 AC_CONFIG_MAKEFILE(MultiSource/Makefile.multisrc)
 AC_CONFIG_MAKEFILE(External/Makefile)
+AC_CONFIG_MAKEFILE(External/Makefile.external)
+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.spec2000)
+AC_CONFIG_MAKEFILE(External/SPEC/Makefile.spec95)
+AC_CONFIG_MAKEFILE(External/SPEC/CFP2000/Makefile)
+AC_CONFIG_MAKEFILE(External/SPEC/CINT2000/Makefile)
+AC_CONFIG_MAKEFILE(External/SPEC/CINT95/Makefile)
 
 dnl **************************************************************************
 dnl * Set the location of various third-party software packages
@@ -87,47 +96,6 @@
 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)