We are now on LLVM 1.3
[oota-llvm.git] / autoconf / configure.ac
index a004dc4a4b0273c62cb398952fa5f59a2d96393e..b779088ee2c1d592601807a3154e0a775db1db8b 100644 (file)
@@ -1,21 +1,5 @@
-dnl Autoconf requirements
-dnl AC_INIT(package, version, bug-report-address)
-dnl information on the package
-dnl checks for programs
-dnl checks for libraries
-dnl checks for header files
-dnl checks for types
-dnl checks for structures
-dnl checks for compiler characteristics
-dnl checks for library functions
-dnl checks for system services
-dnl AC_CONFIG_FILES([file...])
-dnl AC_OUTPUT
-
-dnl **************************************************************************
-dnl * Initialize
-dnl **************************************************************************
-AC_INIT([[[LLVM]]],[[[1.0]]],[llvmbugs@cs.uiuc.edu])
+dnl Initialize autoconf
+AC_INIT([[[LLVM]]],[[[1.3]]],[llvmbugs@cs.uiuc.edu])
 
 dnl Place all of the extra autoconf files into the config subdirectory
 AC_CONFIG_AUX_DIR([autoconf])
@@ -30,75 +14,32 @@ then
        fi
 fi
 
-if test -d ${srcdir}/projects/reopt
-then
-  AC_CONFIG_SUBDIRS(projects/reopt)
-fi
-
-if test -d ${srcdir}/projects/poolalloc
-then
-  AC_CONFIG_SUBDIRS(projects/poolalloc)
-fi
+dnl Configure all of the projects present in our source tree.
+for i in `ls ${srcdir}/projects`
+do
+  if test ${i} != "CVS"
+  then
+    if test -f ${srcdir}/projects/${i}/configure
+    then
+      AC_CONFIG_SUBDIRS(projects/${i})
+    fi
+  fi
+done
 
 dnl Configure a header file
 AC_CONFIG_HEADERS(include/Config/config.h)
 AC_CONFIG_MAKEFILE(Makefile)
 AC_CONFIG_MAKEFILE(Makefile.common)
-AC_CONFIG_MAKEFILE(Makefile.rules)
 AC_CONFIG_MAKEFILE(lib/Makefile)
-AC_CONFIG_MAKEFILE(lib/Analysis/Makefile)
-AC_CONFIG_MAKEFILE(lib/Analysis/DataStructure/Makefile)
-AC_CONFIG_MAKEFILE(lib/Analysis/IPA/Makefile)
-AC_CONFIG_MAKEFILE(lib/Analysis/LiveVar/Makefile)
-AC_CONFIG_MAKEFILE(lib/AsmParser/Makefile)
-AC_CONFIG_MAKEFILE(lib/Bytecode/Makefile)
-AC_CONFIG_MAKEFILE(lib/Bytecode/Reader/Makefile)
-AC_CONFIG_MAKEFILE(lib/Bytecode/Writer/Makefile)
-AC_CONFIG_MAKEFILE(lib/CWriter/Makefile)
-AC_CONFIG_MAKEFILE(lib/CodeGen/Makefile)
-AC_CONFIG_MAKEFILE(lib/CodeGen/InstrSched/Makefile)
-AC_CONFIG_MAKEFILE(lib/CodeGen/InstrSelection/Makefile)
-AC_CONFIG_MAKEFILE(lib/CodeGen/ModuloScheduling/Makefile)
-AC_CONFIG_MAKEFILE(lib/CodeGen/RegAlloc/Makefile)
-AC_CONFIG_MAKEFILE(lib/CodeGen/SelectionDAG/Makefile)
-AC_CONFIG_MAKEFILE(lib/ExecutionEngine/Makefile)
-AC_CONFIG_MAKEFILE(lib/ExecutionEngine/Interpreter/Makefile)
-AC_CONFIG_MAKEFILE(lib/ExecutionEngine/JIT/Makefile)
-AC_CONFIG_MAKEFILE(lib/Support/Makefile)
-AC_CONFIG_MAKEFILE(lib/Target/Makefile)
-AC_CONFIG_MAKEFILE(lib/Target/Sparc/Makefile)
-AC_CONFIG_MAKEFILE(lib/Target/X86/Makefile)
-AC_CONFIG_MAKEFILE(lib/Transforms/Makefile)
-AC_CONFIG_MAKEFILE(lib/Transforms/Hello/Makefile)
-AC_CONFIG_MAKEFILE(lib/Transforms/IPO/Makefile)
-AC_CONFIG_MAKEFILE(lib/Transforms/Instrumentation/Makefile)
-AC_CONFIG_MAKEFILE(lib/Transforms/Instrumentation/ProfilePaths/Makefile)
-AC_CONFIG_MAKEFILE(lib/Transforms/Scalar/Makefile)
-AC_CONFIG_MAKEFILE(lib/Transforms/Utils/Makefile)
-AC_CONFIG_MAKEFILE(lib/VMCore/Makefile)
 AC_CONFIG_MAKEFILE(runtime/Makefile)
