Allow hbd to be bugpointable on darwin by fixing common and linkonce codegen
[oota-llvm.git] / autoconf / configure.ac
index 64c5b627c725826c4f57236e13ba4f1ad4cbd504..613c8a7feb4b02700475db3ab3c68dc53eff76be 100644 (file)
@@ -1,15 +1,18 @@
 dnl Initialize autoconf
-AC_INIT([[[LLVM]]],[[[1.3]]],[llvmbugs@cs.uiuc.edu])
+AC_INIT([[llvm]],[[1.4]],[llvmbugs@cs.uiuc.edu])
 
 dnl Place all of the extra autoconf files into the config subdirectory
+dnl Tell various tools where the m4 autoconf macros are
+dnl Have configure verify that the source directory is valid.
 AC_CONFIG_AUX_DIR([autoconf])
+dnl AC_CONFIG_MACRO_DIR(autoconf/m4)
+dnl Verify that the source directory is valid
+AC_CONFIG_SRCDIR(["Makefile.config.in"])
 
 dnl Quit if the source directory has already been configured.
 dnl NOTE: This relies upon undocumented autoconf behavior.
-if test ${srcdir} != "."
-then
-       if test -f ${srcdir}/include/Config/config.h
-       then
+if test ${srcdir} != "." ; then
+       if test -f ${srcdir}/include/llvm/Config/config.h ; then
                AC_MSG_ERROR([Already configured in ${srcdir}])
        fi
 fi
@@ -17,64 +20,48 @@ 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
+  if test -d ${srcdir}/projects/${i} ; then
+    case ${i} in
+      "CVS") ;;
+      "sample")       AC_CONFIG_SUBDIRS([projects/sample])    ;;
+      "Stacker")      AC_CONFIG_SUBDIRS([projects/Stacker])   ;;
+      "llvm-test")    AC_CONFIG_SUBDIRS([projects/llvm-test]) ;;
+      "llvm-reopt")   AC_CONFIG_SUBDIRS([projects/llvm-reopt]);;
+      "llvm-gcc")     AC_CONFIG_SUBDIRS([projects/llvm-gcc])  ;;
+      "Java")         AC_CONFIG_SUBDIRS([projects/Java])      ;;
+      "llvm-tv")      AC_CONFIG_SUBDIRS([projects/llvm-tv])   ;;
+      "llvm-fefw")    AC_CONFIG_SUBDIRS([projects/llvm-fefw]) ;;
+      "poolalloc")    AC_CONFIG_SUBDIRS([projects/poolalloc]) ;;
+      *)              
+        AC_MSG_WARN([Unknown project (${i}) won't be configured automatically])
+        ;;
+    esac
   fi
 done
 
-dnl Configure a header file
-AC_CONFIG_HEADERS(include/Config/config.h)
+dnl Configure header files
+AC_CONFIG_HEADERS(include/llvm/Config/config.h)
+
+dnl Configure other output file
+AC_CONFIG_FILES(Makefile.config)
+AC_CONFIG_HEADERS([include/llvm/Support/DataTypes.h])
+AC_CONFIG_HEADERS([include/llvm/ADT/hash_map])
+AC_CONFIG_HEADERS([include/llvm/ADT/hash_set])
+AC_CONFIG_HEADERS([include/llvm/Support/ThreadSupport.h])
+AC_CONFIG_HEADERS([include/llvm/ADT/iterator])
+
+dnl Do special configuration of Makefiles
 AC_CONFIG_MAKEFILE(Makefile)
 AC_CONFIG_MAKEFILE(Makefile.common)
+AC_CONFIG_MAKEFILE(examples/Makefile)
 AC_CONFIG_MAKEFILE(lib/Makefile)
 AC_CONFIG_MAKEFILE(runtime/Makefile)
 AC_CONFIG_MAKEFILE(test/Makefile)
 AC_CONFIG_MAKEFILE(test/Makefile.tests)
 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.aa.report)
-AC_CONFIG_MAKEFILE(test/Programs/TEST.example.Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/TEST.nightly.Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/TEST.buildrepo.Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/TEST.jit.Makefile)
-AC_CONFIG_MAKEFILE(test/Programs/TEST.nightly.report)
-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.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/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/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/UnitTests/SetjmpLongjmp/Makefile)
 AC_CONFIG_MAKEFILE(tools/Makefile)
+AC_CONFIG_MAKEFILE(tools/Makefile.JIT)
 AC_CONFIG_MAKEFILE(utils/Makefile)
 AC_CONFIG_MAKEFILE(projects/Makefile)
 
@@ -87,34 +74,71 @@ AC_CANONICAL_TARGET
 
 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.
+
+AC_MSG_CHECKING([support for generic build operating system])
 case $build in
