Mercurial > hg > octave-nkf

comparison src/main.cc @ 15262:ad1a980b0cb5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
install default values before initializing interpreter (bug #37161) * octave.cc (octave_initialize_interpreter): Don't call install_defaults here. (octave_main): Call install_defaults here. * main.cc (main): Likewise. * main-cli.cc (main): Likewise. * src/Makefile.am (AM_CPPFLAGS): Include -I$(srcdir)/../libcruft/misc, -I$(srcdir)/../liboctave, and -I$(top_builddir)/libinterp/interpfcn in the list.
author John W. Eaton <jwe@octave.org>
date Thu, 30 Aug 2012 12:05:04 -0400
parents a44e4a08fc55
children 9ede91b3872b
comparison
equal deleted inserted replaced
15261:6be46886099f 15262:ad1a980b0cb5
22 22
23 #ifdef HAVE_CONFIG_H 23 #ifdef HAVE_CONFIG_H
24 #include <config.h> 24 #include <config.h>
25 #endif 25 #endif
26 26
27 #include <octave.h> 27 #include "defaults.h"
28 #include <octave-gui.h> 28 #include "octave.h"
29 #include "octave-gui.h"
29 30
30 int 31 int
31 main (int argc, char **argv) 32 main (int argc, char **argv)
32 { 33 {
33 int retval = 0; 34 int retval = 0;
34 35
35 octave_process_command_line (argc, argv); 36 octave_process_command_line (argc, argv);
37
38 install_defaults ();
36 39
37 if (octave_starting_gui ()) 40 if (octave_starting_gui ())
38 retval = octave_start_gui (argc, argv); 41 retval = octave_start_gui (argc, argv);
39 else 42 else
40 { 43 {