-AC_CONFIG_MAKEFILE(runtime/GCCLibraries/Makefile)
-AC_CONFIG_MAKEFILE(runtime/GCCLibraries/crtend/Makefile)
-AC_CONFIG_MAKEFILE(runtime/GCCLibraries/libc/Makefile)
-AC_CONFIG_MAKEFILE(runtime/GCCLibraries/libcurses/Makefile)
-AC_CONFIG_MAKEFILE(runtime/GCCLibraries/libg/Makefile)
-AC_CONFIG_MAKEFILE(runtime/GCCLibraries/libgcc/Makefile)
-AC_CONFIG_MAKEFILE(runtime/GCCLibraries/libm/Makefile)
-AC_CONFIG_MAKEFILE(runtime/GCCLibraries/libmalloc/Makefile)
-AC_CONFIG_MAKEFILE(runtime/GCCLibraries/libtermcap/Makefile)
-AC_CONFIG_MAKEFILE(runtime/GCCLibraries/libucb/Makefile)
-AC_CONFIG_MAKEFILE(runtime/GCCLibraries/libutempter/Makefile)
-AC_CONFIG_MAKEFILE(runtime/GCCLibraries/libutil/Makefile)
-AC_CONFIG_MAKEFILE(runtime/libdummy/Makefile)
-AC_CONFIG_MAKEFILE(runtime/libtrace/Makefile)
 AC_CONFIG_MAKEFILE(test/Makefile)
 AC_CONFIG_MAKEFILE(test/Makefile.tests)
-AC_CONFIG_MAKEFILE(test/QMTestDB/QMTest/llvm.py)
+AC_CONFIG_MAKEFILE(test/QMTest/llvm.py)
+AC_CONFIG_MAKEFILE(test/QMTest/llvmdb.py)
 AC_CONFIG_MAKEFILE(test/Programs/Makefile)
 AC_CONFIG_MAKEFILE(test/Programs/Makefile.programs)
 AC_CONFIG_MAKEFILE(test/Programs/TEST.aa.Makefile)
 AC_CONFIG_MAKEFILE(test/Programs/TEST.dsgraph.report)
-AC_CONFIG_MAKEFILE(test/Programs/TEST.micro.report)
 AC_CONFIG_MAKEFILE(test/Programs/TEST.aa.report)
 AC_CONFIG_MAKEFILE(test/Programs/TEST.example.Makefile)
 AC_CONFIG_MAKEFILE(test/Programs/TEST.nightly.Makefile)
@@ -109,172 +50,90 @@ AC_CONFIG_MAKEFILE(test/Programs/TEST.dsgraph.Makefile)
 AC_CONFIG_MAKEFILE(test/Programs/TEST.jit.report)
 AC_CONFIG_MAKEFILE(test/Programs/TEST.typesafe.Makefile)
 AC_CONFIG_MAKEFILE(test/Programs/TEST.dsgraph.gnuplot)
-AC_CONFIG_MAKEFILE(test/Programs/TEST.micro.Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/TEST.vtl.Makefile)
 AC_CONFIG_MAKEFILE(test/Programs/External/Makefile)
 AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/Makefile)
 AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/Makefile.spec)
-AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/CFP2000/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/CFP2000/179.art/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/CFP2000/183.equake/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/CFP2000/188.ammp/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/CINT2000/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/CINT2000/164.gzip/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/CINT2000/175.vpr/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/CINT2000/176.gcc/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/CINT2000/181.mcf/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/CINT2000/186.crafty/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/CINT2000/197.parser/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/CINT2000/254.gap/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/CINT2000/255.vortex/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/CINT2000/256.bzip2/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/CINT2000/300.twolf/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/LLVMSource/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/Makefile.spec2000)
+AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/Makefile.spec95)
 AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Makefile)
 AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Makefile.multisrc)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Applications/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Applications/Burg/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Applications/aha/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Applications/sgefa/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Fhourstones/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/McCat/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/McCat/01-qbsort/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/McCat/03-testtrie/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/McCat/04-bisect/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/McCat/05-eks/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/McCat/08-main/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/McCat/09-vor/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/McCat/12-IOtest/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/McCat/15-trie/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/McCat/17-bintr/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/McCat/18-imp/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Olden/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Olden/bh/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Olden/bisort/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Olden/em3d/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Olden/health/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Olden/mst/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Olden/perimeter/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Olden/power/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Olden/treeadd/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Olden/tsp/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Olden/voronoi/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/OptimizerEval/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Ptrdist/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Ptrdist/anagram/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Ptrdist/bc/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Ptrdist/ft/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Ptrdist/ks/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/Ptrdist/yacr2/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/llubenchmark/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/sim/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/NoSource/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/NoSource/Flex/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/NoSource/Larn/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/NoSource/Moria-5.5.2/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/NoSource/Povray31/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/NoSource/m4/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/FreeBench/analyzer/test.in)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/FreeBench/distray/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/FreeBench/distray/test.in)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/FreeBench/fourinarow/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/FreeBench/fourinarow/test.in)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/FreeBench/mason/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/FreeBench/mason/test.in)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/FreeBench/neural/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/FreeBench/neural/test.in)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/FreeBench/pcompress2/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/FreeBench/pcompress2/test.in)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/FreeBench/pifft/Makefile)
+AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/FreeBench/pifft/test.in)
 AC_CONFIG_MAKEFILE(test/Programs/SingleSource/Makefile)
 AC_CONFIG_MAKEFILE(test/Programs/SingleSource/Makefile.singlesrc)
-AC_CONFIG_MAKEFILE(test/Programs/SingleSource/Gizmos/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/SingleSource/Benchmarks/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/SingleSource/Benchmarks/Dhrystone/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/SingleSource/Benchmarks/Shootout/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/SingleSource/Benchmarks/Stanford/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/SingleSource/Benchmarks/Misc/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/SingleSource/CustomChecked/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/SingleSource/UnitTests/Makefile)
 AC_CONFIG_MAKEFILE(test/Programs/SingleSource/UnitTests/SetjmpLongjmp/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/SingleSource/Regression/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/SingleSource/Regression/C/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/SingleSource/Regression/C++/Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/SingleSource/Regression/C++/EH/Makefile)
 AC_CONFIG_MAKEFILE(tools/Makefile)
-AC_CONFIG_MAKEFILE(tools/analyze/Makefile)
-AC_CONFIG_MAKEFILE(tools/bugpoint/Makefile)
-AC_CONFIG_MAKEFILE(tools/extract/Makefile)
-AC_CONFIG_MAKEFILE(tools/gccas/Makefile)
-AC_CONFIG_MAKEFILE(tools/gccld/Makefile)
-AC_CONFIG_MAKEFILE(tools/llc/Makefile)
-AC_CONFIG_MAKEFILE(tools/llee/Makefile)
-AC_CONFIG_MAKEFILE(tools/lli/Makefile)
-AC_CONFIG_MAKEFILE(tools/llvm-ar/Makefile)
-AC_CONFIG_MAKEFILE(tools/llvm-as/Makefile)
-AC_CONFIG_MAKEFILE(tools/llvm-dis/Makefile)
-AC_CONFIG_MAKEFILE(tools/llvm-link/Makefile)
-AC_CONFIG_MAKEFILE(tools/opt/Makefile)
 AC_CONFIG_MAKEFILE(utils/Makefile)
-AC_CONFIG_MAKEFILE(utils/Burg/Makefile)
-AC_CONFIG_MAKEFILE(utils/Burg/Doc/Makefile)
-AC_CONFIG_MAKEFILE(utils/TableGen/Makefile)
-AC_CONFIG_MAKEFILE(www/docs/Makefile)
 AC_CONFIG_MAKEFILE(projects/Makefile)
-AC_CONFIG_MAKEFILE(projects/sample/Makefile)
-AC_CONFIG_MAKEFILE(projects/sample/Makefile.common)
-AC_CONFIG_MAKEFILE(projects/sample/Makefile.config)
-AC_CONFIG_MAKEFILE(projects/sample/lib/Makefile)
-AC_CONFIG_MAKEFILE(projects/sample/lib/sample/Makefile)
-AC_CONFIG_MAKEFILE(projects/sample/tools/Makefile)
-AC_CONFIG_MAKEFILE(projects/sample/tools/sample/Makefile)
-AC_CONFIG_MAKEFILE(projects/ModuleMaker/Makefile)
-AC_CONFIG_MAKEFILE(projects/ModuleMaker/Makefile.common)
-AC_CONFIG_MAKEFILE(projects/ModuleMaker/tools/Makefile)
-AC_CONFIG_MAKEFILE(projects/ModuleMaker/tools/ModuleMaker/Makefile)
-
-dnl **************************************************************************
-dnl * Determine which system we are building on
-dnl **************************************************************************
-
-dnl Check the install program (needs to be done before canonical stuff)
+
+dnl Find the install program (needs to be done before canonical stuff)
 AC_PROG_INSTALL
 
 dnl Check which host for which we're compiling.  This will tell us which LLVM
 dnl compiler will be used for compiling SSA into object code.
 AC_CANONICAL_TARGET
 
-dnl
-dnl Now, for some of our own magic:
+dnl Set the "OS" Makefile variable based on the system we are building on.
 dnl We will use the build machine information to set some variables.
-dnl
 case $build in
-       *i*86*)  AC_SUBST(OS,[Linux])
-                AC_SUBST(LLVMGCCDIR,[/home/vadve/lattner/local/x86/llvm-gcc/])
+       *-*-linux*)
+             AC_SUBST(OS,[Linux])
+                        if test -d /home/vadve/lattner/local/x86/llvm-gcc
+                        then
+                          AC_SUBST(LLVMGCCDIR,[/home/vadve/lattner/local/x86/llvm-gcc/])
+                        fi
                 ;;
 
