Remove trailing whitespace

[oota-llvm.git] / autoconf / configure.ac

diff --git a/autoconf/configure.ac b/autoconf/configure.ac
index 4f300b75c73a143264fc951d1939e76801ce0e77..5f0d5b62384787f858f87469bfd7aa4391d63b30 100644 (file)
--- a/autoconf/configure.ac
+++ b/autoconf/configure.ac
@@ -31,7 +31,7 @@ dnl===
 dnl===-----------------------------------------------------------------------===
 dnl Initialize autoconf and define the package name, version number and
 dnl email address for reporting bugs.
 dnl===-----------------------------------------------------------------------===
 dnl Initialize autoconf and define the package name, version number and
 dnl email address for reporting bugs.

-AC_INIT([[llvm]],[[1.4]],[llvmbugs@cs.uiuc.edu])
+AC_INIT([[llvm]],[[1.5cvs]],[llvmbugs@cs.uiuc.edu])

 
 dnl Provide a copyright substitution and ensure the copyright notice is included
 dnl in the output of --version option of the generated configure script.
 
 dnl Provide a copyright substitution and ensure the copyright notice is included
 dnl in the output of --version option of the generated configure script.


@@ -72,10 +72,10 @@ do
       "llvm-test")    AC_CONFIG_SUBDIRS([projects/llvm-test]) ;;
       "llvm-reopt")   AC_CONFIG_SUBDIRS([projects/llvm-reopt]);;
       "llvm-gcc")     AC_CONFIG_SUBDIRS([projects/llvm-gcc])  ;;
       "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-java")    AC_CONFIG_SUBDIRS([projects/llvm-java]) ;;

       "llvm-tv")      AC_CONFIG_SUBDIRS([projects/llvm-tv])   ;;
       "llvm-fefw")    AC_CONFIG_SUBDIRS([projects/llvm-fefw]) ;;
       "llvm-tv")      AC_CONFIG_SUBDIRS([projects/llvm-tv])   ;;
       "llvm-fefw")    AC_CONFIG_SUBDIRS([projects/llvm-fefw]) ;;

-      "poolalloc")    AC_CONFIG_SUBDIRS([projects/poolalloc]) ;;
+      "llvm-poolalloc") AC_CONFIG_SUBDIRS([projects/llvm-poolalloc]) ;;

       *)              
         AC_MSG_WARN([Unknown project (${i}) won't be configured automatically])
         ;;
       *)              
         AC_MSG_WARN([Unknown project (${i}) won't be configured automatically])
         ;;


@@ -97,34 +97,65 @@ AC_CANONICAL_TARGET
 
 dnl Determine the platform type and cache its value. This helps us configure
 dnl the System library to the correct build platform.
 
 dnl Determine the platform type and cache its value. This helps us configure
 dnl the System library to the correct build platform.

-AC_CACHE_CHECK([support for generic build operating system],
-               [llvm_cv_platform_type],
+AC_CACHE_CHECK([type of operating system we're on],
+               [llvm_cv_os_type],

 [case $build in
 [case $build in

-  *-*-aix*) llvm_cv_platform_type="AIX" ;;
-  *-*-cygwin*) llvm_cv_platform_type="Cygwin" ;;
-  *-*-darwin*) llvm_cv_platform_type="Darwin" ;;
-  *-*-freebsd*) llvm_cv_platform_type="FreeBSD" ;;
-  *-*-interix*) llvm_cv_platform_type="Interix" ;;
-  *-*-linux*) llvm_cv_platform_type="Linux" ;;
-  *-*-solaris*) llvm_cv_platform_type="SunOS" ;;
-  *-*-win32*) llvm_cv_platform_type="Win32" ;;
-  *-*-mingw*) llvm_cv_platform_type="Win32" ;;
-  *) llvm_cv_platform_type="Unknown" ;;
+  *-*-aix*) 
+    llvm_cv_os_type="AIX" 
+    llvm_cv_platform_type="Unix" ;;
+  *-*-cygwin*) 
+    llvm_cv_os_type="Cygwin" 
+    llvm_cv_platform_type="Unix" ;;
+  *-*-darwin*) 
+    llvm_cv_os_type="Darwin"
+    llvm_cv_platform_type="Unix" ;;
+  *-*-freebsd*) 
+    llvm_cv_os_type="FreeBSD" 
+    llvm_cv_platform_type="Unix" ;;
+  *-*-interix*) 
+    llvm_cv_os_type="Interix"
+    llvm_cv_platform_type="Unix" ;;
+  *-*-linux*) 
+    llvm_cv_os_type="Linux"
+    llvm_cv_platform_type="Unix" ;;
+  *-*-solaris*) 
+    llvm_cv_os_type="SunOS"
+    llvm_cv_platform_type="Unix" ;;
+  *-*-win32*) 
+    llvm_cv_os_type="Win32"
+    llvm_cv_platform_type="Win32" ;;
+  *-*-mingw*) 
+    llvm_cv_os_type="MingW" 
+    llvm_cv_platform_type="Win32" ;;
+  *) 
+    llvm_cv_os_type="Unknown" 
+    llvm_cv_platform_type="Unknown" ;;

 esac])
 
 dnl Make sure we aren't attempting to configure for an unknown system
 esac])
 
 dnl Make sure we aren't attempting to configure for an unknown system

