Mercurial > octave

comparison configure.ac @ 17387:2b4ed68be0d5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Allow shared libs for LLVM (Bug #38654) configure.ac: when detecting llvm, check for the LLVM-{lvmversion} library and if not found use the llvm-config --libs output.
author John Donoghue <john.donoghue@ieee.org>
date Fri, 06 Sep 2013 19:42:13 -0400
parents f0e3d3de5c22
children cc13924a4266
comparison
equal deleted inserted replaced
17386:6dbc866379e2 17387:2b4ed68be0d5
744 dnl Preset warning message in case compile fails 744 dnl Preset warning message in case compile fails
745 warn_llvm="LLVM was not found or is to old. JIT compiler is disabled." 745 warn_llvm="LLVM was not found or is to old. JIT compiler is disabled."
746 746
747 save_CPPFLAGS="$CPPFLAGS" 747 save_CPPFLAGS="$CPPFLAGS"
748 save_CXXFLAGS="$CXXFLAGS" 748 save_CXXFLAGS="$CXXFLAGS"
749 save_LDFLAGS="$LDFLAGS"
749 750
750 ## Use -isystem if available because we don't want to see warnings in LLVM 751 ## Use -isystem if available because we don't want to see warnings in LLVM
751 LLVM_INCLUDE_FLAG=-I 752 LLVM_INCLUDE_FLAG=-I
752 OCTAVE_CC_FLAG([-isystem .], [ 753 OCTAVE_CC_FLAG([-isystem .], [
753 LLVM_INCLUDE_FLAG=-isystem 754 LLVM_INCLUDE_FLAG=-isystem
755 756
756 dnl Use -isystem so we don't get warnings from llvm headers 757 dnl Use -isystem so we don't get warnings from llvm headers
757 LLVM_CPPFLAGS="$LLVM_INCLUDE_FLAG `$LLVM_CONFIG --includedir`" 758 LLVM_CPPFLAGS="$LLVM_INCLUDE_FLAG `$LLVM_CONFIG --includedir`"
758 LLVM_CXXFLAGS= 759 LLVM_CXXFLAGS=
759 LLVM_LDFLAGS="-L`$LLVM_CONFIG --libdir`" 760 LLVM_LDFLAGS="-L`$LLVM_CONFIG --libdir`"
760 LLVM_LIBS=`$LLVM_CONFIG --libs` 761
762
763 LDFLAGS="$LDFLAGS $LLVM_LDFLAGS"
764 LLVM_SO=LLVM-`$LLVM_CONFIG --version`
765 AC_CHECK_LIB([$LLVM_SO], [LLVMBuildAdd], [LLVM_LIBS="-l$LLVM_SO"], [LLVM_LIBS=`$LLVM_CONFIG --libs`])
761 766
762 dnl 767 dnl
763 dnl Define some extra flags that LLVM requires in order to include headers. 768 dnl Define some extra flags that LLVM requires in order to include headers.
764 dnl Ideally we should get these from llvm-config, but llvm-config isn't 769 dnl Ideally we should get these from llvm-config, but llvm-config isn't
765 dnl very helpful. 770 dnl very helpful.
794 OCTAVE_LLVM_FUNCTION_ADDFNATTR_API 799 OCTAVE_LLVM_FUNCTION_ADDFNATTR_API
795 OCTAVE_LLVM_CALLINST_ADDATTRIBUTE_API 800 OCTAVE_LLVM_CALLINST_ADDATTRIBUTE_API
796 AC_LANG_POP(C++) 801 AC_LANG_POP(C++)
797 CPPFLAGS="$save_CPPFLAGS" 802 CPPFLAGS="$save_CPPFLAGS"
798 CXXFLAGS="$save_CXXFLAGS" 803 CXXFLAGS="$save_CXXFLAGS"
804 LDFLAGS="$save_LDFLAGS"
799 fi 805 fi
800 806
801 if test -z "$warn_llvm"; then 807 if test -z "$warn_llvm"; then
802 AC_DEFINE(HAVE_LLVM, 1, [Define to 1 if LLVM is available.]) 808 AC_DEFINE(HAVE_LLVM, 1, [Define to 1 if LLVM is available.])
803 else 809 else