Mercurial > octave

comparison libinterp/dldfcn/__init_gnuplot__.cc @ 21220:d78e45987d6a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rename octave::build_env namespace from octave::config * build-env-features.sh: Rename from ocgt-conf-features.sh. Update for new names. * build-env.h: Rename from oct-conf.h. Also declare features function. * build-env.in.cc: Rename from oct-conf.in.cc. * oct-conf-features.h: Delete. * libinterp/module.mk: Update. * toplev.cc, __init_gnuplot__.cc, octave.cc: Update for new names.
author John W. Eaton <jwe@octave.org>
date Sun, 07 Feb 2016 14:56:17 -0500
parents fcac5dbbf9ed
children 40de9f8f23a6
comparison
equal deleted inserted replaced
21219:ddf0a5f3a967 21220:d78e45987d6a
31 31
32 #ifdef HAVE_CONFIG_H 32 #ifdef HAVE_CONFIG_H
33 # include <config.h> 33 # include <config.h>
34 #endif 34 #endif
35 35
36 #include "build-env.h"
36 #include "builtins.h" 37 #include "builtins.h"
37 #include "defun-dld.h" 38 #include "defun-dld.h"
38 #include "error.h" 39 #include "error.h"
39 #include "file-stat.h" 40 #include "file-stat.h"
40 #include "graphics.h" 41 #include "graphics.h"
41 #include "oct-conf.h"
42 #include "oct-env.h" 42 #include "oct-env.h"
43 #include "parse.h" 43 #include "parse.h"
44 #include "utils.h" 44 #include "utils.h"
45 #include "variables.h" 45 #include "variables.h"
46 46
168 }; 168 };
169 169
170 static bool 170 static bool
171 have_gnuplot_binary (void) 171 have_gnuplot_binary (void)
172 { 172 {
173 const std::string exeext = octave::config::EXEEXT; 173 const std::string exeext = octave::build_env::EXEEXT;
174 const std::string path = octave_env::getenv ("PATH"); 174 const std::string path = octave_env::getenv ("PATH");
175 175
176 octave_value_list tmp = feval ("gnuplot_binary", octave_value_list ()); 176 octave_value_list tmp = feval ("gnuplot_binary", octave_value_list ());
177 std::string gnuplot_binary = tmp(0).string_value (); 177 std::string gnuplot_binary = tmp(0).string_value ();
178 178