Mercurial > octave-nkf

comparison src/main-cli.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.h"
28 29
29 int 30 int
30 main (int argc, char **argv) 31 main (int argc, char **argv)
31 { 32 {
32 octave_process_command_line (argc, argv); 33 octave_process_command_line (argc, argv);
33 34
35 install_defaults ();
36
34 octave_initialize_interpreter (argc, argv, 0); 37 octave_initialize_interpreter (argc, argv, 0);
35 38
36 return octave_execute_interpreter (); 39 return octave_execute_interpreter ();
37 } 40 }