Mercurial > hg > mxe
view src/octave-2-fixes.patch @ 3125:484c88cf1ecf default tip
patch Octave's src/Makefile.in in the right direction...
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Fri, 04 Jan 2013 15:56:44 -0500 |
parents | 18b9e08886d1 |
children |
line wrap: on
line source
--- a/libinterp/octave.cc +++ b/libinterp/octave.cc @@ -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 2012-10-01 12:52:07.000000000 -0400 +++ b/src/Makefile.am 2013-01-04 14:38:19.879050447 -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/Makefile.in 2013-01-02 19:19:08.000000000 -0500 +++ b/src/Makefile.in 2013-01-04 15:50:45.019717585 -0500 @@ -1841,9 +1841,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 EXTRA_DIST = \ diff --git a/src/main-cli.cc b/src/main-cli.cc --- a/src/main-cli.cc +++ b/src/main-cli.cc @@ -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); diff --git a/src/main.cc b/src/main.cc --- a/src/main.cc +++ b/src/main.cc @@ -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 ())