-if test "$llvm_cv_platform_type" = "Unknown" ; then
-  AC_MSG_ERROR([Operating system platform is unknown, configure can't continue])
+if test "$llvm_cv_os_type" = "Unknown" ; then
+  AC_MSG_ERROR([Operating system is unknown, configure can't continue])

 fi
 
 dnl Set the "OS" Makefile variable based on the platform type so the
 dnl makefile can configure itself to specific build hosts
 fi
 
 dnl Set the "OS" Makefile variable based on the platform type so the
 dnl makefile can configure itself to specific build hosts

-AC_SUBST(OS,$llvm_cv_platform_type)
-
-dnl Make a link from lib/System/platform to lib/System/$llvm_cv_platform_type
-dnl This helps the #inclusion of the system specific include files
-dnl for the operating system abstraction library, lib/System.
-AC_CONFIG_LINKS(lib/System/platform:lib/System/$llvm_cv_platform_type)
+AC_SUBST(OS,$llvm_cv_os_type)
+
+dnl Set the "LLVM_ON_*" variables based on llvm_cvs_platform_type
+dnl This is used by lib/System to determine the basic kind of implementation
+dnl to use.
+case $llvm_cv_platform_type in
+  Unix)  
+    AC_DEFINE([LLVM_ON_UNIX],[1],[Define if this is Unixish platform]) 
+    AC_SUBST(LLVM_ON_UNIX,[1])
+    AC_SUBST(LLVM_ON_WIN32,[0])
+    ;;
+  Win32) 
+    AC_DEFINE([LLVM_ON_WIN32],[1],[Define if this is Win32ish platform]) 
+    AC_SUBST(LLVM_ON_UNIX,[0])
+    AC_SUBST(LLVM_ON_WIN32,[1])
+    ;;
+esac

 
 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 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


@@ -139,10 +170,13 @@ dnl This will allow Makefiles to make a distinction between the hardware and
 dnl the OS.
 AC_CACHE_CHECK([target architecture],[llvm_cv_target_arch],
 [case $target in
 dnl the OS.
 AC_CACHE_CHECK([target architecture],[llvm_cv_target_arch],
 [case $target in

-  i*86-*)      llvm_cv_target_arch="x86" ;;
-  sparc*-*)    llvm_cv_target_arch="Sparc" ;;
-  powerpc*-*)  llvm_cv_target_arch="PowerPC" ;;
-  *)           llvm_cv_target_arch="Unknown" ;;
+  i?86-*)                 llvm_cv_target_arch="x86" ;;
+  amd64-* | x86_64-*)     llvm_cv_target_arch="x86_64" ;;
+  sparc*-*)               llvm_cv_target_arch="Sparc" ;;
+  powerpc*-*)             llvm_cv_target_arch="PowerPC" ;;
+  alpha*-*)               llvm_cv_target_arch="Alpha" ;;
+  ia64-*)                 llvm_cv_target_arch="IA64" ;;
+  *)                      llvm_cv_target_arch="Unknown" ;;

 esac])
 
 if test "$llvm_cv_target_arch" = "Unknown" ; then
 esac])
 
 if test "$llvm_cv_target_arch" = "Unknown" ; then