+       *-*-aix*)
+             AC_SUBST(OS,[AIX])
+             platform_type="AIX"
+             ;;
+       *-*-cygwin*)
+             AC_SUBST(OS,[Cygwin])
+             platform_type="Cygwin"
+             ;;
+       *-*-darwin*)
+             AC_SUBST(OS,[Darwin])
+             platform_type="Darwin"
+             ;;
+        *-*-freebsd*)
+             AC_SUBST(OS,[Linux])
+             platform_type="FreeBSD"
+             ;;
+        *-*-interix*)
+             AC_SUBST(OS,[SunOS])
+             platform_type="Interix"
+             ;;
        *-*-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
-                ;;
-
+             platform_type="Linux"
+             if test -d /home/vadve/lattner/local/x86/llvm-gcc
+            then
+              AC_SUBST(LLVMGCCDIR,[/home/vadve/lattner/local/x86/llvm-gcc/])
+             fi
+             ;;
        *-*-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
-                ;;
-       *-*-cygwin*)
-             AC_SUBST(OS,[Cygwin])
-                ;;
+             platform_type="SunOS"
+             if test -d /home/vadve/lattner/local/sparc/llvm-gcc
+             then
+               AC_SUBST(LLVMGCCDIR,[/home/vadve/lattner/local/sparc/llvm-gcc/])
+             fi
+             ;;
+        *-*-win32*)
+             AC_SUBST(OS,[Win32])
+             platform_type="Win32"
+            ;;
+        *-*-mingw*)
+             AC_SUBST(OS,[Win32])
+             platform_type="Win32"
+            ;;
+       *)   
+             AC_SUBST(OS,[Unknown])
+             platform_type="Unknown"
+            ;;
+esac
 
-       *-*-darwin*)
-             AC_SUBST(OS,[Darwin])
-                ;;
+dnl Make sure we aren't attempting to configure for an unknown system
+if test "$platform_type" = "Unknown" ; then
+  AC_MSG_ERROR([Platform is unknown, configure can't continue])
+fi
+
+dnl Make a link from lib/System/platform to lib/System/$platform_type
+dnl This helps the #inclusion of the system specific include files
+dnl for the operating system abstraction library
+AC_CONFIG_LINKS(lib/System/platform:lib/System/$platform_type)
 
-       *)       AC_SUBST(OS,[Unknown])
-                ;;
-esac
 
+AC_MSG_CHECKING(target architecture)
 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.
@@ -127,26 +151,36 @@ 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.
 case $target in
-       i*86-*)           AC_SUBST(ARCH,[x86])
-                         ;;
-       sparc*-*)         AC_SUBST(ARCH,[Sparc])
-                         ;;
-       powerpc*-*)       AC_SUBST(ARCH,[PowerPC])
-                         ;;
-       *)                AC_SUBST(ARCH,[Unknown])
-                         ;;
+       i*86-*)       
+          ARCH="x86"
+          AC_SUBST(ARCH,[x86])
+         ;;
+       sparc*-*)         
+          ARCH="Sparc"
+          AC_SUBST(ARCH,[Sparc])
+         ;;
+       powerpc*-*)       
+          ARCH="PowerPC"
+          AC_SUBST(ARCH,[PowerPC])
+         ;;
+       *)                
+          ARCH="Unknown"
+          AC_SUBST(ARCH,[Unknown])
+         ;;
 esac
 
+AC_MSG_RESULT($ARCH)
+
 dnl Check for compilation tools
 AC_PROG_CXX
 AC_PROG_CC(gcc)
-AC_PROG_CPP
-
 dnl Ensure that compilation tools are GCC; we use GCC specific extensions
 if test "$GCC" != "yes"
 then
        AC_MSG_ERROR([gcc required but not found])
 fi
+AC_PROG_CPP
+dnl Ensure that compilation tools are GCC; we use GCC specific extensions
 if test "$GXX" != "yes"
 then
        AC_MSG_ERROR([g++ required but not found])
@@ -160,7 +194,7 @@ then
 fi
 
 dnl Check for GNU Make.  We use its extensions too, so don't build without it
-CHECK_GNU_MAKE
+AC_CHECK_GNU_MAKE
 if test -z "$_cv_gnu_make_command"
 then
        AC_MSG_ERROR([GNU Make required but not found])
@@ -170,6 +204,7 @@ dnl Checks for other tools
 AC_PROG_FLEX
 AC_PROG_BISON
 AC_PROG_LIBTOOL
+AC_PATH_PROG(TAR,[tar],[gtar])
 
 dnl Checks for tools we can get away with not having:
 AC_PATH_PROG(DOT,[dot],[true dot])
@@ -183,15 +218,17 @@ case "$etags_version" in
 esac
 AC_SUBST(ETAGSFLAGS,$ETAGSFLAGS)
 AC_PATH_PROG(PYTHON,[python],[true python])
