Mercurial > octave-dspies

comparison configure.ac @ 15369:715220d2b511

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
configure.ac: Simplify test for LLVM dependencies. * configure.ac: Simplify test for LLVM dependencies.
author Rik <rik@octave.org>
date Wed, 12 Sep 2012 20:06:05 -0700
parents 48cb1a5bb64d
children ad2c3902b826
comparison
equal deleted inserted replaced
15368:36ececf69385 15369:715220d2b511
700 dnl Preset warning message in case compile fails 700 dnl Preset warning message in case compile fails
701 warn_llvm="LLVM was not found or is to old. JIT compiler is disabled." 701 warn_llvm="LLVM was not found or is to old. JIT compiler is disabled."
702 702
703 save_CPPFLAGS="$CPPFLAGS" 703 save_CPPFLAGS="$CPPFLAGS"
704 save_CXXFLAGS="$CXXFLAGS" 704 save_CXXFLAGS="$CXXFLAGS"
705 save_LIBS="$LIBS"
706 save_LDFLAGS="$LDFLAGS"
707 705
708 ## Use -isystem if available because we don't want to see warnings in LLVM 706 ## Use -isystem if available because we don't want to see warnings in LLVM
709 LLVM_INCLUDE_FLAG=-I 707 LLVM_INCLUDE_FLAG=-I
710 OCTAVE_CC_FLAG([-isystem .], [ 708 OCTAVE_CC_FLAG([-isystem .], [
711 LLVM_INCLUDE_FLAG=-isystem 709 LLVM_INCLUDE_FLAG=-isystem
722 dnl Ideally we should get these from llvm-config, but llvm-config isn't 720 dnl Ideally we should get these from llvm-config, but llvm-config isn't
723 dnl very helpful. 721 dnl very helpful.
724 dnl 722 dnl
725 CPPFLAGS="-D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS $LLVM_CPPFLAGS $CPPFLAGS" 723 CPPFLAGS="-D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS $LLVM_CPPFLAGS $CPPFLAGS"
726 CXXFLAGS="$LLVM_CXXFLAGS $CXXFLAGS" 724 CXXFLAGS="$LLVM_CXXFLAGS $CXXFLAGS"
727 LIBS="$LLVM_LIBS $LIBS"
728 LDFLAGS="$LLVM_LDFLAGS $LDFLAGS"
729
730 AC_LANG_PUSH(C++) 725 AC_LANG_PUSH(C++)
731 AC_CHECK_HEADERS([llvm/LLVMContext.h llvm/Support/TargetSelect.h], [ 726 AC_CHECK_HEADER([llvm/Support/TargetSelect.h], [
732 AC_MSG_CHECKING([for llvm::getGlobalContext in llvm/LLVMContext.h]) 727 warn_llvm=
733 AC_COMPILE_IFELSE( 728 XTRA_CXXFLAGS="$XTRA_CXXFLAGS $LLVM_CXXFLAGS $LLVM_CPPFLAGS"])
734 [AC_LANG_PROGRAM([[
735 #include <llvm/LLVMContext.h>
736 ]], [[
737 llvm::LLVMContext& ctx = llvm::getGlobalContext ();
738 ]])],
739 [AC_MSG_RESULT([yes])
740 warn_llvm=
741 XTRA_CXXFLAGS="$XTRA_CXXFLAGS $LLVM_CXXFLAGS $LLVM_CPPFLAGS"],
742 [AC_MSG_RESULT([no])
743 ])
744 ])
745 AC_LANG_POP(C++) 729 AC_LANG_POP(C++)
746 CPPFLAGS="$save_CPPFLAGS" 730 CPPFLAGS="$save_CPPFLAGS"
747 CXXFLAGS="$save_CXXFLAGS" 731 CXXFLAGS="$save_CXXFLAGS"
748 LIBS="$save_LIBS"
749 LDFLAGS="$save_LDFLAGS"
750 fi 732 fi
751 733
752 if test -z "$warn_llvm"; then 734 if test -z "$warn_llvm"; then
753 AC_DEFINE(HAVE_LLVM, 1, [Define to 1 if LLVM is available.]) 735 AC_DEFINE(HAVE_LLVM, 1, [Define to 1 if LLVM is available.])
754 else 736 else