-       *sparc*) AC_SUBST(OS,[SunOS])
-                AC_SUBST(LLVMGCCDIR,[/home/vadve/lattner/local/sparc/llvm-gcc/])
+       *-*-solaris*)
+             AC_SUBST(OS,[SunOS])
+                        if test -d /home/vadve/lattner/local/sparc/llvm-gcc
+                        then
+                  AC_SUBST(LLVMGCCDIR,[/home/vadve/lattner/local/sparc/llvm-gcc/])
+                        fi
+                ;;
+
+       *-*-darwin*)
+             AC_SUBST(OS,[Darwin])
                 ;;
 
        *)       AC_SUBST(OS,[Unknown])
                 ;;
 esac
 
-dnl
 dnl If we are targetting a Sparc machine running Solaris, pretend that it is
 dnl V9, since that is all that we support at the moment, and autoconf will only
 dnl tell us we're a sparc.
-dnl
 case $target in
-       *sparc*solaris*)  AC_SUBST(target,[[sparcv9-sun-solaris2.8]])
-                         ;;
+       sparc*-*-solaris*)  AC_SUBST(target,[[sparcv9-sun-solaris2.8]])
+                           ;;
 esac
 
-dnl
 dnl Determine what our target architecture is and configure accordingly.
 dnl This will allow Makefiles to make a distinction between the hardware and
 dnl the OS.
-dnl
 case $target in
-       *i*86*)           AC_SUBST(ARCH,[x86])
+       i*86-*)           AC_SUBST(ARCH,[x86])
                          ;;
-       *sparc*solaris*)  AC_SUBST(ARCH,[Sparc])
+       sparc*-*)         AC_SUBST(ARCH,[Sparc])
+                         ;;
+       powerpc*-*)       AC_SUBST(ARCH,[PowerPC])
+                         ;;
+       *)                AC_SUBST(ARCH,[Unknown])
                          ;;
 esac
 
-dnl **************************************************************************
-dnl * Check for programs.
-dnl **************************************************************************
-
 dnl Check for compilation tools
 AC_PROG_CXX
 AC_PROG_CC(gcc)
@@ -285,7 +144,6 @@ if test "$GCC" != "yes"
 then
        AC_MSG_ERROR([gcc required but not found])
 fi
-
 if test "$GXX" != "yes"
 then
        AC_MSG_ERROR([g++ required but not found])
@@ -295,86 +153,41 @@ dnl Verify that GCC is version 3.0 or higher
 gccmajor=`$CC --version | head -n 1 | awk '{print $NF;}' | cut -d. -f1`
 if test "$gccmajor" -lt "3"
 then
-       AC_MSG_ERROR([gcc 3.x required])
+       AC_MSG_ERROR([gcc 3.x required, but you have a lower version])
 fi
 
-dnl Check for GNU Make.  We use its extensions to, so don't build without it
+dnl Check for GNU Make.  We use its extensions too, so don't build without it
 CHECK_GNU_MAKE
 if test -z "$_cv_gnu_make_command"
 then
        AC_MSG_ERROR([GNU Make required but not found])
 fi
 
-dnl Check for compiler-compiler tools (reminds me of Little Caesar's Pizza)
+dnl Checks for other tools
 AC_PROG_FLEX
 AC_PROG_BISON
-
-dnl Check for libtool
 AC_PROG_LIBTOOL
 
-dnl Check for our special programs
-AC_PATH_PROG(RPWD,[pwd],[false])
-if test ${RPWD} = "false"
-then
-       AC_MSG_ERROR([pwd required but not found])
-fi
-
-AC_PATH_PROG(AR,[ar],[false])
-if test ${AR} = "false"
-then
-       AC_MSG_ERROR([ar required but not found])
-fi
-
-AC_PATH_PROG(SED,[sed],[false])
-if test ${SED} = "false"
-then
-       AC_MSG_ERROR([sed required but not found])
-fi
-
-AC_PATH_PROG(RM,[rm],[false])
-if test ${RM} = "false"
-then
-       AC_MSG_ERROR([rm required but not found])
-fi
-
-AC_PATH_PROG(ECHO,[echo],[false])
-if test ${ECHO} = "false"
-then
-       AC_MSG_ERROR([echo required but not found])
-fi
-
-AC_PATH_PROG(MKDIR,[mkdir],[false])
-if test ${MKDIR} = "false"
-then
-       AC_MSG_ERROR([mkdir required but not found])
-fi
-
-AC_PATH_PROG(DATE,[date],[false])
-if test ${DATE} = "false"
-then
-       AC_MSG_ERROR([date required but not found])
-fi
-
-AC_PATH_PROG(MV,[mv],[false])
-if test ${MV} = "false"
-then
-       AC_MSG_ERROR([mv required but not found])
-fi
-
-AC_PATH_PROG(DOT,[dot],[false])
-
-AC_PATH_PROG(ETAGS,[etags],[false])
-
-AC_PATH_PROG(PYTHON,[python],[false])
-if test ${PYTHON} = "false"
+dnl Checks for tools we can get away with not having:
+AC_PATH_PROG(DOT,[dot],[true dot])
+AC_PATH_PROG(ETAGS,[etags],[true etags])
+dnl Check if we know how to tell etags we are using C++:
+etags_version=`$ETAGS --version 2>&1`
+case "$etags_version" in
+       *[Ee]xuberant*) ETAGSFLAGS="--language-force=c++" ;;
+       *GNU\ Emacs*) ETAGSFLAGS="-l c++" ;;
+       *) ETAGSFLAGS="" ;;
+esac
+AC_SUBST(ETAGSFLAGS,$ETAGSFLAGS)
+AC_PATH_PROG(PYTHON,[python],[true python])
+if test "$PYTHON" = "false"
 then
