Mercurial > octave
diff build-aux/subst-config-vals.in.sh @ 23757:bba752b37f8e
use different definition for mkoctfile link deps
* configure.ac (BASE_LIBOCTAVE_LINK_DEPS, MKOCTFILE_GNULIB_LINK_DEPS,
MKOCTFILE_LIBOCTAVE_LINK_DEPS, MKOCTFILE_OCTAVE_LINK_DEPS,
MKOCTFILE_OCT_LINK_DEPS): New variables. AC_SUBST
MKOCTFILE_OCTAVE_LINK_DEPS and MKOCTFILE_OCT_LINK_DEPS.
* subst-config-vals.in.sh: Substitute
OCTAVE_CONF_MKOCTFILE_OCTAVE_LINK_DEPS and
OCTAVE_CONF_MKOCTFILE_OCT_LINK_DEPS.
* mkoctfile.in.cc: Set OCTAVE_LINK_DEPS from
OCTAVE_CONF_MKOCTFILE_OCTAVE_LINK_DEPS and OCT_LINK_DEPS from
OCTAVE_CONF_MKOCTFILE_OCT_LINK_DEPS.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Sun, 09 Jul 2017 11:41:26 -0400 |
| parents | b95c430c0649 |
| children | 6f56efc098bd |
line wrap: on
line diff
--- a/build-aux/subst-config-vals.in.sh Sun Jul 09 10:42:55 2017 -0400 +++ b/build-aux/subst-config-vals.in.sh Sun Jul 09 11:41:26 2017 -0400 @@ -121,6 +121,8 @@ MKOCTFILE_F77="@MKOCTFILE_F77@" MKOCTFILE_LD_CXX="@MKOCTFILE_LD_CXX@" MKOCTFILE_RANLIB="@MKOCTFILE_RANLIB@" +MKOCTFILE_OCTAVE_LINK_DEPS="@MKOCTFILE_OCTAVE_LINK_DEPS@" +MKOCTFILE_OCT_LINK_DEPS="@MKOCTFILE_OCT_LINK_DEPS@" OCTAVE_LINK_DEPS="@OCTAVE_LINK_DEPS@" OCTAVE_LINK_OPTS="@OCTAVE_LINK_OPTS@" OCT_LINK_DEPS="@OCT_LINK_DEPS@" @@ -293,6 +295,8 @@ -e "s|%OCTAVE_CONF_MKOCTFILE_F77%|\"${MKOCTFILE_F77}\"|" \ -e "s|%OCTAVE_CONF_MKOCTFILE_LD_CXX%|\"${MKOCTFILE_LD_CXX}\"|" \ -e "s|%OCTAVE_CONF_MKOCTFILE_RANLIB%|\"${MKOCTFILE_RANLIB}\"|" \ + -e "s|%OCTAVE_CONF_MKOCTFILE_OCTAVE_LINK_DEPS%|\"${MKOCTFILE_OCTAVE_LINK_DEPS}\"|" \ + -e "s|%OCTAVE_CONF_MKOCTFILE_OCT_LINK_DEPS%|\"${MKOCTFILE_OCT_LINK_DEPS}\"|" \ -e "s|%OCTAVE_CONF_OCTAVE_LINK_DEPS%|\"${OCTAVE_LINK_DEPS}\"|" \ -e "s|%OCTAVE_CONF_OCTAVE_LINK_OPTS%|\"${OCTAVE_LINK_OPTS}\"|" \ -e "s|%OCTAVE_CONF_OCTINCLUDEDIR%|\"${octincludedir}\"|" \