Mercurial > octave
comparison libinterp/corefcn/toplev.cc @ 21220:d78e45987d6a
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 | a55b8ece1ecd |
comparison
equal
deleted
inserted
replaced
21219:ddf0a5f3a967 | 21220:d78e45987d6a |
---|---|
48 #include "oct-locbuf.h" | 48 #include "oct-locbuf.h" |
49 #include "quit.h" | 49 #include "quit.h" |
50 #include "singleton-cleanup.h" | 50 #include "singleton-cleanup.h" |
51 #include "str-vec.h" | 51 #include "str-vec.h" |
52 | 52 |
53 #include "build-env.h" | |
53 #include "defaults.h" | 54 #include "defaults.h" |
54 #include "defun.h" | 55 #include "defun.h" |
55 #include "error.h" | 56 #include "error.h" |
56 #include "file-io.h" | 57 #include "file-io.h" |
57 #include "graphics.h" | 58 #include "graphics.h" |
58 #include "input.h" | 59 #include "input.h" |
59 #include "lex.h" | 60 #include "lex.h" |
60 #include "load-save.h" | 61 #include "load-save.h" |
61 #include "octave-link.h" | 62 #include "octave-link.h" |
62 #include "oct-conf.h" | |
63 #include "oct-conf-features.h" | |
64 #include "oct-hist.h" | 63 #include "oct-hist.h" |
65 #include "oct-map.h" | 64 #include "oct-map.h" |
66 #include "ovl.h" | 65 #include "ovl.h" |
67 #include "ov.h" | 66 #include "ov.h" |
68 #include "pager.h" | 67 #include "pager.h" |
1259 const char *val; | 1258 const char *val; |
1260 }; | 1259 }; |
1261 | 1260 |
1262 static const conf_info_struct conf_info[] = | 1261 static const conf_info_struct conf_info[] = |
1263 { | 1262 { |
1264 { false, "ALL_CFLAGS", octave::config::ALL_CFLAGS }, | 1263 { false, "ALL_CFLAGS", octave::build_env::ALL_CFLAGS }, |
1265 { false, "ALL_CXXFLAGS", octave::config::ALL_CXXFLAGS }, | 1264 { false, "ALL_CXXFLAGS", octave::build_env::ALL_CXXFLAGS }, |
1266 { false, "ALL_FFLAGS", octave::config::ALL_FFLAGS }, | 1265 { false, "ALL_FFLAGS", octave::build_env::ALL_FFLAGS }, |
1267 { false, "ALL_LDFLAGS", octave::config::ALL_LDFLAGS }, | 1266 { false, "ALL_LDFLAGS", octave::build_env::ALL_LDFLAGS }, |
1268 { false, "AMD_CPPFLAGS", octave::config::AMD_CPPFLAGS }, | 1267 { false, "AMD_CPPFLAGS", octave::build_env::AMD_CPPFLAGS }, |
1269 { false, "AMD_LDFLAGS", octave::config::AMD_LDFLAGS }, | 1268 { false, "AMD_LDFLAGS", octave::build_env::AMD_LDFLAGS }, |
1270 { false, "AMD_LIBS", octave::config::AMD_LIBS }, | 1269 { false, "AMD_LIBS", octave::build_env::AMD_LIBS }, |
1271 { false, "AR", octave::config::AR }, | 1270 { false, "AR", octave::build_env::AR }, |
1272 { false, "ARFLAGS", octave::config::ARFLAGS }, | 1271 { false, "ARFLAGS", octave::build_env::ARFLAGS }, |
1273 { false, "ARPACK_CPPFLAGS", octave::config::ARPACK_CPPFLAGS }, | 1272 { false, "ARPACK_CPPFLAGS", octave::build_env::ARPACK_CPPFLAGS }, |
1274 { false, "ARPACK_LDFLAGS", octave::config::ARPACK_LDFLAGS }, | 1273 { false, "ARPACK_LDFLAGS", octave::build_env::ARPACK_LDFLAGS }, |
1275 { false, "ARPACK_LIBS", octave::config::ARPACK_LIBS }, | 1274 { false, "ARPACK_LIBS", octave::build_env::ARPACK_LIBS }, |
1276 { false, "BLAS_LIBS", octave::config::BLAS_LIBS }, | 1275 { false, "BLAS_LIBS", octave::build_env::BLAS_LIBS }, |
1277 { false, "CAMD_CPPFLAGS", octave::config::CAMD_CPPFLAGS }, | 1276 { false, "CAMD_CPPFLAGS", octave::build_env::CAMD_CPPFLAGS }, |
1278 { false, "CAMD_LDFLAGS", octave::config::CAMD_LDFLAGS }, | 1277 { false, "CAMD_LDFLAGS", octave::build_env::CAMD_LDFLAGS }, |
1279 { false, "CAMD_LIBS", octave::config::CAMD_LIBS }, | 1278 { false, "CAMD_LIBS", octave::build_env::CAMD_LIBS }, |
1280 { false, "CARBON_LIBS", octave::config::CARBON_LIBS }, | 1279 { false, "CARBON_LIBS", octave::build_env::CARBON_LIBS }, |
1281 { false, "CC", octave::config::CC }, | 1280 { false, "CC", octave::build_env::CC }, |
1282 { false, "CCOLAMD_CPPFLAGS", octave::config::CCOLAMD_CPPFLAGS }, | 1281 { false, "CCOLAMD_CPPFLAGS", octave::build_env::CCOLAMD_CPPFLAGS }, |
1283 { false, "CCOLAMD_LDFLAGS", octave::config::CCOLAMD_LDFLAGS }, | 1282 { false, "CCOLAMD_LDFLAGS", octave::build_env::CCOLAMD_LDFLAGS }, |
1284 { false, "CCOLAMD_LIBS", octave::config::CCOLAMD_LIBS }, | 1283 { false, "CCOLAMD_LIBS", octave::build_env::CCOLAMD_LIBS }, |
1285 { false, "CFLAGS", octave::config::CFLAGS }, | 1284 { false, "CFLAGS", octave::build_env::CFLAGS }, |
1286 { false, "CHOLMOD_CPPFLAGS", octave::config::CHOLMOD_CPPFLAGS }, | 1285 { false, "CHOLMOD_CPPFLAGS", octave::build_env::CHOLMOD_CPPFLAGS }, |
1287 { false, "CHOLMOD_LDFLAGS", octave::config::CHOLMOD_LDFLAGS }, | 1286 { false, "CHOLMOD_LDFLAGS", octave::build_env::CHOLMOD_LDFLAGS }, |
1288 { false, "CHOLMOD_LIBS", octave::config::CHOLMOD_LIBS }, | 1287 { false, "CHOLMOD_LIBS", octave::build_env::CHOLMOD_LIBS }, |
1289 { false, "COLAMD_CPPFLAGS", octave::config::COLAMD_CPPFLAGS }, | 1288 { false, "COLAMD_CPPFLAGS", octave::build_env::COLAMD_CPPFLAGS }, |
1290 { false, "COLAMD_LDFLAGS", octave::config::COLAMD_LDFLAGS }, | 1289 { false, "COLAMD_LDFLAGS", octave::build_env::COLAMD_LDFLAGS }, |
1291 { false, "COLAMD_LIBS", octave::config::COLAMD_LIBS }, | 1290 { false, "COLAMD_LIBS", octave::build_env::COLAMD_LIBS }, |
1292 { false, "CPICFLAG", octave::config::CPICFLAG }, | 1291 { false, "CPICFLAG", octave::build_env::CPICFLAG }, |
1293 { false, "CPPFLAGS", octave::config::CPPFLAGS }, | 1292 { false, "CPPFLAGS", octave::build_env::CPPFLAGS }, |
1294 { false, "CURL_CPPFLAGS", octave::config::CURL_CPPFLAGS }, | 1293 { false, "CURL_CPPFLAGS", octave::build_env::CURL_CPPFLAGS }, |
1295 { false, "CURL_LDFLAGS", octave::config::CURL_LDFLAGS }, | 1294 { false, "CURL_LDFLAGS", octave::build_env::CURL_LDFLAGS }, |
1296 { false, "CURL_LIBS", octave::config::CURL_LIBS }, | 1295 { false, "CURL_LIBS", octave::build_env::CURL_LIBS }, |
1297 { false, "CXSPARSE_CPPFLAGS", octave::config::CXSPARSE_CPPFLAGS }, | 1296 { false, "CXSPARSE_CPPFLAGS", octave::build_env::CXSPARSE_CPPFLAGS }, |
1298 { false, "CXSPARSE_LDFLAGS", octave::config::CXSPARSE_LDFLAGS }, | 1297 { false, "CXSPARSE_LDFLAGS", octave::build_env::CXSPARSE_LDFLAGS }, |
1299 { false, "CXSPARSE_LIBS", octave::config::CXSPARSE_LIBS }, | 1298 { false, "CXSPARSE_LIBS", octave::build_env::CXSPARSE_LIBS }, |
1300 { false, "CXX", octave::config::CXX }, | 1299 { false, "CXX", octave::build_env::CXX }, |
1301 { false, "CXXCPP", octave::config::CXXCPP }, | 1300 { false, "CXXCPP", octave::build_env::CXXCPP }, |
1302 { false, "CXXFLAGS", octave::config::CXXFLAGS }, | 1301 { false, "CXXFLAGS", octave::build_env::CXXFLAGS }, |
1303 { false, "CXXPICFLAG", octave::config::CXXPICFLAG }, | 1302 { false, "CXXPICFLAG", octave::build_env::CXXPICFLAG }, |
1304 { false, "DEFAULT_PAGER", OCTAVE_DEFAULT_PAGER }, | 1303 { false, "DEFAULT_PAGER", OCTAVE_DEFAULT_PAGER }, |
1305 { false, "DEFS", octave::config::DEFS }, | 1304 { false, "DEFS", octave::build_env::DEFS }, |
1306 { false, "DL_LD", octave::config::DL_LD }, | 1305 { false, "DL_LD", octave::build_env::DL_LD }, |
1307 { false, "DL_LDFLAGS", octave::config::DL_LDFLAGS }, | 1306 { false, "DL_LDFLAGS", octave::build_env::DL_LDFLAGS }, |
1308 { false, "DL_LIBS", octave::config::DL_LIBS }, | 1307 { false, "DL_LIBS", octave::build_env::DL_LIBS }, |
1309 { false, "GCC_VERSION", octave::config::GCC_VERSION }, | 1308 { false, "GCC_VERSION", octave::build_env::GCC_VERSION }, |
1310 { false, "GXX_VERSION", octave::config::GXX_VERSION }, | 1309 { false, "GXX_VERSION", octave::build_env::GXX_VERSION }, |
1311 { false, "EXEEXT", octave::config::EXEEXT }, | 1310 { false, "EXEEXT", octave::build_env::EXEEXT }, |
1312 { false, "F77", octave::config::F77 }, | 1311 { false, "F77", octave::build_env::F77 }, |
1313 { false, "F77_FLOAT_STORE_FLAG", octave::config::F77_FLOAT_STORE_FLAG }, | 1312 { false, "F77_FLOAT_STORE_FLAG", octave::build_env::F77_FLOAT_STORE_FLAG }, |
1314 { false, "F77_INTEGER_8_FLAG", octave::config::F77_INTEGER_8_FLAG }, | 1313 { false, "F77_INTEGER_8_FLAG", octave::build_env::F77_INTEGER_8_FLAG }, |
1315 { false, "FFLAGS", octave::config::FFLAGS }, | 1314 { false, "FFLAGS", octave::build_env::FFLAGS }, |
1316 { false, "FFTW3_CPPFLAGS", octave::config::FFTW3_CPPFLAGS }, | 1315 { false, "FFTW3_CPPFLAGS", octave::build_env::FFTW3_CPPFLAGS }, |
1317 { false, "FFTW3_LDFLAGS", octave::config::FFTW3_LDFLAGS }, | 1316 { false, "FFTW3_LDFLAGS", octave::build_env::FFTW3_LDFLAGS }, |
1318 { false, "FFTW3_LIBS", octave::config::FFTW3_LIBS }, | 1317 { false, "FFTW3_LIBS", octave::build_env::FFTW3_LIBS }, |
1319 { false, "FFTW3F_CPPFLAGS", octave::config::FFTW3F_CPPFLAGS }, | 1318 { false, "FFTW3F_CPPFLAGS", octave::build_env::FFTW3F_CPPFLAGS }, |
1320 { false, "FFTW3F_LDFLAGS", octave::config::FFTW3F_LDFLAGS }, | 1319 { false, "FFTW3F_LDFLAGS", octave::build_env::FFTW3F_LDFLAGS }, |
1321 { false, "FFTW3F_LIBS", octave::config::FFTW3F_LIBS }, | 1320 { false, "FFTW3F_LIBS", octave::build_env::FFTW3F_LIBS }, |
1322 { false, "FLIBS", octave::config::FLIBS }, | 1321 { false, "FLIBS", octave::build_env::FLIBS }, |
1323 { false, "FLTK_CPPFLAGS", octave::config::FLTK_CPPFLAGS }, | 1322 { false, "FLTK_CPPFLAGS", octave::build_env::FLTK_CPPFLAGS }, |
1324 { false, "FLTK_LDFLAGS", octave::config::FLTK_LDFLAGS }, | 1323 { false, "FLTK_LDFLAGS", octave::build_env::FLTK_LDFLAGS }, |
1325 { false, "FLTK_LIBS", octave::config::FLTK_LIBS }, | 1324 { false, "FLTK_LIBS", octave::build_env::FLTK_LIBS }, |
1326 { false, "FONTCONFIG_CPPFLAGS", octave::config::FONTCONFIG_CPPFLAGS }, | 1325 { false, "FONTCONFIG_CPPFLAGS", octave::build_env::FONTCONFIG_CPPFLAGS }, |
1327 { false, "FONTCONFIG_LIBS", octave::config::FONTCONFIG_LIBS }, | 1326 { false, "FONTCONFIG_LIBS", octave::build_env::FONTCONFIG_LIBS }, |
1328 { false, "FPICFLAG", octave::config::FPICFLAG }, | 1327 { false, "FPICFLAG", octave::build_env::FPICFLAG }, |
1329 { false, "FT2_CPPFLAGS", octave::config::FT2_CPPFLAGS }, | 1328 { false, "FT2_CPPFLAGS", octave::build_env::FT2_CPPFLAGS }, |
1330 { false, "FT2_LIBS", octave::config::FT2_LIBS }, | 1329 { false, "FT2_LIBS", octave::build_env::FT2_LIBS }, |
1331 { false, "GLPK_CPPFLAGS", octave::config::GLPK_CPPFLAGS }, | 1330 { false, "GLPK_CPPFLAGS", octave::build_env::GLPK_CPPFLAGS }, |
1332 { false, "GLPK_LDFLAGS", octave::config::GLPK_LDFLAGS }, | 1331 { false, "GLPK_LDFLAGS", octave::build_env::GLPK_LDFLAGS }, |
1333 { false, "GLPK_LIBS", octave::config::GLPK_LIBS }, | 1332 { false, "GLPK_LIBS", octave::build_env::GLPK_LIBS }, |
1334 { false, "GNUPLOT", octave::config::GNUPLOT }, | 1333 { false, "GNUPLOT", octave::build_env::GNUPLOT }, |
1335 { false, "HDF5_CPPFLAGS", octave::config::HDF5_CPPFLAGS }, | 1334 { false, "HDF5_CPPFLAGS", octave::build_env::HDF5_CPPFLAGS }, |
1336 { false, "HDF5_LDFLAGS", octave::config::HDF5_LDFLAGS }, | 1335 { false, "HDF5_LDFLAGS", octave::build_env::HDF5_LDFLAGS }, |
1337 { false, "HDF5_LIBS", octave::config::HDF5_LIBS }, | 1336 { false, "HDF5_LIBS", octave::build_env::HDF5_LIBS }, |
1338 { false, "LAPACK_LIBS", octave::config::LAPACK_LIBS }, | 1337 { false, "LAPACK_LIBS", octave::build_env::LAPACK_LIBS }, |
1339 { false, "LDFLAGS", octave::config::LDFLAGS }, | 1338 { false, "LDFLAGS", octave::build_env::LDFLAGS }, |
1340 { false, "LD_CXX", octave::config::LD_CXX }, | 1339 { false, "LD_CXX", octave::build_env::LD_CXX }, |
1341 { false, "LD_STATIC_FLAG", octave::config::LD_STATIC_FLAG }, | 1340 { false, "LD_STATIC_FLAG", octave::build_env::LD_STATIC_FLAG }, |
1342 { false, "LEX", octave::config::LEX }, | 1341 { false, "LEX", octave::build_env::LEX }, |
1343 { false, "LEXLIB", octave::config::LEXLIB }, | 1342 { false, "LEXLIB", octave::build_env::LEXLIB }, |
1344 { false, "LFLAGS", octave::config::LFLAGS }, | 1343 { false, "LFLAGS", octave::build_env::LFLAGS }, |
1345 { false, "LIBEXT", octave::config::LIBEXT }, | 1344 { false, "LIBEXT", octave::build_env::LIBEXT }, |
1346 { false, "LIBFLAGS", octave::config::LIBFLAGS }, | 1345 { false, "LIBFLAGS", octave::build_env::LIBFLAGS }, |
1347 { false, "LIBOCTAVE", octave::config::LIBOCTAVE }, | 1346 { false, "LIBOCTAVE", octave::build_env::LIBOCTAVE }, |
1348 { false, "LIBOCTINTERP", octave::config::LIBOCTINTERP }, | 1347 { false, "LIBOCTINTERP", octave::build_env::LIBOCTINTERP }, |
1349 { false, "LIBS", octave::config::LIBS }, | 1348 { false, "LIBS", octave::build_env::LIBS }, |
1350 { false, "LLVM_CPPFLAGS", octave::config::LLVM_CPPFLAGS }, | 1349 { false, "LLVM_CPPFLAGS", octave::build_env::LLVM_CPPFLAGS }, |
1351 { false, "LLVM_LDFLAGS", octave::config::LLVM_LDFLAGS }, | 1350 { false, "LLVM_LDFLAGS", octave::build_env::LLVM_LDFLAGS }, |
1352 { false, "LLVM_LIBS", octave::config::LLVM_LIBS }, | 1351 { false, "LLVM_LIBS", octave::build_env::LLVM_LIBS }, |
1353 { false, "LN_S", octave::config::LN_S }, | 1352 { false, "LN_S", octave::build_env::LN_S }, |
1354 { false, "MAGICK_CPPFLAGS", octave::config::MAGICK_CPPFLAGS }, | 1353 { false, "MAGICK_CPPFLAGS", octave::build_env::MAGICK_CPPFLAGS }, |
1355 { false, "MAGICK_LDFLAGS", octave::config::MAGICK_LDFLAGS }, | 1354 { false, "MAGICK_LDFLAGS", octave::build_env::MAGICK_LDFLAGS }, |
1356 { false, "MAGICK_LIBS", octave::config::MAGICK_LIBS }, | 1355 { false, "MAGICK_LIBS", octave::build_env::MAGICK_LIBS }, |
1357 { false, "MKOCTFILE_DL_LDFLAGS", octave::config::MKOCTFILE_DL_LDFLAGS }, | 1356 { false, "MKOCTFILE_DL_LDFLAGS", octave::build_env::MKOCTFILE_DL_LDFLAGS }, |
1358 { false, "OCTAVE_LINK_DEPS", octave::config::OCTAVE_LINK_DEPS }, | 1357 { false, "OCTAVE_LINK_DEPS", octave::build_env::OCTAVE_LINK_DEPS }, |
1359 { false, "OCTAVE_LINK_OPTS", octave::config::OCTAVE_LINK_OPTS }, | 1358 { false, "OCTAVE_LINK_OPTS", octave::build_env::OCTAVE_LINK_OPTS }, |
1360 { false, "OCT_LINK_DEPS", octave::config::OCT_LINK_DEPS }, | 1359 { false, "OCT_LINK_DEPS", octave::build_env::OCT_LINK_DEPS }, |
1361 { false, "OCT_LINK_OPTS", octave::config::OCT_LINK_OPTS }, | 1360 { false, "OCT_LINK_OPTS", octave::build_env::OCT_LINK_OPTS }, |
1362 { false, "OPENGL_LIBS", octave::config::OPENGL_LIBS }, | 1361 { false, "OPENGL_LIBS", octave::build_env::OPENGL_LIBS }, |
1363 { false, "OSMESA_CPPFLAGS", octave::config::OSMESA_CPPFLAGS }, | 1362 { false, "OSMESA_CPPFLAGS", octave::build_env::OSMESA_CPPFLAGS }, |
1364 { false, "OSMESA_LDFLAGS", octave::config::OSMESA_LDFLAGS }, | 1363 { false, "OSMESA_LDFLAGS", octave::build_env::OSMESA_LDFLAGS }, |
1365 { false, "OSMESA_LIBS", octave::config::OSMESA_LIBS }, | 1364 { false, "OSMESA_LIBS", octave::build_env::OSMESA_LIBS }, |
1366 { false, "PCRE_CPPFLAGS", octave::config::PCRE_CPPFLAGS }, | 1365 { false, "PCRE_CPPFLAGS", octave::build_env::PCRE_CPPFLAGS }, |
1367 { false, "PCRE_LIBS", octave::config::PCRE_LIBS }, | 1366 { false, "PCRE_LIBS", octave::build_env::PCRE_LIBS }, |
1368 { false, "PTHREAD_CFLAGS", octave::config::PTHREAD_CFLAGS }, | 1367 { false, "PTHREAD_CFLAGS", octave::build_env::PTHREAD_CFLAGS }, |
1369 { false, "PTHREAD_LIBS", octave::config::PTHREAD_LIBS }, | 1368 { false, "PTHREAD_LIBS", octave::build_env::PTHREAD_LIBS }, |
1370 { false, "QHULL_CPPFLAGS", octave::config::QHULL_CPPFLAGS }, | 1369 { false, "QHULL_CPPFLAGS", octave::build_env::QHULL_CPPFLAGS }, |
1371 { false, "QHULL_LDFLAGS", octave::config::QHULL_LDFLAGS }, | 1370 { false, "QHULL_LDFLAGS", octave::build_env::QHULL_LDFLAGS }, |
1372 { false, "QHULL_LIBS", octave::config::QHULL_LIBS }, | 1371 { false, "QHULL_LIBS", octave::build_env::QHULL_LIBS }, |
1373 { false, "QRUPDATE_CPPFLAGS", octave::config::QRUPDATE_CPPFLAGS }, | 1372 { false, "QRUPDATE_CPPFLAGS", octave::build_env::QRUPDATE_CPPFLAGS }, |
1374 { false, "QRUPDATE_LDFLAGS", octave::config::QRUPDATE_LDFLAGS }, | 1373 { false, "QRUPDATE_LDFLAGS", octave::build_env::QRUPDATE_LDFLAGS }, |
1375 { false, "QRUPDATE_LIBS", octave::config::QRUPDATE_LIBS }, | 1374 { false, "QRUPDATE_LIBS", octave::build_env::QRUPDATE_LIBS }, |
1376 { false, "QT_CPPFLAGS", octave::config::QT_CPPFLAGS }, | 1375 { false, "QT_CPPFLAGS", octave::build_env::QT_CPPFLAGS }, |
1377 { false, "QT_LDFLAGS", octave::config::QT_LDFLAGS }, | 1376 { false, "QT_LDFLAGS", octave::build_env::QT_LDFLAGS }, |
1378 { false, "QT_LIBS", octave::config::QT_LIBS }, | 1377 { false, "QT_LIBS", octave::build_env::QT_LIBS }, |
1379 { false, "RANLIB", octave::config::RANLIB }, | 1378 { false, "RANLIB", octave::build_env::RANLIB }, |
1380 { false, "RDYNAMIC_FLAG", octave::config::RDYNAMIC_FLAG }, | 1379 { false, "RDYNAMIC_FLAG", octave::build_env::RDYNAMIC_FLAG }, |
1381 { false, "READLINE_LIBS", octave::config::READLINE_LIBS }, | 1380 { false, "READLINE_LIBS", octave::build_env::READLINE_LIBS }, |
1382 { false, "SED", octave::config::SED }, | 1381 { false, "SED", octave::build_env::SED }, |
1383 { false, "SHARED_LIBS", octave::config::SHARED_LIBS }, | 1382 { false, "SHARED_LIBS", octave::build_env::SHARED_LIBS }, |
1384 { false, "SHLEXT", octave::config::SHLEXT }, | 1383 { false, "SHLEXT", octave::build_env::SHLEXT }, |
1385 { false, "SHLEXT_VER", octave::config::SHLEXT_VER }, | 1384 { false, "SHLEXT_VER", octave::build_env::SHLEXT_VER }, |
1386 { false, "SH_LD", octave::config::SH_LD }, | 1385 { false, "SH_LD", octave::build_env::SH_LD }, |
1387 { false, "SH_LDFLAGS", octave::config::SH_LDFLAGS }, | 1386 { false, "SH_LDFLAGS", octave::build_env::SH_LDFLAGS }, |
1388 { false, "SONAME_FLAGS", octave::config::SONAME_FLAGS }, | 1387 { false, "SONAME_FLAGS", octave::build_env::SONAME_FLAGS }, |
1389 { false, "STATIC_LIBS", octave::config::STATIC_LIBS }, | 1388 { false, "STATIC_LIBS", octave::build_env::STATIC_LIBS }, |
1390 { false, "TERM_LIBS", octave::config::TERM_LIBS }, | 1389 { false, "TERM_LIBS", octave::build_env::TERM_LIBS }, |
1391 { false, "UMFPACK_CPPFLAGS", octave::config::UMFPACK_CPPFLAGS }, | 1390 { false, "UMFPACK_CPPFLAGS", octave::build_env::UMFPACK_CPPFLAGS }, |
1392 { false, "UMFPACK_LDFLAGS", octave::config::UMFPACK_LDFLAGS }, | 1391 { false, "UMFPACK_LDFLAGS", octave::build_env::UMFPACK_LDFLAGS }, |
1393 { false, "UMFPACK_LIBS", octave::config::UMFPACK_LIBS }, | 1392 { false, "UMFPACK_LIBS", octave::build_env::UMFPACK_LIBS }, |
1394 { false, "WARN_CFLAGS", octave::config::WARN_CFLAGS }, | 1393 { false, "WARN_CFLAGS", octave::build_env::WARN_CFLAGS }, |
1395 { false, "WARN_CXXFLAGS", octave::config::WARN_CXXFLAGS }, | 1394 { false, "WARN_CXXFLAGS", octave::build_env::WARN_CXXFLAGS }, |
1396 { false, "X11_INCFLAGS", octave::config::X11_INCFLAGS }, | 1395 { false, "X11_INCFLAGS", octave::build_env::X11_INCFLAGS }, |
1397 { false, "X11_LIBS", octave::config::X11_LIBS }, | 1396 { false, "X11_LIBS", octave::build_env::X11_LIBS }, |
1398 { false, "XTRA_CFLAGS", octave::config::XTRA_CFLAGS }, | 1397 { false, "XTRA_CFLAGS", octave::build_env::XTRA_CFLAGS }, |
1399 { false, "XTRA_CXXFLAGS", octave::config::XTRA_CXXFLAGS }, | 1398 { false, "XTRA_CXXFLAGS", octave::build_env::XTRA_CXXFLAGS }, |
1400 { false, "YACC", octave::config::YACC }, | 1399 { false, "YACC", octave::build_env::YACC }, |
1401 { false, "YFLAGS", octave::config::YFLAGS }, | 1400 { false, "YFLAGS", octave::build_env::YFLAGS }, |
1402 { false, "Z_CPPFLAGS", octave::config::Z_CPPFLAGS }, | 1401 { false, "Z_CPPFLAGS", octave::build_env::Z_CPPFLAGS }, |
1403 { false, "Z_LDFLAGS", octave::config::Z_LDFLAGS }, | 1402 { false, "Z_LDFLAGS", octave::build_env::Z_LDFLAGS }, |
1404 { false, "Z_LIBS", octave::config::Z_LIBS }, | 1403 { false, "Z_LIBS", octave::build_env::Z_LIBS }, |
1405 { false, "api_version", OCTAVE_API_VERSION }, | 1404 { false, "api_version", OCTAVE_API_VERSION }, |
1406 { true, "archlibdir", OCTAVE_ARCHLIBDIR }, | 1405 { true, "archlibdir", OCTAVE_ARCHLIBDIR }, |
1407 { true, "bindir", OCTAVE_BINDIR }, | 1406 { true, "bindir", OCTAVE_BINDIR }, |
1408 { false, "canonical_host_type", OCTAVE_CANONICAL_HOST_TYPE }, | 1407 { false, "canonical_host_type", OCTAVE_CANONICAL_HOST_TYPE }, |
1409 { false, "config_opts", octave::config::config_opts }, | 1408 { false, "config_opts", octave::build_env::config_opts }, |
1410 { true, "datadir", OCTAVE_DATADIR }, | 1409 { true, "datadir", OCTAVE_DATADIR }, |
1411 { true, "datarootdir", OCTAVE_DATAROOTDIR }, | 1410 { true, "datarootdir", OCTAVE_DATAROOTDIR }, |
1412 { true, "exec_prefix", OCTAVE_EXEC_PREFIX }, | 1411 { true, "exec_prefix", OCTAVE_EXEC_PREFIX }, |
1413 { true, "fcnfiledir", OCTAVE_FCNFILEDIR }, | 1412 { true, "fcnfiledir", OCTAVE_FCNFILEDIR }, |
1414 { true, "imagedir", OCTAVE_IMAGEDIR }, | 1413 { true, "imagedir", OCTAVE_IMAGEDIR }, |
1454 octave_value (oct_mach_info::words_big_endian ())); | 1453 octave_value (oct_mach_info::words_big_endian ())); |
1455 | 1454 |
1456 m.assign ("words_little_endian", | 1455 m.assign ("words_little_endian", |
1457 octave_value (oct_mach_info::words_little_endian ())); | 1456 octave_value (oct_mach_info::words_little_endian ())); |
1458 | 1457 |
1459 m.assign ("features", octave_value (octave::config::features ())); | 1458 m.assign ("features", octave_value (octave::build_env::features ())); |
1460 | 1459 |
1461 int i = 0; | 1460 int i = 0; |
1462 | 1461 |
1463 while (true) | 1462 while (true) |
1464 { | 1463 { |