-       AC_MSG_WARN([python required but not found])
+       AC_MSG_WARN([Python is required for the test suite, but it was not found])
 fi
-
-AC_PATH_PROG(QMTEST,[qmtest],[false])
-if test ${QMTEST} = "false"
+AC_PATH_PROG(QMTEST,[qmtest],[true qmtest])
+if test "$QMTEST" = "false"
 then
-       AC_MSG_WARN([qmtest required but not found])
+       AC_MSG_WARN([QMTest is required for the test suite, but it was not found])
 fi
 
 dnl Verify that the version of python available is high enough for qmtest
@@ -388,67 +201,51 @@ then
        then
                if test "$pyminor" -lt "2"
                then
-                       AC_MSG_ERROR([Python 2.2 or greater required])
+                       AC_MSG_WARN([QMTest requires Python 2.2 or later])
                fi
        fi
 else
-       AC_MSG_ERROR([Python 2.2 or greater required])
+       AC_MSG_WARN([QMTest requires Python 2.2 or later])
 fi
 
 dnl Verify that the source directory is valid
 AC_CONFIG_SRCDIR(["Makefile.config.in"])
 
-dnl **************************************************************************
-dnl * Check for libraries.
-dnl **************************************************************************
-
+dnl Checks for libraries:
 dnl libelf is for sparc only; we can ignore it if we don't have it
 AC_CHECK_LIB(elf, elf_begin)
 
-dnl dlopen() is required.  If we don't find it, quit.
-AC_SEARCH_LIBS(dlopen,dl,,AC_MSG_ERROR([dlopen() required but not found]))
+dnl dlopen() is required for plugin support.
+AC_SEARCH_LIBS(dlopen,dl,AC_DEFINE([HAVE_DLOPEN],[1],[Define if dlopen() is available on this platform.]),AC_MSG_WARN([dlopen() not found - disabling plugin support]))
 
 dnl mallinfo is optional; the code can compile (minus features) without it
-AC_SEARCH_LIBS(mallinfo,malloc,AC_DEFINE([HAVE_MALLINFO],[1]))
-
-dnl
-dnl The math libraries are used by the test code, but not by the actual LLVM
-dnl code.
-dnl
-dnl AC_CHECK_LIB(m, cos)
-
-dnl **************************************************************************
-dnl * Checks for header files.
-dnl *  Chances are, if the standard C or POSIX type header files are missing,
-dnl *  then LLVM just isn't going to compile.  However, it is possible that
-dnl *  the necessary functions/macros will be included from other
-dnl *  (non-standard and non-obvious) header files.
-dnl *
-dnl *  So, we'll be gracious, give it a chance, and try to go on without
-dnl *  them.
-dnl **************************************************************************
-AC_HEADER_STDC
-AC_HEADER_SYS_WAIT
+AC_SEARCH_LIBS(mallinfo,malloc,AC_DEFINE([HAVE_MALLINFO],[1],[Define if mallinfo() is available on this platform.]))
 
-dnl Check for ANSI C/POSIX header files
-AC_CHECK_HEADERS(assert.h fcntl.h limits.h sys/time.h unistd.h errno.h signal.h math.h)
+dnl pthread locking functions are optional - but llvm will not be thread-safe
+dnl without locks.
+AC_SEARCH_LIBS(pthread_mutex_lock,pthread,HAVE_PTHREAD_MUTEX_LOCK=1,HAVE_PTHREAD_MUTEX_LOCK=0)
+AC_SUBST(HAVE_PTHREAD_MUTEX_LOCK)
 
-dnl Check for system specific header files
-AC_CHECK_HEADERS(malloc.h strings.h sys/mman.h sys/resource.h)
-
-dnl Check for header files associated with dlopen and friends
-AC_CHECK_HEADERS(dlfcn.h link.h)
-
-dnl **************************************************************************
-dnl * Checks for typedefs, structures, and compiler characteristics.
-dnl **************************************************************************
-
-dnl Check for const and inline keywords
-AC_C_CONST
-AC_C_INLINE
+dnl Checks for header files.
+dnl We don't check for ancient stuff or things that are guaranteed to be there
+dnl by the C++ standard. We always use the <cfoo> versions of <foo.h> C headers.
+AC_HEADER_STDC
+AC_HEADER_SYS_WAIT
 
