X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=autoconf%2Fconfigure.ac;h=b5fcccb09e864d810e772eb0439ca25dc97d306e;hb=825405c0c1b92c69cea283f97ee829ea3f23e3a4;hp=9959c6ee7a563992f11d4d0cc6ade3fd3084c687;hpb=c28ccd86b574cdcde54fa68f2f28e18f4b49498e;p=oota-llvm.git diff --git a/autoconf/configure.ac b/autoconf/configure.ac index 9959c6ee7a5..b5fcccb09e8 100644 --- 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. -AC_INIT([[llvm]],[[1.7cvs]],[llvmbugs@cs.uiuc.edu]) +AC_INIT([[llvm]],[[1.8cvs]],[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. @@ -69,6 +69,7 @@ do "CVS") ;; "sample") AC_CONFIG_SUBDIRS([projects/sample]) ;; "Stacker") AC_CONFIG_SUBDIRS([projects/Stacker]) ;; + "privbracket") AC_CONFIG_SUBDIRS([projects/privbracket]) ;; "llvm-test") AC_CONFIG_SUBDIRS([projects/llvm-test]) ;; "llvm-reopt") AC_CONFIG_SUBDIRS([projects/llvm-reopt]);; "llvm-gcc") AC_CONFIG_SUBDIRS([projects/llvm-gcc]) ;; @@ -97,9 +98,9 @@ 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. -AC_CACHE_CHECK([type of operating system we're on], +AC_CACHE_CHECK([type of operating system we're going to host on], [llvm_cv_os_type], -[case $build in +[case $host in *-*-aix*) llvm_cv_os_type="AIX" llvm_cv_platform_type="Unix" ;; @@ -112,6 +113,9 @@ AC_CACHE_CHECK([type of operating system we're on], *-*-freebsd*) llvm_cv_os_type="FreeBSD" llvm_cv_platform_type="Unix" ;; + *-*-openbsd*) + llvm_cv_os_type="OpenBSD" + llvm_cv_platform_type="Unix" ;; *-*-hpux*) llvm_cv_os_type="HP-UX" llvm_cv_platform_type="Unix" ;; @@ -184,6 +188,14 @@ AC_SUBST(ARCH,$llvm_cv_target_arch) dnl Check for the endianness of the target AC_C_BIGENDIAN(AC_SUBST([ENDIAN],[big]),AC_SUBST([ENDIAN],[little])) +dnl Check for build platform executable suffix if we're crosscompiling +if test "$cross_compiling" = yes; then + AC_SUBST(LLVM_CROSS_COMPILING, [1]) + AC_BUILD_EXEEXT +else + AC_SUBST(LLVM_CROSS_COMPILING, [0]) +fi + dnl Check to see if there's a "CVS" directory indicating that this build is dnl being done from a CVS checkout. This sets up several defaults for the dnl command line switches. When we build with a CVS directory, we get a @@ -278,16 +290,16 @@ AC_DEFINE_UNQUOTED([ENABLE_THREADS],$ENABLE_THREADS,[Define if threads enabled]) dnl Allow specific targets to be specified for building (or not) TARGETS_TO_BUILD="" -AC_ARG_ENABLE([targets],AS_HELP_STRING([--enable-target], +AC_ARG_ENABLE([targets],AS_HELP_STRING([--enable-targets], [Build specific host targets: all,host-only,{target-name} (default=all)]),, enableval=all) case "$enableval" in - all) TARGETS_TO_BUILD="X86 Sparc SparcV9 PowerPC Alpha IA64" ;; + all) TARGETS_TO_BUILD="X86 Sparc PowerPC Alpha IA64 ARM" ;; host-only) case "$llvm_cv_target_arch" in x86) TARGETS_TO_BUILD="X86" ;; x86_64) TARGETS_TO_BUILD="X86" ;; - Sparc) TARGETS_TO_BUILD="Sparc SparcV9" ;; + Sparc) TARGETS_TO_BUILD="Sparc" ;; PowerPC) TARGETS_TO_BUILD="PowerPC" ;; Alpha) TARGETS_TO_BUILD="Alpha" ;; IA64) TARGETS_TO_BUILD="IA64" ;; @@ -298,7 +310,7 @@ case "$enableval" in case "$a_target" in x86) TARGETS_TO_BUILD="X86 $TARGETS_TO_BUILD" ;; x86_64) TARGETS_TO_BUILD="X86 $TARGETS_TO_BUILD" ;; - sparc) TARGETS_TO_BUILD="Sparc SparcV9 $TARGETS_TO_BUILD" ;; + sparc) TARGETS_TO_BUILD="Sparc $TARGETS_TO_BUILD" ;; powerpc) TARGETS_TO_BUILD="PowerPC $TARGETS_TO_BUILD" ;; alpha) TARGETS_TO_BUILD="Alpha $TARGETS_TO_BUILD" ;; ia64) TARGETS_TO_BUILD="IA64 $TARGETS_TO_BUILD" ;; @@ -317,10 +329,20 @@ AC_ARG_WITH(llvmgccdir, withval=default) case "$withval" in default) WITH_LLVMGCCDIR=default ;; - /*) WITH_LLVMGCCDIR=$withval ;; + /* | [[A-Za-z]]:[[\\/]]*) WITH_LLVMGCCDIR=$withval ;; *) AC_MSG_ERROR([Invalid path for --with-llvmgccdir. Provide full path]) ;; esac +dnl Specify extra build options +AC_ARG_WITH(extra-options, + AS_HELP_STRING([--with-extra-options], + [Specify addtional options to compile LLVM with]),, + extraopts=default) +case "$extraopts" in + default) EXTRA_OPTIONS= ;; + *) EXTRA_OPTIONS=$extraopts ;; +esac +AC_SUBST(EXTRA_OPTIONS,$EXTRA_OPTIONS) dnl===-----------------------------------------------------------------------=== dnl=== @@ -349,18 +371,48 @@ AC_PROG_RANLIB AC_PATH_PROG(RM, [rm], [rm]) AC_PATH_PROG(SED, [sed], [sed]) AC_PATH_PROG(TAR, [tar], [gtar]) + +dnl Looking for misc. graph plotting software AC_PATH_PROG(GRAPHVIZ, [Graphviz], [echo Graphviz]) if test "$GRAPHVIZ" != "echo Graphviz" ; then AC_DEFINE([HAVE_GRAPHVIZ],[1],[Define if the Graphviz program is available]) - AC_DEFINE_UNQUOTED([LLVM_PATH_GRAPHVIZ],"$GRAPHVIZ", + dnl If we're targeting for mingw we should emit windows paths, not msys + if test "$llvm_cv_os_type" == "MingW" ; then + GRAPHVIZ=`echo $GRAPHVIZ | sed 's/^\/\([[A-Za-z]]\)\//\1:\//' ` + fi + AC_DEFINE_UNQUOTED([LLVM_PATH_GRAPHVIZ],"$GRAPHVIZ${EXEEXT}", [Define to path to Graphviz program if found or 'echo Graphviz' otherwise]) fi -AC_PATH_PROG(GV, [gv], [echo gv]) +AC_PATH_PROG(DOT, [dot], [echo dot]) +if test "$DOT" != "echo dot" ; then + AC_DEFINE([HAVE_DOT],[1],[Define if the dot program is available]) + dnl If we're targeting for mingw we should emit windows paths, not msys + if test "$llvm_cv_os_type" == "MingW" ; then + DOT=`echo $DOT | sed 's/^\/\([[A-Za-z]]\)\//\1:\//' ` + fi + AC_DEFINE_UNQUOTED([LLVM_PATH_DOT],"$DOT${EXEEXT}", + [Define to path to dot program if found or 'echo dot' otherwise]) +fi +AC_PATH_PROGS(GV, [gv gsview32], [echo gv]) if test "$GV" != "echo gv" ; then AC_DEFINE([HAVE_GV],[1],[Define if the gv program is available]) - AC_DEFINE_UNQUOTED([LLVM_PATH_GV],"$GV", + dnl If we're targeting for mingw we should emit windows paths, not msys + if test "$llvm_cv_os_type" == "MingW" ; then + GV=`echo $GV | sed 's/^\/\([[A-Za-z]]\)\//\1:\//' ` + fi + AC_DEFINE_UNQUOTED([LLVM_PATH_GV],"$GV${EXEEXT}", [Define to path to gv program if found or 'echo gv' otherwise]) fi +AC_PATH_PROG(DOTTY, [dotty], [echo dotty]) +if test "$DOTTY" != "echo dotty" ; then + AC_DEFINE([HAVE_DOTTY],[1],[Define if the dotty program is available]) + dnl If we're targeting for mingw we should emit windows paths, not msys + if test "$llvm_cv_os_type" == "MingW" ; then + DOTTY=`echo $DOTTY | sed 's/^\/\([[A-Za-z]]\)\//\1:\//' ` + fi + AC_DEFINE_UNQUOTED([LLVM_PATH_DOTTY],"$DOTTY${EXEEXT}", + [Define to path to dotty program if found or 'echo dotty' otherwise]) +fi dnl Look for a sufficiently recent version of Perl. LLVM_PROG_PERL([5.006]) @@ -378,17 +430,16 @@ 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(DOXYGEN,[doxygen],[true doxygen]) -AC_PATH_PROG(ETAGS,[etags],[true etags]) -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(BZIP2,[bzip2],[echo "Skipped: bzip2 not found"]) +AC_PATH_PROG(DOXYGEN,[doxygen],[echo "Skipped: doxygen not found"]) +AC_PATH_PROG(ETAGS,[etags],[echo "Skipped: etags not found"]) +AC_PATH_PROG(GROFF,[groff],[echo "Skipped: groff not found"]) +AC_PATH_PROG(GZIP,[gzip],[echo "Skipped: gzip not found"]) +AC_PATH_PROG(POD2HTML,[pod2html],[echo "Skipped: pod2html not found"]) +AC_PATH_PROG(POD2MAN,[pod2man],[echo "Skipped: pod2man not found"]) +AC_PATH_PROG(RUNTEST,[runtest],[echo "Skipped: runtest not found"]) DJ_AC_PATH_TCLSH -AC_PATH_PROG(ZIP,[zip],[true zip]) +AC_PATH_PROG(ZIP,[zip],[echo "Skipped: zip not found"]) dnl Determine if the linker supports the -R option. AC_LINK_USE_R @@ -483,6 +534,10 @@ dnl===-----------------------------------------------------------------------=== dnl libelf is for sparc only; we can ignore it if we don't have it AC_CHECK_LIB(elf, elf_begin) AC_CHECK_LIB(m,sin) +if test "$llvm_cv_os_type" == "MingW" ; then + AC_CHECK_LIB(imagehlp, main) + AC_CHECK_LIB(psapi, main) +fi dnl lt_dlopen may be required for plugin support. AC_SEARCH_LIBS(lt_dlopen,ltdl,AC_DEFINE([HAVE_LT_DLOPEN],[1], @@ -526,9 +581,9 @@ AC_HEADER_SYS_WAIT AC_HEADER_TIME 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([malloc/malloc.h]) +AC_CHECK_HEADERS([malloc.h setjmp.h signal.h stdint.h unistd.h utime.h]) +AC_CHECK_HEADERS([windows.h sys/mman.h sys/param.h sys/resource.h sys/time.h]) +AC_CHECK_HEADERS([sys/types.h malloc/malloc.h]) if test "$ENABLE_THREADS" -eq 1 ; then AC_CHECK_HEADERS(pthread.h) fi @@ -558,6 +613,7 @@ AC_CHECK_FUNCS([backtrace ceilf floorf roundf rintf nearbyintf getcwd ]) AC_CHECK_FUNCS([getpagesize getrusage gettimeofday isatty mkdtemp mkstemp ]) AC_CHECK_FUNCS([mktemp realpath sbrk setrlimit strdup strerror strerror_r ]) AC_CHECK_FUNCS([strtoll strtoq sysconf malloc_zone_statistics ]) +AC_CHECK_FUNCS([_setjmp _longjmp setjmp longjmp sigsetjmp siglongjmp]) AC_C_PRINTF_A AC_FUNC_ALLOCA AC_FUNC_RAND48 @@ -616,7 +672,7 @@ if test "$llvm_cv_llvmgcc_sanity" = "yes" ; then AC_SUBST(LLVMCC1PLUS,$llvmcc1pluspath) llvmgccdir=`echo "$llvmcc1path" | sed 's,/libexec/.*,,'` AC_SUBST(LLVMGCCDIR,$llvmgccdir) - llvmgccversion=[`"$LLVMGCC" -v 2>&1 | grep '^gcc version' | sed 's/^gcc version \([0-9.]*\).*/\1/'`] + llvmgccversion=[`"$LLVMGCC" -dumpversion 2>&1 | sed 's/^\([0-9.]*\).*/\1/'`] llvmgccmajvers=[`echo $llvmgccversion | sed 's/^\([0-9]\).*/\1/'`] AC_SUBST(LLVMGCC_VERSION,$llvmgccversion) AC_SUBST(LLVMGCC_MAJVERS,$llvmgccmajvers) @@ -629,6 +685,9 @@ 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 # that these configured values can be used by the makefiles +if test "${prefix}" == "NONE" ; then + prefix="/usr/local" +fi eval LLVM_PREFIX="${prefix}"; eval LLVM_BINDIR="${prefix}/bin"; eval LLVM_LIBDIR="${prefix}/lib"; @@ -697,7 +756,7 @@ dnl Configure doxygen's configuration file AC_CONFIG_FILES([docs/doxygen.cfg]) dnl Do the first stage of configuration for llvm-config.in. -AC_CONFIG_FILES([utils/llvm-config/llvm-config.in]) +AC_CONFIG_FILES([tools/llvm-config/llvm-config.in]) dnl Do special configuration of Makefiles AC_CONFIG_COMMANDS([setup],,[llvm_src="${srcdir}"])