-if test "$PYTHON" = "false"
-then
+if test "$PYTHON" = "false" ; then
        AC_MSG_WARN([Python is required for the test suite, but it was not found])
 fi
 AC_PATH_PROG(QMTEST,[qmtest],[true qmtest])
-if test "$QMTEST" = "false"
-then
+if test "$QMTEST" = "false" ; then
        AC_MSG_WARN([QMTest is required for the test suite, but it was not found])
 fi
+AC_PATH_PROG(RUNTEST,[runtest],[true runtest])
+if test "$RUNTEST" = "false" ; then
+  AC_MSG_WARN([runtest (Deja-Gnu) is required for the test sute, but it was not found])
+fi
 
 dnl Verify that the version of python available is high enough for qmtest
 pyversion=`$PYTHON -V 2>&1 | cut -d\  -f2`
@@ -211,13 +248,27 @@ else
        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 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 Check for bzip2 and zlib compression libraries needed for archive reading/writing
+AC_CHECK_LIB(bz2,BZ2_bzCompressInit,[bzip2_found=1],[bzip2_found=0])
+AC_CHECK_HEADERS([bzlib.h],[bzlib_h_found=1],[bzlib_h_found=0],[])
+AC_CHECK_LIB(z,gzopen,[zlib_found=1],[zlib_found=0])
+AC_CHECK_HEADERS([zlib.h],[zlib_h_found=1],[zlib_h_found=0],[])
+if test $zlib_found -eq 1 -a $zlib_h_found -eq 1; then
+  AC_DEFINE([HAVE_ZLIB],[1],[Define if zlib library is available on this platform.])
+  AC_SUBST([HAVE_ZLIB],[1])
+else
+  AC_SUBST([HAVE_ZLIB],[0])
+fi
+if test $bzip2_found -eq 1 -a $bzlib_h_found -eq 1 ; then
+  AC_DEFINE([HAVE_BZIP2],[1],[Define if bzip2 library is available on this platform.])
+  AC_SUBST([HAVE_BZIP2],[1])
+else
+  AC_SUBST([HAVE_BZIP2],[0])
+fi
 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]))
 
@@ -226,8 +277,8 @@ AC_SEARCH_LIBS(mallinfo,malloc,AC_DEFINE([HAVE_MALLINFO],[1],[Define if mallinfo
 
 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)
+AC_SEARCH_LIBS(pthread_mutex_lock,pthread,AC_DEFINE([HAVE_PTHREAD_MUTEX_LOCK],[1],[Have pthread_mutex_lock]))
+dnl AC_SUBST(HAVE_PTHREAD_MUTEX_LOCK)
 
 dnl Checks for header files.
 dnl We don't check for ancient stuff or things that are guaranteed to be there
@@ -241,20 +292,17 @@ AC_CHECK_HEADERS(fcntl.h limits.h sys/time.h unistd.h malloc.h sys/mman.h sys/re
 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)
+AC_CHECK_HEADER([sys/types.h])
+AC_CHECK_HEADER([inttypes.h])
+AC_CHECK_HEADER([stdint.h])
 
 dnl Check for types
 AC_TYPE_PID_T
 AC_TYPE_SIZE_T
 AC_CHECK_TYPES([int64_t],,AC_MSG_ERROR([Type int64_t required but not found]))
-AC_CHECK_TYPES([uint64_t],,AC_MSG_ERROR([Type uint64_t required but not found]))
+AC_CHECK_TYPES([uint64_t],,
+               AC_CHECK_TYPES([u_int64_t],,
+                              AC_MSG_ERROR([Type uint64_t or u_int64_t required but not found])))
 AC_HEADER_TIME
 AC_STRUCT_TM
 
@@ -271,6 +319,10 @@ AC_CXX_HAVE_STD_ITERATOR
 AC_CXX_HAVE_BI_ITERATOR
 AC_CXX_HAVE_FWD_ITERATOR
 
+AC_FUNC_ISNAN
+AC_FUNC_ISINF
+AC_FUNC_RAND48
+
 dnl Checks for library functions.
 AC_FUNC_ALLOCA
 AC_FUNC_MMAP
@@ -285,7 +337,7 @@ then
 fi
 AC_HEADER_MMAP_ANONYMOUS
 AC_TYPE_SIGNAL
-AC_CHECK_FUNCS(getcwd gettimeofday strdup strtoq strtoll backtrace isatty)
+AC_CHECK_FUNCS(getcwd gettimeofday strdup strtoq strtoll backtrace isatty mkstemp getrusage)
 AC_CHECK_FUNC(mprotect,,AC_MSG_ERROR([Function mprotect() required but not found]))
 
 dnl Determine if the linker supports the -R option.
@@ -293,7 +345,7 @@ AC_LINK_USE_R
 
 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)
+AC_ARG_ENABLE(optimized,AS_HELP_STRING(--enable-optimized,Compile with optimizations enabled (default is NO)),,enableval=no)
 if test ${enableval} = "no"
 then
        AC_SUBST(ENABLE_OPTIMIZED,[[]])
@@ -301,71 +353,8 @@ else
        AC_SUBST(ENABLE_OPTIMIZED,[[ENABLE_OPTIMIZED=1]])
 fi
 
-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)
-
-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"
-then
-       AC_SUBST(UPB,[[]])
-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"
-then
-       AC_SUBST(DISABLE_LLC_DIFFS,[DISABLE_LLC_DIFFS:=1])
-else
-       AC_SUBST(DISABLE_LLC_DIFFS,[[]])
-fi
-
 dnl JIT Option