-dnl Check for machine endian-ness
-AC_C_BIGENDIAN(AC_DEFINE([ENDIAN_BIG]),AC_DEFINE(ENDIAN_LITTLE))
+dnl Checks for POSIX and other various system-specific header files
+AC_CHECK_HEADERS(fcntl.h limits.h sys/time.h unistd.h malloc.h sys/mman.h sys/resource.h dlfcn.h link.h execinfo.h)
+
+dnl Check for things that need to be included in public headers, and so
+dnl for which we may not have access to a HAVE_* preprocessor #define.
+dnl (primarily used in DataTypes.h)
+AC_CHECK_HEADER([sys/types.h],
+                [INCLUDE_SYS_TYPES_H='#include <sys/types.h>'],
+                [INCLUDE_SYS_TYPES_H=''])
+AC_SUBST(INCLUDE_SYS_TYPES_H)
+AC_CHECK_HEADER([inttypes.h],
+                [INCLUDE_INTTYPES_H='#include <inttypes.h>'],
+                [INCLUDE_INTTYPES_H=''])
+AC_SUBST(INCLUDE_INTTYPES_H)
 
 dnl Check for types
 AC_TYPE_PID_T
@@ -458,76 +255,131 @@ AC_CHECK_TYPES([uint64_t],,AC_MSG_ERROR([Type uint64_t required but not found]))
 AC_HEADER_TIME
 AC_STRUCT_TM
 
+dnl Check for various C features
+AC_C_PRINTF_A
+
+dnl Check for the endianness of the target
+AC_C_BIGENDIAN(AC_SUBST([ENDIAN],[big]),AC_SUBST([ENDIAN],[little]))
+
 dnl Check for C++ extensions
-AC_CXX_HAVE_EXT_HASH_MAP
-AC_CXX_HAVE_EXT_HASH_SET
-AC_CXX_HAVE_EXT_SLIST
+AC_CXX_HAVE_HASH_MAP
+AC_CXX_HAVE_HASH_SET
 AC_CXX_HAVE_STD_ITERATOR
 AC_CXX_HAVE_BI_ITERATOR
 AC_CXX_HAVE_FWD_ITERATOR
 
-dnl **************************************************************************
-dnl * Checks for library functions.
-dnl **************************************************************************
+dnl Checks for library functions.
 AC_FUNC_ALLOCA
-AC_PROG_GCC_TRADITIONAL
-AC_FUNC_MEMCMP
 AC_FUNC_MMAP
+if test "$ac_cv_func_mmap_fixed_mapped" = "no"
+then
+       AC_MSG_ERROR([mmap() required but not found])
+fi
 AC_FUNC_MMAP_FILE
-if test ${ac_cv_func_mmap_file} = "no"
+if test "$ac_cv_func_mmap_file" = "no"
 then
        AC_MSG_ERROR([mmap() of files required but not found])
 fi
 AC_HEADER_MMAP_ANONYMOUS
 AC_TYPE_SIGNAL
