Mercurial > hg > octave-avbm

comparison configure.ac @ 14990:149d1e2224f0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
configure.ac: llvm include goes in CPPFLAGS not CXXFLAGS
author Max Brister <max@2bass.com>
date Thu, 12 Jul 2012 13:15:27 -0500
parents 466cb8673653
children 06f2e9bdade6
comparison
equal deleted inserted replaced
14989:dfaa8da46364 14990:149d1e2224f0
733 733
734 AS_IF([test "x$enable_jit_debug" = "xyes"], [ 734 AS_IF([test "x$enable_jit_debug" = "xyes"], [
735 AC_DEFINE(OCTAVE_JIT_DEBUG, 1, [Define for jit debug printing]) 735 AC_DEFINE(OCTAVE_JIT_DEBUG, 1, [Define for jit debug printing])
736 ]) 736 ])
737 737
738 LLVM_CXXFLAGS=
738 LLVM_CPPFLAGS= 739 LLVM_CPPFLAGS=
739 LLVM_LDFLAGS= 740 LLVM_LDFLAGS=
740 LLVM_LIBS= 741 LLVM_LIBS=
741 742
742 dnl llvm-config is messed up 743 dnl llvm-config is messed up
743 if test -n "$LLVM_CONFIG"; then 744 if test -n "$LLVM_CONFIG"; then
744 LLVM_LDFLAGS="-L`$LLVM_CONFIG --libdir`" 745 LLVM_LDFLAGS="-L`$LLVM_CONFIG --libdir`"
745 LLVM_LIBS=`$LLVM_CONFIG --libs` 746 LLVM_LIBS=`$LLVM_CONFIG --libs`
746 dnl Use -isystem so we don't get warnings from llvm headers 747 dnl Use -isystem so we don't get warnings from llvm headers
747 LLVM_CXXFLAGS="-isystem `$LLVM_CONFIG --includedir`" 748 LLVM_CPPFLAGS="-isystem `$LLVM_CONFIG --includedir`"
749 LLVM_CXXFLAGS=
748 fi 750 fi
749 751
750 save_CPPFLAGS="$CPPFLAGS" 752 save_CPPFLAGS="$CPPFLAGS"
751 save_CXXFLAGS="$CXXFLAGS" 753 save_CXXFLAGS="$CXXFLAGS"
752 save_LIBS="$LIBS" 754 save_LIBS="$LIBS"
754 dnl 756 dnl
755 dnl We define some extra flags that llvm requires in order to include headers. 757 dnl We define some extra flags that llvm requires in order to include headers.
756 dnl Idealy we should get these from llvm-config, but llvm-config isn't very 758 dnl Idealy we should get these from llvm-config, but llvm-config isn't very
757 dnl helpful. 759 dnl helpful.
758 dnl 760 dnl
759 CPPFLAGS="-D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS $CPPFLAGS" 761 CPPFLAGS="-D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS $LLVM_CPPFLAGS $CPPFLAGS"
760 CXXFLAGS="$LLVM_CXXFLAGS $CXXFLAGS" 762 CXXFLAGS="$LLVM_CXXFLAGS $CXXFLAGS"
761 LIBS="$LLVM_LIBS $LIBS" 763 LIBS="$LLVM_LIBS $LIBS"
762 LDFLAGS="$LLVM_LDFLAGS $LDFLAGS" 764 LDFLAGS="$LLVM_LDFLAGS $LDFLAGS"
763 765
764 AC_LANG_PUSH(C++) 766 AC_LANG_PUSH(C++)
768 [AC_LANG_PROGRAM([[#include <llvm/LLVMContext.h>]], 770 [AC_LANG_PROGRAM([[#include <llvm/LLVMContext.h>]],
769 [[llvm::LLVMContext& ctx = llvm::getGlobalContext ();]])], 771 [[llvm::LLVMContext& ctx = llvm::getGlobalContext ();]])],
770 [ 772 [
771 AC_MSG_RESULT([yes]) 773 AC_MSG_RESULT([yes])
772 warn_llvm= 774 warn_llvm=
773 XTRA_CXXFLAGS="$XTRA_CXXFLAGS $LLVM_CXXFLAGS" 775 XTRA_CXXFLAGS="$XTRA_CXXFLAGS $LLVM_CXXFLAGS $LLVM_CPPFLAGS"
774 ], 776 ],
775 [AC_MSG_RESULT([no]) 777 [AC_MSG_RESULT([no])
776 ]) 778 ])
777 ]) 779 ])
778 AC_LANG_POP(C++) 780 AC_LANG_POP(C++)
782 LDFLAGS="$save_LDFLAGS" 784 LDFLAGS="$save_LDFLAGS"
783 785
784 if test -z "$warn_llvm"; then 786 if test -z "$warn_llvm"; then
785 AC_DEFINE(HAVE_LLVM, 1, [Define if LLVM is available]) 787 AC_DEFINE(HAVE_LLVM, 1, [Define if LLVM is available])
786 else 788 else
789 LLVM_CXXFLAGS=
787 LLVM_CPPFLAGS= 790 LLVM_CPPFLAGS=
788 LLVM_LDFLAGS= 791 LLVM_LDFLAGS=
789 LLVM_LIBS= 792 LLVM_LIBS=
790 AC_MSG_WARN([$warn_llvm]) 793 AC_MSG_WARN([$warn_llvm])
791 fi 794 fi
792 795
796 AC_SUBST(LLVM_CXXFLAGS)
793 AC_SUBST(LLVM_CPPFLAGS) 797 AC_SUBST(LLVM_CPPFLAGS)
794 AC_SUBST(LLVM_LDFLAGS) 798 AC_SUBST(LLVM_LDFLAGS)
795 AC_SUBST(LLVM_LIBS) 799 AC_SUBST(LLVM_LIBS)
796 800
797 ### Check for HDF5 library. 801 ### Check for HDF5 library.