-AC_ARG_ENABLE(jit,AC_HELP_STRING([--enable-jit],[Enable Just In Time Compiling (default is YES)]),,enableval=default)
+AC_ARG_ENABLE(jit,AS_HELP_STRING(--enable-jit,Enable Just In Time Compiling (default is YES)),,enableval=default)
 if test ${enableval} = "no"
 then
        AC_SUBST(JIT,[[]])
@@ -384,7 +373,7 @@ else
 fi
 
 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_ARG_WITH(llvmgccdir,AS_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"
@@ -422,29 +411,61 @@ 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]))
-
-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 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"
+eval "SHLIBEXT=$shrext_cmds"
 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".])
 
+# Translate the various configuration directories and other basic
+# information into substitutions that will end up in config.h.in so
+# that these configured values can be hard-wired into a program.
+eval LLVM_PREFIX="${prefix}";
+eval LLVM_BINDIR="${prefix}/bin";
+eval LLVM_LIBDIR="${prefix}/lib";
+eval LLVM_DATADIR="${prefix}/data";
+eval LLVM_DOCSDIR="${prefix}/docs";
+eval LLVM_ETCDIR="${prefix}/etc";
+eval LLVM_INCLUDEDIR="${prefix}/include";
+eval LLVM_INFODIR="${prefix}/info";
+eval LLVM_MANDIR="${prefix}/man";
+LLVM_CONFIGTIME=`date`
+AC_SUBST(LLVM_PREFIX)
+AC_SUBST(LLVM_BINDIR)
+AC_SUBST(LLVM_LIBDIR)
+AC_SUBST(LLVM_DATADIR)
+AC_SUBST(LLVM_DOCSDIR)
+AC_SUBST(LLVM_ETCDIR)
+AC_SUBST(LLVM_INCLUDEDIR)
+AC_SUBST(LLVM_INFODIR)
+AC_SUBST(LLVM_MANDIR)
+AC_SUBST(LLVM_CONFIGTIME)
+AC_DEFINE_UNQUOTED(LLVM_PREFIX,"$LLVM_PREFIX", [Installation prefix directory])
+AC_DEFINE_UNQUOTED(LLVM_BINDIR, "$LLVM_BINDIR", [Installation directory for binary executables])
+AC_DEFINE_UNQUOTED(LLVM_LIBDIR, "$LLVM_LIBDIR", [Installation directory for libraries])
+AC_DEFINE_UNQUOTED(LLVM_DATADIR, "$LLVM_DATADIR", [Installation directory for data files])
+AC_DEFINE_UNQUOTED(LLVM_DATADIR, "$LLVM_DOCSDIR", [Installation directory for documentation])
+AC_DEFINE_UNQUOTED(LLVM_ETCDIR, "$LLVM_ETCDIR", [Installation directory for config files])
+AC_DEFINE_UNQUOTED(LLVM_INCLUDEDIR, "$LLVM_INCLUDEDIR", [Installation directory for include files])
+AC_DEFINE_UNQUOTED(LLVM_INFODIR, "$LLVM_INFODIR", [Installation directory for .info files])
+AC_DEFINE_UNQUOTED(LLVM_MANDIR, "$LLVM_MANDIR", [Installation directory for man pages])
+AC_DEFINE_UNQUOTED(LLVM_CONFIGTIME, "$LLVM_CONFIGTIME", [Time at which LLVM was configured])
+
 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)
+AC_OUTPUT
+
+dnl Warn if we don't have a compression library
+if test $bzip2_found -ne 1 ; then
+  if test $zlib_found -ne 1 ; then
+    AC_MSG_WARN([*** Neither zlib nor bzip2 compression libraries were found.])
+    AC_MSG_WARN([*** Bytecode archives will not support compression!])
+    AC_MSG_WARN([*** To correct, install the libraries and and re-run configure.])
+  fi
+fi
 
 dnl Warn loudly if llvm-gcc was not obviously working
 if test $llvmgccwarn = yes