-AC_CHECK_FUNCS(getcwd gettimeofday strcspn strdup strerror strspn strstr strtod strtol strtoq strtoll)
-
-dnl
-dnl Need to check mmap for MAP_PRIVATE, MAP_ANONYMOUS, MAP_ANON, MAP_FIXED
-dnl MAP_FIXED is only needed for Sparc
-dnl MAP_ANON is used for Sparc and BSD
-dnl Everyone should have MAP_PRIVATE
-dnl
-
-dnl Check for certain functions (even if we've already found them) so that we
-dnl can quit with an error if they are unavailable.
-dnl
-dnl As the code is made more portable (i.e. less reliant on these functions,
-dnl these checks should go away.
-AC_CHECK_FUNC(mmap,,AC_MSG_ERROR([Function mmap() required but not found]))
+AC_CHECK_FUNCS(getcwd gettimeofday strdup strtoq strtoll backtrace isatty)
 AC_CHECK_FUNC(mprotect,,AC_MSG_ERROR([Function mprotect() required but not found]))
 
-dnl **************************************************************************
-dnl * Enable various compile-time options
-dnl **************************************************************************
+dnl Determine if the linker supports the -R option.
+AC_LINK_USE_R
 
-dnl Purify Option
-AC_ARG_ENABLE(purify,AC_HELP_STRING([--enable-purify],[Compile with purify (default is NO)]),,enableval="no")
+dnl --enable/--with command-line options:
+dnl Check whether they want to do an optimized build:
+AC_ARG_ENABLE(optimized,AC_HELP_STRING([--enable-optimized],[Compile with optimizations enabled (default is NO)]),,enableval=no)
 if test ${enableval} = "no"
 then
-       AC_SUBST(ENABLE_PURIFY,[[]])
+       AC_SUBST(ENABLE_OPTIMIZED,[[]])
 else
-       AC_SUBST(ENABLE_PURIFY,[[ENABLE_PURIFY=1]])
+       AC_SUBST(ENABLE_OPTIMIZED,[[ENABLE_OPTIMIZED=1]])
 fi
 
-dnl Optimized Option
-AC_ARG_ENABLE(optimized,AC_HELP_STRING([--enable-optimized],[Compile with optimizations enabled (default is NO)]),,enableval=no)
+dnl Spec 2000 Benchmarks
+AC_ARG_ENABLE(spec2000,AC_HELP_STRING([--enable-spec2000],[Compile SPEC 2000 benchmarks (default is NO)]),,enableval=no)
 if test ${enableval} = "no"
 then
-       AC_SUBST(ENABLE_OPTIMIZED,[[]])
+       if test -d /home/vadve/shared/benchmarks/speccpu2000/benchspec
+       then
+               AC_SUBST(SPEC2000_ROOT,[/home/vadve/shared/benchmarks/speccpu2000/benchspec])
+               AC_SUBST(USE_SPEC2000,[[USE_SPEC2000=1]])
+       else
+               AC_SUBST(USE_SPEC2000,[[]])
+               AC_SUBST(SPEC2000_ROOT,[])
+       fi
 else
-       AC_SUBST(ENABLE_OPTIMIZED,[[ENABLE_OPTIMIZED=1]])
+       if test ${enableval} = ""
+       then
+               AC_SUBST(SPEC2000_ROOT,[/home/vadve/shared/benchmarks/speccpu2000/benchspec])
+       else
+               AC_SUBST(SPEC2000_ROOT,[${enableval}])
+       fi
+       AC_SUBST(USE_SPEC2000,[[USE_SPEC2000=1]])
 fi
 
-dnl Spec Benchmarks
-AC_ARG_ENABLE(spec,AC_HELP_STRING([--enable-spec],[Compile SPEC benchmarks (default is NO)]),,enableval=no)
+dnl Spec 95 Benchmarks
+AC_ARG_ENABLE(spec95,AC_HELP_STRING([--enable-spec95],[Compile SPEC 95 benchmarks (default is NO)]),,enableval=no)
 if test ${enableval} = "no"
 then
-       AC_SUBST(USE_SPEC,[[]])
+       if test -d /home/vadve/shared/benchmarks/spec95/benchspec
+       then
+               AC_SUBST(SPEC95_ROOT,[/home/vadve/shared/benchmarks/spec95/benchspec])
+               AC_SUBST(USE_SPEC95,[[USE_SPEC95=1]])
+       else
+               AC_SUBST(USE_SPEC95,[[]])
+               AC_SUBST(SPEC95_ROOT,[])
+       fi
 else
-       AC_SUBST(USE_SPEC,[[USE_SPEC=1]])
+       if test ${enableval} = ""
+       then
+               AC_SUBST(SPEC95_ROOT,[/home/vadve/shared/benchmarks/spec95/benchspec])
+       else
+               AC_SUBST(SPEC95_ROOT,[${enableval}])
+       fi
+       AC_SUBST(USE_SPEC95,[[USE_SPEC95=1]])
 fi
 
+dnl We can use POV-Ray as an external benchmark, if they have the sources.
+AC_ARG_ENABLE(povray,
+ AC_HELP_STRING([--enable-povray=ARG], 
+                [Use POV-Ray as a benchmark (srcs in DIR)]),
+ povray=$enableval,
+ povray=auto)
+AC_MSG_CHECKING([for POV-Ray benchmark sources])
+case "$povray" in
+auto|yes)
+    defaultdir=/home/vadve/shared/benchmarks/povray31
+       if test -d $defaultdir
+       then
+               AC_SUBST(POVRAY_ROOT,[$defaultdir])
+               AC_SUBST(USE_POVRAY,[[USE_POVRAY=1]])
+        povray="yes, found in $defaultdir"
+    else
+        povray=no
+    fi
+    ;;
+no)
+    AC_SUBST(POVRAY_ROOT,[])
+    AC_SUBST(USE_POVRAY,[[]])
+    povray=no
+    ;;
+*)  if test -d "$povray"
+    then
+        AC_SUBST(POVRAY_ROOT,"$povray")
+        AC_SUBST(USE_POVRAY,[[USE_POVRAY=1]])
+        povray="yes, in $povray"
+    else
+        AC_SUBST(POVRAY_ROOT,[])
+        AC_SUBST(USE_POVRAY,[[]])
+        povray="no, not found in $povray"
+    fi
+    ;;
+esac
+AC_MSG_RESULT($povray)
+
 dnl Precompiled Bytecode Option
 AC_ARG_ENABLE(precompiled_bytecode,AC_HELP_STRING([--enable-precompiled_bytecode],[Use pre-compiled bytecode (default is NO)]),,enableval=no)
 if test ${enableval} = "no"
@@ -537,7 +389,6 @@ else
        AC_SUBST(UPB,[[USE_PRECOMPILED_BYTECODE=1]])
 fi
 
-
 dnl LLC Diff Option
 AC_ARG_ENABLE(llc_diffs,AC_HELP_STRING([--enable-llc_diffs],[Enable LLC Diffs when testing (default is YES)]),,enableval=yes)
 if test ${enableval} = "no"
@@ -549,7 +400,6 @@ fi
 
 dnl JIT Option
 AC_ARG_ENABLE(jit,AC_HELP_STRING([--enable-jit],[Enable Just In Time Compiling (default is YES)]),,enableval=default)
