Mercurial > octave

comparison src/mkoctfile.in.cc @ 25556:cbef9fc53fef

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
include all octave-config vars in mkoctfile (bug #54260) * mkoctfile.in.cc: Include all variables from octave-config.in.cc that were not already available in mkoctfile.in.cc. Update docstring. * subst-config-vals.in.sh, subst-cross-config-vals.in.sh: Also substitute all variables that were in subst-default-vals.in.sh but not in these scripts. Fix minor inconsistencies between the two scripts. * src/module.mk, libinterp/corefcn/module.mk: Use subst-config-vals.sh instead of subst-default-vals.sh. * subst-default-vals.in.sh: Delete. * build-aux/module.mk, .hgignore: Update. * configure.ac (OCTAVE_CONFIG_MOVE_IF_CHANGE_FILES): Remove build-aux/subst-default-vals.sh from the list.
author John W. Eaton <jwe@octave.org>
date Fri, 06 Jul 2018 19:20:40 -0400
parents 49d3c6344afe
children 3af4f3e2dae8
comparison
equal deleted inserted replaced
25555:364a31cd4c4f 25556:cbef9fc53fef
149 set_octave_home (); 149 set_octave_home ();
150 150
151 vars["OCTAVE_HOME"] = Voctave_home; 151 vars["OCTAVE_HOME"] = Voctave_home;
152 vars["OCTAVE_EXEC_HOME"] = Voctave_exec_home; 152 vars["OCTAVE_EXEC_HOME"] = Voctave_exec_home;
153 153
154 vars["API_VERSION"] = %OCTAVE_API_VERSION%;
155 vars["CANONICAL_HOST_TYPE"] = %OCTAVE_CANONICAL_HOST_TYPE%;
156 vars["DEFAULT_PAGER"] = %OCTAVE_DEFAULT_PAGER%;
157 vars["EXEEXT"] = %OCTAVE_EXEEXT%;
158 vars["MAN1EXT"] = %OCTAVE_MAN1EXT%;
159 vars["VERSION"] = %OCTAVE_VERSION%;
160
161 vars["ARCHLIBDIR"] = prepend_octave_exec_home (%OCTAVE_ARCHLIBDIR%);
162 vars["BINDIR"] = prepend_octave_exec_home (%OCTAVE_BINDIR%);
163 vars["DATADIR"] = prepend_octave_home (%OCTAVE_DATADIR%);
164 vars["DATAROOTDIR"] = prepend_octave_home (%OCTAVE_DATAROOTDIR%);
165 vars["FCNFILEDIR"] = prepend_octave_home (%OCTAVE_FCNFILEDIR%);
166 vars["IMAGEDIR"] = prepend_octave_home (%OCTAVE_IMAGEDIR%);
167 vars["INFODIR"] = prepend_octave_home (%OCTAVE_INFODIR%);
168 vars["INFOFILE"] = prepend_octave_home (%OCTAVE_INFOFILE%);
169 vars["LIBEXECDIR"] = prepend_octave_exec_home (%OCTAVE_LIBEXECDIR%);
170 vars["LOCALAPIARCHLIBDIR"] = prepend_octave_exec_home (%OCTAVE_LOCALAPIARCHLIBDIR%);
171 vars["LOCALAPIFCNFILEDIR"] = prepend_octave_home (%OCTAVE_LOCALAPIFCNFILEDIR%);
172 vars["LOCALAPIOCTFILEDIR"] = prepend_octave_exec_home (%OCTAVE_LOCALAPIOCTFILEDIR%);
173 vars["LOCALARCHLIBDIR"] = prepend_octave_exec_home (%OCTAVE_LOCALARCHLIBDIR%);
174 vars["LOCALFCNFILEDIR"] = prepend_octave_home (%OCTAVE_LOCALFCNFILEDIR%);
175 vars["LOCALOCTFILEDIR"] = prepend_octave_exec_home (%OCTAVE_LOCALOCTFILEDIR%);
176 vars["LOCALSTARTUPFILEDIR"] = prepend_octave_home (%OCTAVE_LOCALSTARTUPFILEDIR%);
177 vars["LOCALVERARCHLIBDIR"] = prepend_octave_exec_home (%OCTAVE_LOCALVERARCHLIBDIR%);
178 vars["LOCALVERFCNFILEDIR"] = prepend_octave_home (%OCTAVE_LOCALVERFCNFILEDIR%);
179 vars["LOCALVEROCTFILEDIR"] = prepend_octave_exec_home (%OCTAVE_LOCALVEROCTFILEDIR%);
180 vars["MAN1DIR"] = prepend_octave_home (%OCTAVE_MAN1DIR%);
181 vars["MANDIR"] = prepend_octave_home (%OCTAVE_MANDIR%);
182 vars["OCTDATADIR"] = prepend_octave_home (%OCTAVE_OCTDATADIR%);
183 vars["OCTDOCDIR"] = prepend_octave_home (%OCTAVE_OCTDOCDIR%);
184 vars["OCTFILEDIR"] = prepend_octave_exec_home (%OCTAVE_OCTFILEDIR%);
185 vars["OCTFONTSDIR"] = prepend_octave_home (%OCTAVE_OCTFONTSDIR%);
186 vars["STARTUPFILEDIR"] = prepend_octave_home (%OCTAVE_STARTUPFILEDIR%);
187
154 vars["SED"] = get_variable ("SED", %OCTAVE_CONF_SED%); 188 vars["SED"] = get_variable ("SED", %OCTAVE_CONF_SED%);
155 189
156 vars["OCTINCLUDEDIR"] 190 vars["OCTINCLUDEDIR"]
157 = get_variable ("OCTINCLUDEDIR", 191 = get_variable ("OCTINCLUDEDIR",
158 prepend_octave_home (%OCTAVE_CONF_OCTINCLUDEDIR%)); 192 prepend_octave_home (%OCTAVE_CONF_OCTINCLUDEDIR%));
346 " (or .mex if --mex is specified) unless linking\n" 380 " (or .mex if --mex is specified) unless linking\n"
347 " a stand-alone executable.\n" 381 " a stand-alone executable.\n"
348 "\n" 382 "\n"
349 " -g Enable debugging options for compilers.\n" 383 " -g Enable debugging options for compilers.\n"
350 "\n" 384 "\n"
351 " -p VAR, --print VAR Print configuration variable VAR. Recognized\n" 385 " -p VAR, --print VAR Print configuration variable VAR. There are\n"
352 " variables are:\n" 386 " three categories of variables:\n"
353 "\n" 387 "\n"
354 " ALL_CFLAGS INCFLAGS\n" 388 " Octave configuration variables that users may\n"
355 " ALL_CXXFLAGS INCLUDEDIR\n" 389 " override with environment variables. These are\n"
356 " ALL_FFLAGS LAPACK_LIBS\n" 390 " used in commands that mkoctfile executes.\n"
357 " ALL_LDFLAGS LD_CXX\n" 391 "\n"
358 " AR LDFLAGS\n" 392 " ALL_CFLAGS LAPACK_LIBS\n"
359 " BLAS_LIBS LD_STATIC_FLAG\n" 393 " ALL_CXXFLAGS LD_CXX\n"
360 " CC LFLAGS\n" 394 " ALL_FFLAGS LDFLAGS\n"
361 " CFLAGS LIBDIR\n" 395 " ALL_LDFLAGS LD_STATIC_FLAG\n"
362 " CPICFLAG LIBOCTAVE\n" 396 " BLAS_LIBS LFLAGS\n"
363 " CPPFLAGS LIBOCTINTERP\n" 397 " CC LIBDIR\n"
364 " CXX LIBS\n" 398 " CFLAGS LIBOCTAVE\n"
365 " CXXFLAGS OCTAVE_EXEC_HOME\n" 399 " CPICFLAG LIBOCTINTERP\n"
366 " CXXPICFLAG OCTAVE_HOME\n" 400 " CPPFLAGS OCTAVE_LINK_OPTS\n"
367 " DEPEND_EXTRA_SED_PATTERN OCTAVE_LIBS\n" 401 " CXX OCTINCLUDEDIR\n"
368 " DEPEND_FLAGS OCTAVE_LINK_DEPS\n" 402 " CXXFLAGS OCTAVE_LIBS\n"
369 " DL_LD OCTAVE_LINK_OPTS\n" 403 " CXXPICFLAG OCTAVE_LINK_DEPS\n"
370 " DL_LDFLAGS OCTINCLUDEDIR\n" 404 " DL_LD OCTLIBDIR\n"
371 " F77 OCTLIBDIR\n" 405 " DL_LDFLAGS OCT_LINK_DEPS\n"
372 " F77_INTEGER8_FLAG OCT_LINK_DEPS\n" 406 " F77 OCT_LINK_OPTS\n"
373 " FFLAGS OCT_LINK_OPTS\n" 407 " F77_INTEGER8_FLAG RDYNAMIC_FLAG\n"
374 " FFTW3F_LDFLAGS RANLIB\n" 408 " FFLAGS SPECIAL_MATH_LIB\n"
375 " FFTW3F_LIBS RDYNAMIC_FLAG\n" 409 " FPICFLAG XTRA_CFLAGS\n"
376 " FFTW3_LDFLAGS READLINE_LIBS\n" 410 " INCFLAGS XTRA_CXXFLAGS\n"
377 " FFTW3_LIBS SED\n" 411 " INCLUDEDIR\n"
378 " FFTW_LIBS SPECIAL_MATH_LIB\n" 412 "\n"
379 " FLIBS XTRA_CFLAGS\n" 413 " Octave configuration variables as above, but\n"
380 " FPICFLAG XTRA_CXXFLAGS\n" 414 " currently unused by mkoctfile.\n"
415 "\n"
416 " AR\n"
417 " DEPEND_EXTRA_SED_PATTERN\n"
418 " DEPEND_FLAGS\n"
419 " FFTW3F_LDFLAGS\n"
420 " FFTW3F_LIBS\n"
421 " FFTW3_LDFLAGS\n"
422 " FFTW3_LIBS\n"
423 " FFTW_LIBS\n"
424 " FLIBS\n"
425 " LIBS\n"
426 " RANLIB\n"
427 " READLINE_LIBS\n"
428 " SED\n"
429 "\n"
430 " Octave configuration variables that are provided\n"
431 " for informational purposes only. Except for\n"
432 " OCTAVE_HOME and OCTAVE_EXEC_HOME, users may not\n"
433 " override these variables.\n"
434 "\n"
435 " If OCTAVE_HOME or OCTAVE_EXEC_HOME are set in\n"
436 " the environment, then other variables are adjusted\n"
437 " accordingly with OCTAVE_HOME or OCTAVE_EXEC_HOME\n"
438 " substituted for the original value of the directory\n"
439 " specified by the --prefix or --exec-prefix options\n"
440 " that were used when Octave was configured.\n"
441 "\n"
442 " API_VERSION LOCALFCNFILEDIR\n"
443 " ARCHLIBDIR LOCALOCTFILEDIR\n"
444 " BINDIR LOCALSTARTUPFILEDIR\n"
445 " CANONICAL_HOST_TYPE LOCALVERARCHLIBDIR\n"
446 " DATADIR LOCALVERFCNFILEDIR\n"
447 " DATAROOTDIR LOCALVEROCTFILEDIR\n"
448 " DEFAULT_PAGER MAN1DIR\n"
449 " EXEC_PREFIX MAN1EXT\n"
450 " EXEEXT MANDIR\n"
451 " FCNFILEDIR OCTAVE_EXEC_HOME\n"
452 " IMAGEDIR OCTAVE_HOME\n"
453 " INFODIR OCTDATADIR\n"
454 " INFOFILE OCTDOCDIR\n"
455 " LIBEXECDIR OCTFILEDIR\n"
456 " LOCALAPIARCHLIBDIR OCTFONTSDIR\n"
457 " LOCALAPIFCNFILEDIR STARTUPFILEDIR\n"
458 " LOCALAPIOCTFILEDIR VERSION\n"
459 " LOCALARCHLIBDIR\n"
381 "\n" 460 "\n"
382 " --link-stand-alone Link a stand-alone executable file.\n" 461 " --link-stand-alone Link a stand-alone executable file.\n"
383 "\n" 462 "\n"
384 " --mex Assume we are creating a MEX file. Set the\n" 463 " --mex Assume we are creating a MEX file. Set the\n"
385 " default output extension to \".mex\".\n" 464 " default output extension to \".mex\".\n"