Mercurial > octave-nkf

comparison configure.ac @ 17196:bc20614022aa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build: Redo LLVM macros to disable JIT rather than stop build if headers not found. * configure.ac: Move functionality for OCTAVE_LLVM_IR_DIR, OCTAVE_LLVM_IRBUILDER_HEADER, OCTAVE_LLVM_DATALAYOUT_HEADER macros from acinclude.m4 to configure.ac. * m4/acinclude.m4: Delete OCTAVE_LLVM_IR_DIR, OCTAVE_LLVM_IRBUILDER_HEADER, OCTAVE_LLVM_DATALAYOUT_HEADER macros. Eliminate unnecessary else clause of OCTAVE_LLVM_FUNCTION_ADDATTRIBUTE_API, OCTAVE_LLVM_FUNCTION_ADDFNATTR_API, OTAVE_LLVM_CALLINST_ADDATTRIBUTE_API macros.
author Rik <rik@octave.org>
date Wed, 07 Aug 2013 12:03:31 -0700
parents 54e251e699bb
children 03a666018e0f
comparison
equal deleted inserted replaced
17195:2899d110c178 17196:bc20614022aa
764 CXXFLAGS="$LLVM_CXXFLAGS $CXXFLAGS" 764 CXXFLAGS="$LLVM_CXXFLAGS $CXXFLAGS"
765 AC_LANG_PUSH(C++) 765 AC_LANG_PUSH(C++)
766 AC_CHECK_HEADER([llvm/Support/TargetSelect.h], [ 766 AC_CHECK_HEADER([llvm/Support/TargetSelect.h], [
767 warn_llvm= 767 warn_llvm=
768 XTRA_CXXFLAGS="$XTRA_CXXFLAGS $LLVM_CXXFLAGS $LLVM_CPPFLAGS"]) 768 XTRA_CXXFLAGS="$XTRA_CXXFLAGS $LLVM_CXXFLAGS $LLVM_CPPFLAGS"])
769 OCTAVE_LLVM_IR_DIR 769
770 OCTAVE_LLVM_IRBUILDER_HEADER 770 have_function_h=no
771 OCTAVE_LLVM_DATALAYOUT_HEADER 771 AC_CHECK_HEADERS([llvm/IR/Function.h llvm/Function.h],
772 [have_function_h=yes; break])
773 if test $have_function_h = no; then
774 warn_llvm="Missing LLVM file Function.h. JIT compiler is disabled."
775 fi
776 have_irbuilder_h=no
777 AC_CHECK_HEADERS([llvm/Support/IRBuilder.h llvm/IR/IRBuilder.h \
778 llvm/IRBuilder.h], [have_irbuilder_h=yes; break])
779 if test $have_irbuilder_h = no; then
780 warn_llvm="Missing LLVM file IRBuilder.h. JIT compiler is disabled."
781 fi
782 have_llvm_data_h=no
783 AC_CHECK_HEADERS([llvm/Target/TargetData.h llvm/IR/DataLayout.h \
784 llvm/DataLayout.h], [have_llvm_data_h=yes; break])
785 if test $have_llvm_data_h = no; then
786 warn_llvm="Missing LLVM file TargetData.h. JIT compiler is disabled."
787 fi
788
772 OCTAVE_LLVM_FUNCTION_ADDATTRIBUTE_API 789 OCTAVE_LLVM_FUNCTION_ADDATTRIBUTE_API
773 OCTAVE_LLVM_FUNCTION_ADDFNATTR_API 790 OCTAVE_LLVM_FUNCTION_ADDFNATTR_API
774 OCTAVE_LLVM_CALLINST_ADDATTRIBUTE_API 791 OCTAVE_LLVM_CALLINST_ADDATTRIBUTE_API
775 AC_LANG_POP(C++) 792 AC_LANG_POP(C++)
776 CPPFLAGS="$save_CPPFLAGS" 793 CPPFLAGS="$save_CPPFLAGS"
1932 1949
1933 dnl Use multiple AC_CHECKs to avoid line continuations '\' in list 1950 dnl Use multiple AC_CHECKs to avoid line continuations '\' in list
1934 AC_CHECK_HEADERS([curses.h direct.h dlfcn.h floatingpoint.h fpu_control.h]) 1951 AC_CHECK_HEADERS([curses.h direct.h dlfcn.h floatingpoint.h fpu_control.h])
1935 AC_CHECK_HEADERS([grp.h ieeefp.h inttypes.h locale.h memory.h ncurses.h]) 1952 AC_CHECK_HEADERS([grp.h ieeefp.h inttypes.h locale.h memory.h ncurses.h])
1936 AC_CHECK_HEADERS([poll.h pthread.h pwd.h sunmath.h sys/ioctl.h]) 1953 AC_CHECK_HEADERS([poll.h pthread.h pwd.h sunmath.h sys/ioctl.h])
1937 AC_CHECK_HEADERS([sys/param.h sys/poll.h sys/resource.h ]) 1954 AC_CHECK_HEADERS([sys/param.h sys/poll.h sys/resource.h])
1938 AC_CHECK_HEADERS([sys/select.h sys/utsname.h termcap.h]) 1955 AC_CHECK_HEADERS([sys/select.h sys/utsname.h termcap.h])
1939 1956
1940 ## C++ headers 1957 ## C++ headers
1941 1958
1942 AC_LANG_PUSH(C++) 1959 AC_LANG_PUSH(C++)