-
 if test ${enableval} = "no"
 then
        AC_SUBST(JIT,[[]])
@@ -567,15 +417,44 @@ else
        esac
 fi
 
-dnl **************************************************************************
-dnl * Set the location of various third-party software packages
-dnl **************************************************************************
-
-dnl Location of SPEC benchmarks
-AC_ARG_WITH(spec,AC_HELP_STRING([--with-spec],[Location of SPEC benchmarks]),AC_SUBST(SPEC_ROOT,[$withval]),AC_SUBST(SPEC_ROOT,[/home/vadve/shared/benchmarks/speccpu2000/benchspec]))
-
-dnl Location of the LLVM C front end
+dnl Find the LLVM GCC-based C/C++ front end
 AC_ARG_WITH(llvmgccdir,AC_HELP_STRING([--with-llvmgccdir],[Location of LLVM GCC front-end]),AC_SUBST(LLVMGCCDIR,[$withval]))
+AC_MSG_CHECKING([for llvm-gcc])
+LLVM_GCC_CHECK=no
+if test -d "$LLVMGCCDIR"
+then
+       if test -x "$LLVMGCCDIR/bin/gcc"
+       then
+               LLVM_GCC_CHECK="$LLVMGCCDIR/bin/gcc"
+       fi
+fi
+llvmgccwarn=no
+AC_MSG_RESULT($LLVM_GCC_CHECK)
+if test "$LLVM_GCC_CHECK" = "no"
+then
+    llvmgccwarn=yes
+fi
+AC_MSG_CHECKING([whether llvm-gcc is sane])
+LLVM_GCC_SANE=no
+if test -x "$LLVM_GCC_CHECK"
+then
+       cp /dev/null conftest.c
+    "$LLVM_GCC_CHECK" -S -o - conftest.c | grep implementation > /dev/null 2>&1
+       if test $? -eq 0
+       then
+               LLVM_GCC_SANE=yes
+       fi
+       rm conftest.c
+       llvmcc1path=`"$LLVM_GCC_CHECK" --print-prog-name=cc1`
+       AC_SUBST(LLVMCC1,$llvmcc1path)
+       llvmcc1pluspath=`"$LLVM_GCC_CHECK" --print-prog-name=cc1plus`
+       AC_SUBST(LLVMCC1PLUS,$llvmcc1pluspath)
+fi
+AC_MSG_RESULT($LLVM_GCC_SANE)
+if test "$LLVM_GCC_SANE" = "no"
+then
+       llvmgccwarn=yes
+fi
 
 dnl Location of the bytecode repository
 AC_ARG_WITH(bcrepos,AC_HELP_STRING([--with-bcrepos],[Location of Bytecode Repository]),AC_SUBST(BCR,[$withval]),AC_SUBST(BCR,[/home/vadve/lattner/LLVMPrograms]))
@@ -583,14 +462,32 @@ AC_ARG_WITH(bcrepos,AC_HELP_STRING([--with-bcrepos],[Location of Bytecode Reposi
 dnl Location of PAPI
 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 Location of the purify program
-AC_ARG_WITH(purify,AC_HELP_STRING([--with-purify],[Location of purify program]),AC_SUBST(PURIFY,[$withval]))
-
-dnl **************************************************************************
-dnl * Configure other software packages (via AC_CONFIG_SUBDIRS)
-dnl **************************************************************************
+dnl Get libtool's idea of what the shared library suffix is.
+dnl (This is a hack; it relies on undocumented behavior.)
+AC_MSG_CHECKING([for shared library suffix])
+eval "SHLIBEXT=$shrext"
+AC_MSG_RESULT($SHLIBEXT)
+dnl Propagate it to the Makefiles and config.h (for gccld & bugpoint).
+AC_SUBST(SHLIBEXT,$SHLIBEXT)
+AC_DEFINE_UNQUOTED(SHLIBEXT,"$SHLIBEXT",
+                   [Extension that shared libraries have, e.g., ".so".])
+
+dnl Create the output files
+AC_OUTPUT(Makefile.config
+ include/Support/DataTypes.h
+ include/Support/ThreadSupport.h
+ include/Support/hash_map
+ include/Support/hash_set
+ include/Support/iterator)
+
+dnl Warn loudly if llvm-gcc was not obviously working
+if test $llvmgccwarn = yes
+then
+       AC_MSG_WARN([***** llvm C/C++ front end was not found, or does not])
+       AC_MSG_WARN([***** appear to be working.])
+       AC_MSG_WARN([***** ])
+       AC_MSG_WARN([***** Please check configure's --with-llvmgccdir option.])
+       AC_MSG_WARN([***** Runtime libraries (in llvm/runtime) will not be built,])
+       AC_MSG_WARN([***** but you should be able to build the llvm tools.])
+fi
 
-dnl **************************************************************************
-dnl * Create the output files
-dnl **************************************************************************
-AC_OUTPUT(Makefile.config)