@@ -183,30 +217,33 @@ else
     x86)     AC_SUBST(JIT,[[TARGET_HAS_JIT=1]]) ;;
     Sparc)   AC_SUBST(JIT,[[TARGET_HAS_JIT=1]]) ;;
     PowerPC) AC_SUBST(JIT,[[TARGET_HAS_JIT=1]]) ;;
     x86)     AC_SUBST(JIT,[[TARGET_HAS_JIT=1]]) ;;
     Sparc)   AC_SUBST(JIT,[[TARGET_HAS_JIT=1]]) ;;
     PowerPC) AC_SUBST(JIT,[[TARGET_HAS_JIT=1]]) ;;

+    x86_64)  AC_SUBST(JIT,[[]]) ;;

     *)       AC_SUBST(JIT,[[]]) ;;
   esac
 fi
 
     *)       AC_SUBST(JIT,[[]]) ;;
   esac
 fi
 

-dnl Find the LLVM GCC-based C/C++ front end
+dnl Allow enablement of doxygen generated documentation
+AC_ARG_ENABLE(doxygen,
+              AS_HELP_STRING([--enable-doxygen],
+                             [Build doxygen documentation (default is NO)]),,
+                             enableval=default)
+case "$enableval" in
+  yes) AC_SUBST(ENABLE_DOXYGEN,[1]) ;;
+  no)  AC_SUBST(ENABLE_DOXYGEN,[0]) ;;
+  default) AC_SUBST(ENABLE_DOXYGEN,[0]) ;;
+  *) AC_MSG_ERROR([Invalid setting for --enable-doxygen. Use "yes" or "no"]) ;;
+esac
+
+dnl Allow a specific llvm-gcc/llvm-g++ pair to be used with this LLVM config.

 AC_ARG_WITH(llvmgccdir,
 AC_ARG_WITH(llvmgccdir,

-  AS_HELP_STRING(--with-llvmgccdir,[Location of LLVM GCC front-end]),
-  AC_SUBST(LLVMGCCDIR,[$withval]))
-
-dnl Provide some defaults for LLVMGCC for UIUC environments.
-if test "x$LLVMGCCDIR" = x ; then
-  case "$llvm_cv_platform_type" in
-    Linux)
-      if test -d /home/vadve/lattner/local/x86/llvm-gcc ; then
-        AC_SUBST(LLVMGCCDIR,[/home/vadve/lattner/local/x86/llvm-gcc/])
-      fi
-      ;;
-    SunOS)
-      if test -d /home/vadve/lattner/local/sparc/llvm-gcc ; then
-        AC_SUBST(LLVMGCCDIR,[/home/vadve/lattner/local/sparc/llvm-gcc/])
-      fi
-      ;;
-  esac
-fi
+  AS_HELP_STRING([--with-llvmgccdir],
+    [Specify location of llvm-gcc install dir (default searches PATH)]),,
+    withval=default)
+case "$withval" in
+  default) WITH_LLVMGCCDIR=default ;;
+  /*)      WITH_LLVMGCCDIR=$withval ;;
+  *) AC_MSG_ERROR([Invalid path for --with-llvmgccdir. Provide full path]) ;;
+esac

 
 dnl===-----------------------------------------------------------------------===
 dnl===
 
 dnl===-----------------------------------------------------------------------===
 dnl===


@@ -221,39 +258,55 @@ AC_PROG_CXX(g++)
 AC_PROG_FLEX
 AC_PROG_BISON
 
 AC_PROG_FLEX
 AC_PROG_BISON
 

-dnl Check for libtool and the library that has dlopen function (which must come
-dnl before the AC_PROG_LIBTOOL check in order to enable dlopening libraries with
-dnl libtool).
-AC_LIBTOOL_DLOPEN
-AC_PROG_LIBTOOL
-

 dnl Check for the tools that the makefiles require
 AC_CHECK_GNU_MAKE
 AC_PROG_LN_S
 dnl Check for the tools that the makefiles require
 AC_CHECK_GNU_MAKE
 AC_PROG_LN_S

+AC_PATH_PROG(CMP, [cmp], [cmp])
+AC_PATH_PROG(CP, [cp], [cp])
+AC_PATH_PROG(DATE, [date], [date])

 AC_PATH_PROG(FIND, [find], [find])
 AC_PATH_PROG(GREP, [grep], [grep])
 AC_PATH_PROG(MKDIR,[mkdir],[mkdir])
 AC_PATH_PROG(FIND, [find], [find])
 AC_PATH_PROG(GREP, [grep], [grep])
 AC_PATH_PROG(MKDIR,[mkdir],[mkdir])

-AC_PATH_PROG(MV,   [mv], [mv])
+AC_PATH_PROG(MV,   [mv],   [mv])

 AC_PROG_RANLIB
 AC_PROG_RANLIB

-AC_PATH_PROG(RM,   [rm], [rm])
-AC_PATH_PROG(SED,  [sed], [sed])
-AC_PATH_PROG(TAR,  [tar],[gtar])
+AC_PATH_PROG(RM,   [rm],   [rm])
+AC_PATH_PROG(SED,  [sed],  [sed])
+AC_PATH_PROG(TAR,  [tar],  [gtar])

 
 dnl Find the install program
 AC_PROG_INSTALL
 
 
 dnl Find the install program
 AC_PROG_INSTALL
 

-dnl Checks for tools we can get away with not having:
+dnl Checks for documentation and testing tools that we can do without. If these
+dnl are not found then they are set to "true" which always succeeds but does
+dnl nothing. This just lets the build output show that we could have done 
+dnl something if the tool was available. 
+AC_PATH_PROG(BZIP2,[bzip2],[true bzip2])

 AC_PATH_PROG(DOT,[dot],[true dot])
 AC_PATH_PROG(DOT,[dot],[true dot])

+AC_PATH_PROG(DOXYGEN,[doxygen],[true doxygen])

 AC_PATH_PROG(ETAGS,[etags],[true etags])
 AC_PATH_PROG(ETAGS,[etags],[true etags])

-
-dnl Check for optional testing tools
-AC_PATH_PROG(PYTHON,[python],[true python])
-AC_PATH_PROG(QMTEST,[qmtest],[true qmtest])
+AC_PATH_PROG(GROFF,[groff],[true groff])
+AC_PATH_PROG(GZIP,[gzip],[true gzip])
+AC_PATH_PROG(POD2HTML,[pod2html],[true pod2html])
+AC_PATH_PROG(POD2MAN,[pod2man],[true pod2man])

 AC_PATH_PROG(RUNTEST,[runtest],[true runtest])
 AC_PATH_PROG(RUNTEST,[runtest],[true runtest])

+DJ_AC_PATH_TCLSH
+AC_PATH_PROG(ZIP,[zip],[true zip])

 
 dnl Determine if the linker supports the -R option.
 AC_LINK_USE_R
 
 
 dnl Determine if the linker supports the -R option.
 AC_LINK_USE_R
 

+dnl Check for libtool and the library that has dlopen function (which must come
+dnl before the AC_PROG_LIBTOOL check in order to enable dlopening libraries with
+dnl libtool).
+AC_LIBTOOL_DLOPEN
+AC_LIB_LTDL
+AC_PROG_LIBTOOL
+
+if test "$lt_cv_dlopen_self" = "yes" ; then
+  AC_DEFINE([CAN_DLOPEN_SELF],[1],
+              [Define if dlopen(0) will open the symbols of the program])
+fi
+

 dnl Check if we know how to tell etags we are using C++:
 etags_version=`$ETAGS --version 2>&1`
 case "$etags_version" in
 dnl Check if we know how to tell etags we are using C++:
 etags_version=`$ETAGS --version 2>&1`
 case "$etags_version" in


@@ -263,24 +316,53 @@ case "$etags_version" in
 esac
 AC_SUBST(ETAGSFLAGS,$ETAGSFLAGS)
 
 esac
 AC_SUBST(ETAGSFLAGS,$ETAGSFLAGS)
 

+if test "$WITH_LLVMGCCDIR" = "default" ; then
+  AC_PATH_PROG(LLVMGCC, [llvm-gcc], [llvm-gcc])
+  AC_PATH_PROG(LLVMGXX, [llvm-g++], [llvm-g++])
+else
+  LLVMGCC=$WITH_LLVMGCCDIR/bin/llvm-gcc
+  LLVMGXX=$WITH_LLVMGCCDIR/bin/llvm-g++
+  AC_SUBST(LLVMGCC,$LLVMGCC)
+  AC_SUBST(LLVMGXX,$LLVMGXX)
+fi
+  

 AC_MSG_CHECKING([tool compatibility])
 
 AC_MSG_CHECKING([tool compatibility])
 

-dnl Ensure that compilation tools are GCC; we use GCC specific extensions
-if test "$GCC" != "yes"
+dnl Ensure that compilation tools are GCC or a GNU compatible compiler such as
+dnl ICC; we use GCC specific options in the makefiles so the compiler needs
+dnl to support those options.
+dnl "icc" emits gcc signatures
+dnl "icc -no-gcc" emits no gcc signature BUT is still compatible
+ICC=no
+IXX=no
+case $CC in
+  icc*|icpc*) 
+    ICC=yes
+    IXX=yes
+    ;;
+   *)
+    ;;
+esac
+
+if test "$GCC" != "yes" && test "$ICC" != "yes"

 then
 then

-  AC_MSG_ERROR([gcc required but not found])
+  AC_MSG_ERROR([gcc|icc required but not found])

 fi
 fi

+

 dnl Ensure that compilation tools are GCC; we use GCC specific extensions
 dnl Ensure that compilation tools are GCC; we use GCC specific extensions

-if test "$GXX" != "yes"
+if test "$GXX" != "yes" && test "$IXX" != "yes"

 then
 then

-  AC_MSG_ERROR([g++ required but not found])
+  AC_MSG_ERROR([g++|icc required but not found])

 fi
 
 dnl Verify that GCC is version 3.0 or higher
 fi
 
 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"
+if test "$GCC" = "yes"

 then
 then

-  AC_MSG_ERROR([gcc 3.x required, but you have a lower version])
+  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, but you have a lower version])
+  fi

 fi
 
 dnl Check for GNU Make.  We use its extensions, so don't build without it
 fi
 
 dnl Check for GNU Make.  We use its extensions, so don't build without it


@@ -292,31 +374,6 @@ fi
 dnl Tool compatibility is okay if we make it here.
 AC_MSG_RESULT([ok])
 
 dnl Tool compatibility is okay if we make it here.
 AC_MSG_RESULT([ok])
 

-dnl Generate warnings for things not found but not strictly needed
-if test "$PYTHON" = "false" ; then
-  AC_MSG_WARN([Python is required for the test suite, but it was not found])
-fi
-if test "$QMTEST" = "false" ; then
-  AC_MSG_WARN([QMTest is required for the test suite, but it was not found])
-fi
-if test "$RUNTEST" = "false" ; then
-  AC_MSG_WARN([runtest (Deja-Gnu) is required for the test sute, but it was not found])
-fi
-pyversion=`$PYTHON -V 2>&1 | cut -d\  -f2`
-pymajor=`echo $pyversion | cut -d. -f1`
-pyminor=`echo $pyversion | cut -d. -f2`
-if test "$pymajor" -ge "2" ; then
-  if test "$pymajor" -eq "2" ; then
-    if test "$pyminor" -lt "2" ; then
-      AC_MSG_WARN([QMTest requires Python 2.2 or later])
-    fi
-  fi
-else
-  AC_MSG_WARN([QMTest requires Python 2.2 or later])
-fi
-
-AC_MSG_RESULT([])
-

 dnl===-----------------------------------------------------------------------===
 dnl===
 dnl=== SECTION 5: Check for libraries
 dnl===-----------------------------------------------------------------------===
 dnl===
 dnl=== SECTION 5: Check for libraries


@@ -326,25 +383,6 @@ dnl===-----------------------------------------------------------------------===
 dnl libelf is for sparc only; we can ignore it if we don't have it
 AC_CHECK_LIB(elf, elf_begin)
 
 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 
-dnl and bytecode compression.
-AC_CHECK_LIB(z,gzopen,[zlib_found=1],[zlib_found=0])
-if test $zlib_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
-AC_CHECK_LIB(bz2,BZ2_bzCompressInit,[bzip2_found=1],[bzip2_found=0])
-if test $bzip2_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 lt_dlopen may be required for plugin support.
 AC_SEARCH_LIBS(lt_dlopen,ltdl,AC_DEFINE([HAVE_LT_DLOPEN],[1],
               [Define if lt_dlopen() is available on this platform]),
 dnl lt_dlopen may be required for plugin support.
 AC_SEARCH_LIBS(lt_dlopen,ltdl,AC_DEFINE([HAVE_LT_DLOPEN],[1],
               [Define if lt_dlopen() is available on this platform]),


@@ -372,23 +410,21 @@ dnl=== SECTION 6: Check for header files
 dnl===
 dnl===-----------------------------------------------------------------------===
 
 dnl===
 dnl===-----------------------------------------------------------------------===
 

+dnl First, use autoconf provided macros for specific headers that we need

 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.
 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.

+dnl Generally we're looking for POSIX headers.
+AC_HEADER_DIRENT
+AC_HEADER_MMAP_ANONYMOUS
+AC_HEADER_STAT

 AC_HEADER_STDC
 AC_HEADER_STDC

-
-dnl However, we do need some system specific header files. Generally we're
-dnl looking for POSIX headers.

 AC_HEADER_SYS_WAIT
 AC_HEADER_SYS_WAIT

-AC_CHECK_HEADERS([sys/time.h sys/mman.h sys/resource.h sys/time.h sys/types.h])
-AC_CHECK_HEADERS([bzlib.h dlfcn.h execinfo.h fcntl.h limits.h link.h ltdl.h])
-AC_CHECK_HEADERS([malloc.h unistd.h windows.h zlib.h])

 AC_HEADER_TIME
 AC_HEADER_TIME

-AC_HEADER_MMAP_ANONYMOUS

 
 

-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_HEADERS([inttypes.h stdint.h])
+AC_CHECK_HEADERS([dlfcn.h execinfo.h fcntl.h inttypes.h limits.h link.h])
+AC_CHECK_HEADERS([malloc.h signal.h stdint.h unistd.h utime.h windows.h])
+AC_CHECK_HEADERS([sys/mman.h sys/param.h sys/resource.h sys/time.h sys/types.h])
+AC_CHECK_HEADERS([rw/stdex/hash_map.h rw/stdex/hash_set.h])

 
 dnl===-----------------------------------------------------------------------===
 dnl===
 
 dnl===-----------------------------------------------------------------------===
 dnl===


@@ -411,8 +447,10 @@ dnl=== SECTION 8: Check for specific functions needed
 dnl===
 dnl===-----------------------------------------------------------------------===
 
 dnl===
 dnl===-----------------------------------------------------------------------===
 

-AC_CHECK_FUNCS([backtrace getcwd gettimeofday isatty getrusage mkstemp]) 
-AC_CHECK_FUNCS([strdup strtoq strtoll])
+AC_CHECK_FUNCS([backtrace getcwd getpagesize getrusage gettimeofday isatty ])
+AC_CHECK_FUNCS([mkdtemp mkstemp mktemp ])
+AC_CHECK_FUNCS([realpath sbrk setrlimit strdup strerror strerror_r ])
+AC_CHECK_FUNCS([strtoll strtoq sysconf])

 AC_C_PRINTF_A
 AC_FUNC_ALLOCA
 AC_FUNC_RAND48
 AC_C_PRINTF_A
 AC_FUNC_ALLOCA
 AC_FUNC_RAND48


@@ -428,15 +466,17 @@ AC_FUNC_ISNAN
 AC_FUNC_ISINF
 
 dnl Check for mmap and mprotect support. We need both to do the JIT and for
 AC_FUNC_ISINF
 
 dnl Check for mmap and mprotect support. We need both to do the JIT and for

-dnl bytecode loading, etc.
+dnl bytecode loading, etc. We also need to know if /dev/zero is required to
+dnl be opened for allocating RWX memory.

 AC_FUNC_MMAP
 AC_FUNC_MMAP_FILE
 AC_FUNC_MMAP
 AC_FUNC_MMAP_FILE

+AC_NEED_DEV_ZERO_FOR_MMAP

 AC_CHECK_FUNC(mprotect,,
               AC_MSG_ERROR([Function mprotect() required but not found]))
 
 if test "$ac_cv_func_mmap_fixed_mapped" = "no"
 then
 AC_CHECK_FUNC(mprotect,,
               AC_MSG_ERROR([Function mprotect() required but not found]))
 
 if test "$ac_cv_func_mmap_fixed_mapped" = "no"
 then

-  AC_MSG_WARN([mmap() required but not found])
+  AC_MSG_WARN([mmap() of a fixed address required but not supported])

 fi
 if test "$ac_cv_func_mmap_file" = "no"
 then
 fi
 if test "$ac_cv_func_mmap_file" = "no"
 then


@@ -449,45 +489,31 @@ dnl=== SECTION 9: Additional checks, variables, etc.
 dnl===
 dnl===-----------------------------------------------------------------------===
 
 dnl===
 dnl===-----------------------------------------------------------------------===
 

-dnl Figure out if there's an executable llvm-gcc in the llvmgccdir.
-AC_CACHE_CHECK([for llvm-gcc],[llvm_cv_llvmgcc],
-[llvm_cv_llvmgcc='llvmgcc_not_found'
-if test -d "$LLVMGCCDIR" ; then
-  if test -x "$LLVMGCCDIR/bin/gcc" ; then
-    llvm_cv_llvmgcc="$LLVMGCCDIR/bin/gcc"
-  fi
-fi])
-
-dnl See if the llvmgcc executable can compile to LLVM assembly
+dnl See if the llvm-gcc executable can compile to LLVM assembly

 AC_CACHE_CHECK([whether llvm-gcc is sane],[llvm_cv_llvmgcc_sanity],
 [llvm_cv_llvmgcc_sanity="no"
 AC_CACHE_CHECK([whether llvm-gcc is sane],[llvm_cv_llvmgcc_sanity],
 [llvm_cv_llvmgcc_sanity="no"

-if test -x "$llvm_cv_llvmgcc" ; then
+if test -x "$LLVMGCC" ; then

   cp /dev/null conftest.c
   cp /dev/null conftest.c

-  "$llvm_cv_llvmgcc" -S -o - conftest.c | grep implementation > /dev/null 2>&1
+  "$LLVMGCC" -S -o - conftest.c | grep implementation > /dev/null 2>&1

   if test $? -eq 0 ; then
     llvm_cv_llvmgcc_sanity="yes"
   fi
   rm conftest.c
 fi])
 
   if test $? -eq 0 ; then
     llvm_cv_llvmgcc_sanity="yes"
   fi
   rm conftest.c
 fi])
 

-dnl Since we have a sane llvmgcc, identify it and its sub-tools 
+dnl Since we have a sane llvm-gcc, identify it and its sub-tools 

 if test "$llvm_cv_llvmgcc_sanity" = "yes" ; then
 if test "$llvm_cv_llvmgcc_sanity" = "yes" ; then

-  AC_SUBST(LLVMGCC,"$llvm_cv_llvmgcc")
-  llvmcc1path=`"$llvm_cv_llvmgcc" --print-prog-name=cc1`
+  llvmcc1path=`"$LLVMGCC" --print-prog-name=cc1`

   AC_SUBST(LLVMCC1,$llvmcc1path)
   AC_SUBST(LLVMCC1,$llvmcc1path)

-  llvmcc1pluspath=`"$llvm_cv_llvmgcc" --print-prog-name=cc1plus`
+  llvmcc1pluspath=`"$LLVMGCC" --print-prog-name=cc1plus`

   AC_SUBST(LLVMCC1PLUS,$llvmcc1pluspath)
   AC_SUBST(LLVMCC1PLUS,$llvmcc1pluspath)

+  llvmgccdir=`echo "$llvmcc1path" | sed 's,/libexec/.*,,'`
+  AC_SUBST(LLVMGCCDIR,$llvmgccdir)

 fi
 
 fi
 

-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_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".])
+dnl Propagate the shared library extension that the libltdl checks did to 
+dnl the Makefiles so we can use it there too
+AC_SUBST(SHLIBEXT,$libltdl_cv_shlibext)

 
 # Translate the various configuration directories and other basic
 # information into substitutions that will end up in Makefile.config.in 
 
 # Translate the various configuration directories and other basic
 # information into substitutions that will end up in Makefile.config.in 


@@ -495,9 +521,9 @@ AC_DEFINE_UNQUOTED(SHLIBEXT,"$SHLIBEXT",
 eval LLVM_PREFIX="${prefix}";
 eval LLVM_BINDIR="${prefix}/bin";
 eval LLVM_LIBDIR="${prefix}/lib";
 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_DATADIR="${prefix}/share/llvm";
+eval LLVM_DOCSDIR="${prefix}/docs/llvm";
+eval LLVM_ETCDIR="${prefix}/etc/llvm";

 eval LLVM_INCLUDEDIR="${prefix}/include";
 eval LLVM_INFODIR="${prefix}/info";
 eval LLVM_MANDIR="${prefix}/man";
 eval LLVM_INCLUDEDIR="${prefix}/include";
 eval LLVM_INFODIR="${prefix}/info";
 eval LLVM_MANDIR="${prefix}/man";


@@ -557,7 +583,11 @@ AC_CONFIG_FILES([Makefile.config])
 dnl Configure llvmc's configuration files
 AC_CONFIG_FILES([tools/llvmc/st tools/llvmc/cpp tools/llvmc/ll tools/llvmc/c])
 
 dnl Configure llvmc's configuration files
 AC_CONFIG_FILES([tools/llvmc/st tools/llvmc/cpp tools/llvmc/ll tools/llvmc/c])
 

+dnl Configure doxygen's configuration file
+AC_CONFIG_FILES([docs/doxygen.cfg])
+

 dnl Do special configuration of Makefiles
 dnl Do special configuration of Makefiles

+AC_CONFIG_COMMANDS([setup],,[llvm_src="${srcdir}"])

 AC_CONFIG_MAKEFILE(Makefile)
 AC_CONFIG_MAKEFILE(Makefile.common)
 AC_CONFIG_MAKEFILE(examples/Makefile)
 AC_CONFIG_MAKEFILE(Makefile)
 AC_CONFIG_MAKEFILE(Makefile.common)
 AC_CONFIG_MAKEFILE(examples/Makefile)


@@ -565,31 +595,18 @@ AC_CONFIG_MAKEFILE(lib/Makefile)
 AC_CONFIG_MAKEFILE(runtime/Makefile)
 AC_CONFIG_MAKEFILE(test/Makefile)
 AC_CONFIG_MAKEFILE(test/Makefile.tests)
 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(tools/Makefile)
 AC_CONFIG_MAKEFILE(tools/Makefile)

-AC_CONFIG_MAKEFILE(tools/Makefile.JIT)

 AC_CONFIG_MAKEFILE(utils/Makefile)
 AC_CONFIG_MAKEFILE(projects/Makefile)
 
 dnl Finally, crank out the output
 AC_OUTPUT
 
 AC_CONFIG_MAKEFILE(utils/Makefile)
 AC_CONFIG_MAKEFILE(projects/Makefile)
 
 dnl Finally, crank out the output
 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 "$llvm_cv_llvmgcc_sanity" = "no" ; then
 dnl Warn loudly if llvm-gcc was not obviously working
 if test "$llvm_cv_llvmgcc_sanity" = "no" ; 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.])
+ AC_MSG_WARN([***** llvm-gcc/llvm-g++ was not found, or does not appear to be ])
+ AC_MSG_WARN([***** working. Please make sure you have llvmgcc and llvmg++ in])
+ AC_MSG_WARN([***** your path before configuring LLVM. The runtime libraries])
+ AC_MSG_WARN([***** (llvm/runtime) will not be built but you should be able to])
+ AC_MSG_WARN([***** build the llvm tools.])

 fi
 fi