Mercurial > octave-nkf

comparison configure.ac @ 15945:a653526ea4a5 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use mkoctfile, not octave_config_info to get default pkg compiler tools * common.mk (MKOCTFILE_AR, MKOCTFILE_RANLIB): New variables. (do_subst_config_vals): Include MKOCTFILE_AR and MKOCTFILE_RANLIB in the list of substitutions. * configure.ac (MKOCTFILE_AR, MKOCTFILE_RANLIB): Additional mkoctfile values that receive special treatment when cross compiling. * pkg/pkg.m (configure_make): Use mkoctfile, not octave_config_info to get values for CC, CXX, AR, and RANLIB. * mkoctfile.cc.in, mkoctfile.in (AR, RANLIB): New variables. Update usage message.
author John W. Eaton <jwe@octave.org>
date Mon, 14 Jan 2013 15:07:04 -0500
parents 398ae067e811
children 25eff7fe556d cc5a7d1233f3
comparison
equal deleted inserted replaced
15938:398ae067e811 15945:a653526ea4a5
1792 OCTAVE_CMATH_FUNC(isinf) 1792 OCTAVE_CMATH_FUNC(isinf)
1793 OCTAVE_CMATH_FUNC(isfinite) 1793 OCTAVE_CMATH_FUNC(isfinite)
1794 1794
1795 if test "$cross_compiling" = yes && test -n "$ac_tool_prefix"; then 1795 if test "$cross_compiling" = yes && test -n "$ac_tool_prefix"; then
1796 CROSS_TOOL_PREFIX="$ac_tool_prefix" 1796 CROSS_TOOL_PREFIX="$ac_tool_prefix"
1797 MKOCTFILE_AR='$(shell echo $(AR) | sed "s,$(CROSS_TOOL_PREFIX),,")'
1797 MKOCTFILE_CC='$(shell echo $(CC) | sed "s,$(CROSS_TOOL_PREFIX),,")' 1798 MKOCTFILE_CC='$(shell echo $(CC) | sed "s,$(CROSS_TOOL_PREFIX),,")'
1798 MKOCTFILE_CXX='$(shell echo $(CXX) | sed "s,$(CROSS_TOOL_PREFIX),,")' 1799 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_DL_LD='$(shell echo $(DL_LD) | sed "s,$(CROSS_TOOL_PREFIX),,")'
1800 MKOCTFILE_F77='$(shell echo $(F77) | sed "s,$(CROSS_TOOL_PREFIX),,")' 1801 MKOCTFILE_F77='$(shell echo $(F77) | sed "s,$(CROSS_TOOL_PREFIX),,")'
1801 MKOCTFILE_LD_CXX='$(shell echo $(LD_CXX) | sed "s,$(CROSS_TOOL_PREFIX),,")' 1802 MKOCTFILE_LD_CXX='$(shell echo $(LD_CXX) | sed "s,$(CROSS_TOOL_PREFIX),,")'
1803 MKOCTFILE_RANLIB='$(shell echo $(RANLIB) | sed "s,$(CROSS_TOOL_PREFIX),,")'
1802 else 1804 else
1805 MKOCTFILE_AR="$AR"
1803 MKOCTFILE_CC="$CC" 1806 MKOCTFILE_CC="$CC"
1804 MKOCTFILE_CXX="$CXX" 1807 MKOCTFILE_CXX="$CXX"
1805 MKOCTFILE_DL_LD="$DL_LD" 1808 MKOCTFILE_DL_LD="$DL_LD"
1806 MKOCTFILE_F77="$F77" 1809 MKOCTFILE_F77="$F77"
1807 MKOCTFILE_LD_CXX="$LD_CXX" 1810 MKOCTFILE_LD_CXX="$LD_CXX"
1811 MKOCTFILE_RANLIB="$RANLIB"
1808 fi 1812 fi
1809 AC_MSG_NOTICE([defining CROSS_TOOL_PREFIX to be $CROSS_TOOL_PREFIX]) 1813 AC_MSG_NOTICE([defining CROSS_TOOL_PREFIX to be $CROSS_TOOL_PREFIX])
1814 AC_MSG_NOTICE([defining MKOCTFILE_AR to be $MKOCTFILE_AR])
1810 AC_MSG_NOTICE([defining MKOCTFILE_CC to be $MKOCTFILE_CC]) 1815 AC_MSG_NOTICE([defining MKOCTFILE_CC to be $MKOCTFILE_CC])
1811 AC_MSG_NOTICE([defining MKOCTFILE_CXX to be $MKOCTFILE_CXX]) 1816 AC_MSG_NOTICE([defining MKOCTFILE_CXX to be $MKOCTFILE_CXX])
1812 AC_MSG_NOTICE([defining MKOCTFILE_DL_LD to be $MKOCTFILE_DL_LD]) 1817 AC_MSG_NOTICE([defining MKOCTFILE_DL_LD to be $MKOCTFILE_DL_LD])
1813 AC_MSG_NOTICE([defining MKOCTFILE_F77 to be $MKOCTFILE_F77]) 1818 AC_MSG_NOTICE([defining MKOCTFILE_F77 to be $MKOCTFILE_F77])
1814 AC_MSG_NOTICE([defining MKOCTFILE_LD_CXX to be $MKOCTFILE_LD_CXX]) 1819 AC_MSG_NOTICE([defining MKOCTFILE_LD_CXX to be $MKOCTFILE_LD_CXX])
1820 AC_MSG_NOTICE([defining MKOCTFILE_RANLIB to be $MKOCTFILE_RANLIB])
1815 AC_SUBST(CROSS_TOOL_PREFIX) 1821 AC_SUBST(CROSS_TOOL_PREFIX)
1822 AC_SUBST(MKOCTFILE_AR)
1816 AC_SUBST(MKOCTFILE_CC) 1823 AC_SUBST(MKOCTFILE_CC)
1817 AC_SUBST(MKOCTFILE_CXX) 1824 AC_SUBST(MKOCTFILE_CXX)
1818 AC_SUBST(MKOCTFILE_DL_LD) 1825 AC_SUBST(MKOCTFILE_DL_LD)
1819 AC_SUBST(MKOCTFILE_F77) 1826 AC_SUBST(MKOCTFILE_F77)
1820 AC_SUBST(MKOCTFILE_LD_CXX) 1827 AC_SUBST(MKOCTFILE_LD_CXX)
1828 AC_SUBST(MKOCTFILE_RANLIB)
1821 1829
1822 ### Check for existence of various libraries 1830 ### Check for existence of various libraries
1823 1831
1824 dnl Would like to get rid of this cruft, and just have 1832 dnl Would like to get rid of this cruft, and just have
1825 dnl 1833 dnl