Mercurial > octave-nkf

comparison configure.ac @ 15932:747dd82082c8 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
strip cross tool prefix from CC, CXX, etc. definitions used in mkoctfile * configure.ac, build-aux/common.mk (CROSS_TOOL_PREFIX, MKOCTFILE_CC, MKOCTFILE_CXX, MKOCTFILE_DL_LD, MKOCTFILE_DL_LDFLAGS, MKOCTFILE_F77, MKOCTFILE_LD_CXX): New variables. (do_subst_config_vals): Include MKOCTFILE_CC, MKOCTFILE_CXX, MKOCTFILE_DL_LD, MKOCTFILE_F77, and MKOCTFILE_LD_CXX in the list of substitutions. * mkoctfile.cc.in, mkoctfile.in (CC, CXX, DL_LD, F77, LD_CXX): Define from corresponding MKOCTFILE_ variables.
author John W. Eaton <jwe@octave.org>
date Fri, 11 Jan 2013 22:19:46 -0500
parents 858cbf6fc2ec
children 58018d0e9a71 398ae067e811
comparison
equal deleted inserted replaced
15931:e457139e7d8f 15932:747dd82082c8
1789 dnl Maybe <cmath> defines the IEEE functions we need. 1789 dnl Maybe <cmath> defines the IEEE functions we need.
1790 1790
1791 OCTAVE_CMATH_FUNC(isnan) 1791 OCTAVE_CMATH_FUNC(isnan)
1792 OCTAVE_CMATH_FUNC(isinf) 1792 OCTAVE_CMATH_FUNC(isinf)
1793 OCTAVE_CMATH_FUNC(isfinite) 1793 OCTAVE_CMATH_FUNC(isfinite)
1794
1795 if test "$cross_compiling" = yes && test -n "$ac_tool_prefix"; then
1796 CROSS_TOOL_PREFIX="$ac_tool_prefix"
1797 MKOCTFILE_CC='$(shell echo $(CC) | sed "s,$(CROSS_TOOL_PREFIX),,")'
1798 MKOCTFILE_CXX='$(shell echo $(CXX) | sed "s,$(CROSS_TOOL_PREFIX),,")'
1799 MKOCTFILE_DL_LD='$(shell echo $(DL_LD) | sed "s,$(CROSS_TOOL_PREFIX),,")'
1800 MKOCTFILE_F77='$(shell echo $(F77) | sed "s,$(CROSS_TOOL_PREFIX),,")'
1801 MKOCTFILE_LD_CXX='$(shell echo $(LD_CXX) | sed "s,$(CROSS_TOOL_PREFIX),,")'
1802 else
1803 MKOCTFILE_CC="$CC"
1804 MKOCTFILE_CXX="$CXX"
1805 MKOCTFILE_DL_LD="$DL_LD"
1806 MKOCTFILE_F77="$F77"
1807 MKOCTFILE_LD_CXX="$LD_CXX"
1808 fi
1809 AC_MSG_NOTICE([defining CROSS_TOOL_PREFIX to be $CROSS_TOOL_PREFIX])
1810 AC_MSG_NOTICE([defining MKOCTFILE_CC to be $MKOCTFILE_CC])
1811 AC_MSG_NOTICE([defining MKOCTFILE_CXX to be $MKOCTFILE_CXX])
1812 AC_MSG_NOTICE([defining MKOCTFILE_DL_LD to be $MKOCTFILE_DL_LD])
1813 AC_MSG_NOTICE([defining MKOCTFILE_F77 to be $MKOCTFILE_F77])
1814 AC_MSG_NOTICE([defining MKOCTFILE_LD_CXX to be $MKOCTFILE_LD_CXX])
1815 AC_SUBST(CROSS_TOOL_PREFIX)
1816 AC_SUBST(MKOCTFILE_CC)
1817 AC_SUBST(MKOCTFILE_CXX)
1818 AC_SUBST(MKOCTFILE_DL_LD)
1819 AC_SUBST(MKOCTFILE_F77)
1820 AC_SUBST(MKOCTFILE_LD_CXX)
1821
1822 ### Check for existence of various libraries
1794 1823
1795 dnl Would like to get rid of this cruft, and just have 1824 dnl Would like to get rid of this cruft, and just have
1796 dnl 1825 dnl
1797 dnl AC_CHECK_FUNCS(finite isnan isinf) 1826 dnl AC_CHECK_FUNCS(finite isnan isinf)
1798 dnl 1827 dnl