Mercurial > octave-nkf
changeset 15884:9ede91b3872b
do system-specific initialization before installing default variable values
* octave.cc (octave_main): Call sysdep_init before install_defaults.
* main.cc (main): Likewise.
* main-cli.cc (main): Likewise.
* src/Makefile.am (AM_CPPFLAGS): Add -I$(top_srcdir)/liboctave/system
and -I$(top_srcdir)/libinterp/interpfcn to the list.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 03 Jan 2013 03:05:16 -0500 |
| parents | fefd7c4a1309 |
| children | 942d3b0a034e |
| files | libinterp/octave.cc src/Makefile.am src/main-cli.cc src/main.cc |
| diffstat | 4 files changed, 10 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/octave.cc Thu Jan 03 01:59:08 2013 -0500 +++ b/libinterp/octave.cc Thu Jan 03 03:05:16 2013 -0500 @@ -656,6 +656,8 @@ { octave_process_command_line (argc, argv); + sysdep_init (); + install_defaults (); octave_initialize_interpreter (argc, argv, embedded); @@ -861,8 +863,6 @@ init_signals (); - sysdep_init (); - octave_ieee_init (); // The idea here is to force xerbla to be referenced so that we will
--- a/src/Makefile.am Thu Jan 03 01:59:08 2013 -0500 +++ b/src/Makefile.am Thu Jan 03 03:05:16 2013 -0500 @@ -25,9 +25,10 @@ -I$(top_srcdir)/liboctave/array \ -I$(top_srcdir)/liboctave/cruft/misc \ -I$(top_srcdir)/liboctave/numeric \ + -I$(top_srcdir)/liboctave/system \ -I$(top_srcdir)/liboctave/util \ -I$(top_srcdir)/libinterp \ - -I$(top_builddir)/libinterp/interpfcn \ + -I$(top_builddir)/libinterp/interpfcn -I$(top_srcdir)/libinterp/interpfcn \ -I$(top_builddir)/libgnu -I$(top_srcdir)/libgnu AM_CFLAGS += $(WARN_CFLAGS)
--- a/src/main-cli.cc Thu Jan 03 01:59:08 2013 -0500 +++ b/src/main-cli.cc Thu Jan 03 03:05:16 2013 -0500 @@ -26,12 +26,15 @@ #include "defaults.h" #include "octave.h" +#include "sysdep.h" int main (int argc, char **argv) { octave_process_command_line (argc, argv); + sysdep_init (); + install_defaults (); octave_initialize_interpreter (argc, argv, 0);
--- a/src/main.cc Thu Jan 03 01:59:08 2013 -0500 +++ b/src/main.cc Thu Jan 03 03:05:16 2013 -0500 @@ -27,6 +27,7 @@ #include "defaults.h" #include "octave.h" #include "octave-gui.h" +#include "sysdep.h" int main (int argc, char **argv) @@ -35,6 +36,8 @@ octave_process_command_line (argc, argv); + sysdep_init (); + install_defaults (); if (octave_starting_gui ())