Mercurial > octave

diff src/mkoctfile.in.cc @ 23757:bba752b37f8e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 9d67bd90681b
line wrap: on
line diff
--- a/src/mkoctfile.in.cc	Sun Jul 09 10:42:55 2017 -0400
+++ b/src/mkoctfile.in.cc	Sun Jul 09 11:41:26 2017 -0400
@@ -234,13 +234,13 @@
   vars["FLIBS"] = get_variable ("FLIBS", %OCTAVE_CONF_FLIBS%);
 
   vars["OCTAVE_LINK_DEPS"] = get_variable ("OCTAVE_LINK_DEPS",
-                                           %OCTAVE_CONF_OCTAVE_LINK_DEPS%);
+                                           %OCTAVE_CONF_MKOCTFILE_OCTAVE_LINK_DEPS%);
 
   vars["OCTAVE_LINK_OPTS"] = get_variable ("OCTAVE_LINK_OPTS",
                                            %OCTAVE_CONF_OCTAVE_LINK_OPTS%);
 
   vars["OCT_LINK_DEPS"] = get_variable ("OCT_LINK_DEPS",
-                                        %OCTAVE_CONF_OCT_LINK_DEPS%);
+                                        %OCTAVE_CONF_MKOCTFILE_OCT_LINK_DEPS%);
 
   vars["OCT_LINK_OPTS"] = get_variable ("OCT_LINK_OPTS",
                                         %OCTAVE_CONF_OCT_LINK_OPTS%);