# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1454874977 18000
# Node ID d78e45987d6a6783d8cd82f599bb3c3552cbda2f
# Parent  ddf0a5f3a967705f8b6168a94789dc0a1a2e086b
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.

diff -r ddf0a5f3a967 -r d78e45987d6a libinterp/build-env-features.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libinterp/build-env-features.sh	Sun Feb 07 14:56:17 2016 -0500
@@ -0,0 +1,57 @@
+#! /bin/sh
+
+## Attempt to get traditional sort behavior based on byte values.
+LC_ALL="C"
+export LC_ALL
+
+set -e
+AWK=${AWK:-awk}
+
+conffile=$1
+
+cat << EOF
+// DO NOT EDIT!  Generated automatically from $conffile by Make."
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "build-env.h"
+#include "ov.h"
+
+namespace octave
+{
+  namespace build_env
+  {
+    octave_scalar_map
+    features (void)
+    {
+      static bool initialized = false;
+
+      static octave_scalar_map m;
+
+      if (! initialized)
+        {
+EOF
+
+$AWK \
+  '/#define (HAVE|ENABLE)_/ {
+     sub (/HAVE_/, "", $2);
+     printf ("          m.assign (\"%s\", octave_value (true));\n", $2);
+   }
+   /\/\* #undef (HAVE|ENABLE)_/ {
+     sub (/HAVE_/, "", $3);
+     printf ("          m.assign (\"%s\", octave_value (false));\n", $3);
+   } {
+   }' $conffile | sort
+
+cat << EOF
+
+          initialized = true;
+        }
+
+      return m;
+    }
+  };
+};
+EOF
diff -r ddf0a5f3a967 -r d78e45987d6a libinterp/build-env.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libinterp/build-env.h	Sun Feb 07 14:56:17 2016 -0500
@@ -0,0 +1,183 @@
+/*
+
+Copyright (C) 1996-2015 John W. Eaton
+
+This file is part of Octave.
+
+Octave is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 3 of the License, or (at your
+option) any later version.
+
+Octave is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Octave; see the file COPYING.  If not, see
+<http://www.gnu.org/licenses/>.
+
+*/
+
+#if ! defined (octave_build_env_h)
+#define octave_build_env_h 1
+
+#include "oct-map.h"
+
+namespace octave
+{
+  namespace build_env
+  {
+    extern OCTAVE_API octave_scalar_map features (void);
+
+    extern const char *ALL_CFLAGS;
+    extern const char *ALL_CXXFLAGS;
+    extern const char *ALL_FFLAGS;
+    extern const char *ALL_LDFLAGS;
+    extern const char *AMD_CPPFLAGS;
+    extern const char *AMD_LDFLAGS;
+    extern const char *AMD_LIBS;
+    extern const char *ARFLAGS;
+    extern const char *AR;
+    extern const char *ARPACK_CPPFLAGS;
+    extern const char *ARPACK_LDFLAGS;
+    extern const char *ARPACK_LIBS;
+    extern const char *BLAS_LIBS;
+    extern const char *CAMD_CPPFLAGS;
+    extern const char *CAMD_LDFLAGS;
+    extern const char *CAMD_LIBS;
+    extern const char *CARBON_LIBS;
+    extern const char *CC;
+    extern const char *CCOLAMD_CPPFLAGS;
+    extern const char *CCOLAMD_LDFLAGS;
+    extern const char *CCOLAMD_LIBS;
+    extern const char *CFLAGS;
+    extern const char *CHOLMOD_CPPFLAGS;
+    extern const char *CHOLMOD_LDFLAGS;
+    extern const char *CHOLMOD_LIBS;
+    extern const char *COLAMD_CPPFLAGS;
+    extern const char *COLAMD_LDFLAGS;
+    extern const char *COLAMD_LIBS;
+    extern const char *CPICFLAG;
+    extern const char *CPPFLAGS;
+    extern const char *CURL_CPPFLAGS;
+    extern const char *CURL_LDFLAGS;
+    extern const char *CURL_LIBS;
+    extern const char *CXSPARSE_CPPFLAGS;
+    extern const char *CXSPARSE_LDFLAGS;
+    extern const char *CXSPARSE_LIBS;
+    extern const char *CXXCPP;
+    extern const char *CXXFLAGS;
+    extern const char *CXXPICFLAG;
+    extern const char *CXX;
+    extern const char *DEFAULT_PAGER;
+    extern const char *DEFS;
+    extern const char *DL_LD;
+    extern const char *DL_LDFLAGS;
+    extern const char *DL_LIBS;
+    extern const char *EXEEXT;
+    extern const char *GCC_VERSION;
+    extern const char *GXX_VERSION;
+    extern const char *F77;
+    extern const char *F77_FLOAT_STORE_FLAG;
+    extern const char *F77_INTEGER_8_FLAG;
+    extern const char *FFLAGS;
+    extern const char *FFTW3_CPPFLAGS;
+    extern const char *FFTW3_LDFLAGS;
+    extern const char *FFTW3_LIBS;
+    extern const char *FFTW3F_CPPFLAGS;
+    extern const char *FFTW3F_LDFLAGS;
+    extern const char *FFTW3F_LIBS;
+    extern const char *FLIBS;
+    extern const char *FLTK_CPPFLAGS;
+    extern const char *FLTK_LDFLAGS;
+    extern const char *FLTK_LIBS;
+    extern const char *FONTCONFIG_CPPFLAGS;
+    extern const char *FONTCONFIG_LIBS;
+    extern const char *FPICFLAG;
+    extern const char *FT2_CPPFLAGS;
+    extern const char *FT2_LIBS;
+    extern const char *GLPK_CPPFLAGS;
+    extern const char *GLPK_LDFLAGS;
+    extern const char *GLPK_LIBS;
+    extern const char *GNUPLOT;
+    extern const char *HDF5_CPPFLAGS;
+    extern const char *HDF5_LDFLAGS;
+    extern const char *HDF5_LIBS;
+    extern const char *INCLUDEDIR;
+    extern const char *LAPACK_LIBS;
+    extern const char *LDFLAGS;
+    extern const char *LD_CXX;
+    extern const char *LD_STATIC_FLAG;
+    extern const char *LEXLIB;
+    extern const char *LEX;
+    extern const char *LFLAGS;
+    extern const char *LIBEXT;
+    extern const char *LIBFLAGS;
+    extern const char *LIBOCTAVE;
+    extern const char *LIBOCTINTERP;
+    extern const char *LIBS;
+    extern const char *LN_S;
+    extern const char *MAGICK_CPPFLAGS;
+    extern const char *MAGICK_LDFLAGS;
+    extern const char *MAGICK_LIBS;
+    extern const char *LLVM_CPPFLAGS;
+    extern const char *LLVM_LDFLAGS;
+    extern const char *LLVM_LIBS;
+    extern const char *MKOCTFILE_DL_LDFLAGS;
+    extern const char *OCTAVE_LINK_DEPS;
+    extern const char *OCTAVE_LINK_OPTS;
+    extern const char *OCTINCLUDEDIR;
+    extern const char *OCTLIBDIR;
+    extern const char *OCT_LINK_DEPS;
+    extern const char *OCT_LINK_OPTS;
+    extern const char *OPENGL_LIBS;
+    extern const char *OSMESA_CPPFLAGS;
+    extern const char *OSMESA_LDFLAGS;
+    extern const char *OSMESA_LIBS;
+    extern const char *PCRE_CPPFLAGS;
+    extern const char *PCRE_LIBS;
+    extern const char *PREFIX;
+    extern const char *PTHREAD_CFLAGS;
+    extern const char *PTHREAD_LIBS;
+    extern const char *QHULL_CPPFLAGS;
+    extern const char *QHULL_LDFLAGS;
+    extern const char *QHULL_LIBS;
+    extern const char *QRUPDATE_CPPFLAGS;
+    extern const char *QRUPDATE_LDFLAGS;
+    extern const char *QRUPDATE_LIBS;
+    extern const char *QT_CPPFLAGS;
+    extern const char *QT_LDFLAGS;
+    extern const char *QT_LIBS;
+    extern const char *RANLIB;
+    extern const char *RDYNAMIC_FLAG;
+    extern const char *READLINE_LIBS;
+    extern const char *SED;
+    extern const char *SHARED_LIBS;
+    extern const char *SHLEXT;
+    extern const char *SHLEXT_VER;
+    extern const char *SH_LD;
+    extern const char *SH_LDFLAGS;
+    extern const char *SONAME_FLAGS;
+    extern const char *STATIC_LIBS;
+    extern const char *TERM_LIBS;
+    extern const char *UMFPACK_CPPFLAGS;
+    extern const char *UMFPACK_LDFLAGS;
+    extern const char *UMFPACK_LIBS;
+    extern const char *WARN_CFLAGS;
+    extern const char *WARN_CXXFLAGS;
+    extern const char *X11_INCFLAGS;
+    extern const char *X11_LIBS;
+    extern const char *XTRA_CFLAGS;
+    extern const char *XTRA_CXXFLAGS;
+    extern const char *YACC;
+    extern const char *YFLAGS;
+    extern const char *Z_CPPFLAGS;
+    extern const char *Z_LDFLAGS;
+    extern const char *Z_LIBS;
+    extern const char *config_opts;
+  };
+};
+
+#endif
diff -r ddf0a5f3a967 -r d78e45987d6a libinterp/build-env.in.cc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libinterp/build-env.in.cc	Sun Feb 07 14:56:17 2016 -0500
@@ -0,0 +1,326 @@
+// %NO_EDIT_WARNING%
+/*
+
+Copyright (C) 1996-2015 John W. Eaton
+
+This file is part of Octave.
+
+Octave is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 3 of the License, or (at your
+option) any later version.
+
+Octave is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Octave; see the file COPYING.  If not, see
+<http://www.gnu.org/licenses/>.
+
+*/
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+#include "build-env.h"
+
+namespace octave
+{
+  namespace build_env
+  {
+    const char *ALL_CFLAGS = %OCTAVE_CONF_ALL_CFLAGS%;
+
+    const char *ALL_CXXFLAGS = %OCTAVE_CONF_ALL_CXXFLAGS%;
+
+    const char *ALL_FFLAGS = %OCTAVE_CONF_ALL_FFLAGS%;
+
+    const char *ALL_LDFLAGS = %OCTAVE_CONF_ALL_LDFLAGS%;
+
+    const char *AMD_CPPFLAGS = %OCTAVE_CONF_AMD_CPPFLAGS%;
+
+    const char *AMD_LDFLAGS = %OCTAVE_CONF_AMD_LDFLAGS%;
+
+    const char *AMD_LIBS = %OCTAVE_CONF_AMD_LIBS%;
+
+    const char *ARFLAGS = %OCTAVE_CONF_ARFLAGS%;
+
+    const char *AR = %OCTAVE_CONF_AR%;
+
+    const char *ARPACK_CPPFLAGS = %OCTAVE_CONF_ARPACK_CPPFLAGS%;
+
+    const char *ARPACK_LDFLAGS = %OCTAVE_CONF_ARPACK_LDFLAGS%;
+
+    const char *ARPACK_LIBS = %OCTAVE_CONF_ARPACK_LIBS%;
+
+    const char *BLAS_LIBS = %OCTAVE_CONF_BLAS_LIBS%;
+
+    const char *CAMD_CPPFLAGS = %OCTAVE_CONF_CAMD_CPPFLAGS%;
+
+    const char *CAMD_LDFLAGS = %OCTAVE_CONF_CAMD_LDFLAGS%;
+
+    const char *CAMD_LIBS = %OCTAVE_CONF_CAMD_LIBS%;
+
+    const char *CARBON_LIBS = %OCTAVE_CONF_CARBON_LIBS%;
+
+    const char *CC = %OCTAVE_CONF_CC%;
+
+    const char *CCOLAMD_CPPFLAGS = %OCTAVE_CONF_CCOLAMD_CPPFLAGS%;
+
+    const char *CCOLAMD_LDFLAGS = %OCTAVE_CONF_CCOLAMD_LDFLAGS%;
+
+    const char *CCOLAMD_LIBS = %OCTAVE_CONF_CCOLAMD_LIBS%;
+
+    const char *CFLAGS = %OCTAVE_CONF_CFLAGS%;
+
+    const char *CHOLMOD_CPPFLAGS = %OCTAVE_CONF_CHOLMOD_CPPFLAGS%;
+
+    const char *CHOLMOD_LDFLAGS = %OCTAVE_CONF_CHOLMOD_LDFLAGS%;
+
+    const char *CHOLMOD_LIBS = %OCTAVE_CONF_CHOLMOD_LIBS%;
+
+    const char *COLAMD_CPPFLAGS = %OCTAVE_CONF_COLAMD_CPPFLAGS%;
+
+    const char *COLAMD_LDFLAGS = %OCTAVE_CONF_COLAMD_LDFLAGS%;
+
+    const char *COLAMD_LIBS = %OCTAVE_CONF_COLAMD_LIBS%;
+
+    const char *CPICFLAG = %OCTAVE_CONF_CPICFLAG%;
+
+    const char *CPPFLAGS = %OCTAVE_CONF_CPPFLAGS%;
+
+    const char *CURL_CPPFLAGS = %OCTAVE_CONF_CURL_CPPFLAGS%;
+
+    const char *CURL_LDFLAGS = %OCTAVE_CONF_CURL_LDFLAGS%;
+
+    const char *CURL_LIBS = %OCTAVE_CONF_CURL_LIBS%;
+
+    const char *CXSPARSE_CPPFLAGS = %OCTAVE_CONF_CXSPARSE_CPPFLAGS%;
+
+    const char *CXSPARSE_LDFLAGS = %OCTAVE_CONF_CXSPARSE_LDFLAGS%;
+
+    const char *CXSPARSE_LIBS = %OCTAVE_CONF_CXSPARSE_LIBS%;
+
+    const char *CXXCPP = %OCTAVE_CONF_CXXCPP%;
+
+    const char *CXXFLAGS = %OCTAVE_CONF_CXXFLAGS%;
+
+    const char *CXXPICFLAG = %OCTAVE_CONF_CXXPICFLAG%;
+
+    const char *CXX = %OCTAVE_CONF_CXX%;
+
+    const char *DEFAULT_PAGER = %OCTAVE_CONF_DEFAULT_PAGER%;
+
+    const char *DEFS = %OCTAVE_CONF_DEFS%;
+
+    const char *DL_LD = %OCTAVE_CONF_DL_LD%;
+
+    const char *DL_LDFLAGS = %OCTAVE_CONF_DL_LDFLAGS%;
+
+    const char *DL_LIBS = %OCTAVE_CONF_DL_LIBS%;
+
+    const char *EXEEXT = %OCTAVE_CONF_EXEEXT%;
+
+    const char *GCC_VERSION = %OCTAVE_CONF_GCC_VERSION%;
+
+    const char *GXX_VERSION = %OCTAVE_CONF_GXX_VERSION%;
+
+    const char *F77 = %OCTAVE_CONF_F77%;
+
+    const char *F77_FLOAT_STORE_FLAG = %OCTAVE_CONF_F77_FLOAT_STORE_FLAG%;
+
+    const char *F77_INTEGER_8_FLAG = %OCTAVE_CONF_F77_INTEGER_8_FLAG%;
+
+    const char *FFLAGS = %OCTAVE_CONF_FFLAGS%;
+
+    const char *FFTW3_CPPFLAGS = %OCTAVE_CONF_FFTW3_CPPFLAGS%;
+
+    const char *FFTW3_LDFLAGS = %OCTAVE_CONF_FFTW3_LDFLAGS%;
+
+    const char *FFTW3_LIBS = %OCTAVE_CONF_FFTW3_LIBS%;
+
+    const char *FFTW3F_CPPFLAGS = %OCTAVE_CONF_FFTW3F_CPPFLAGS%;
+
+    const char *FFTW3F_LDFLAGS = %OCTAVE_CONF_FFTW3F_LDFLAGS%;
+
+    const char *FFTW3F_LIBS = %OCTAVE_CONF_FFTW3F_LIBS%;
+
+    const char *FLIBS = %OCTAVE_CONF_FLIBS%;
+
+    const char *FLTK_CPPFLAGS = %OCTAVE_CONF_FLTK_CPPFLAGS%;
+
+    const char *FLTK_LDFLAGS = %OCTAVE_CONF_FLTK_LDFLAGS%;
+
+    const char *FLTK_LIBS = %OCTAVE_CONF_FLTK_LIBS%;
+
+    const char *FONTCONFIG_CPPFLAGS = %OCTAVE_CONF_FONTCONFIG_CPPFLAGS%;
+
+    const char *FONTCONFIG_LIBS = %OCTAVE_CONF_FONTCONFIG_LIBS%;
+
+    const char *FPICFLAG = %OCTAVE_CONF_FPICFLAG%;
+
+    const char *FT2_CPPFLAGS = %OCTAVE_CONF_FT2_CPPFLAGS%;
+
+    const char *FT2_LIBS = %OCTAVE_CONF_FT2_LIBS%;
+
+    const char *GLPK_CPPFLAGS = %OCTAVE_CONF_GLPK_CPPFLAGS%;
+
+    const char *GLPK_LDFLAGS = %OCTAVE_CONF_GLPK_LDFLAGS%;
+
+    const char *GLPK_LIBS = %OCTAVE_CONF_GLPK_LIBS%;
+
+    const char *GNUPLOT = %OCTAVE_CONF_GNUPLOT%;
+
+    const char *HDF5_CPPFLAGS = %OCTAVE_CONF_HDF5_CPPFLAGS%;
+
+    const char *HDF5_LDFLAGS = %OCTAVE_CONF_HDF5_LDFLAGS%;
+
+    const char *HDF5_LIBS = %OCTAVE_CONF_HDF5_LIBS%;
+
+    const char *INCLUDEDIR = %OCTAVE_CONF_INCLUDEDIR%;
+
+    const char *LAPACK_LIBS = %OCTAVE_CONF_LAPACK_LIBS%;
+
+    const char *LDFLAGS = %OCTAVE_CONF_LDFLAGS%;
+
+    const char *LD_CXX = %OCTAVE_CONF_LD_CXX%;
+
+    const char *LD_STATIC_FLAG = %OCTAVE_CONF_LD_STATIC_FLAG%;
+
+    const char *LEXLIB = %OCTAVE_CONF_LEXLIB%;
+
+    const char *LEX = %OCTAVE_CONF_LEX%;
+
+    const char *LFLAGS = %OCTAVE_CONF_LFLAGS%;
+
+    const char *LIBEXT = %OCTAVE_CONF_LIBEXT%;
+
+    const char *LIBFLAGS = %OCTAVE_CONF_LIBFLAGS%;
+
+    const char *LIBOCTAVE = %OCTAVE_CONF_LIBOCTAVE%;
+
+    const char *LIBOCTINTERP = %OCTAVE_CONF_LIBOCTINTERP%;
+
+    const char *LIBS = %OCTAVE_CONF_LIBS%;
+
+    const char *LN_S = %OCTAVE_CONF_LN_S%;
+
+    const char *MAGICK_CPPFLAGS = %OCTAVE_CONF_MAGICK_CPPFLAGS%;
+
+    const char *MAGICK_LDFLAGS = %OCTAVE_CONF_MAGICK_LDFLAGS%;
+
+    const char *MAGICK_LIBS = %OCTAVE_CONF_MAGICK_LIBS%;
+
+    const char *LLVM_CPPFLAGS = %OCTAVE_CONF_LLVM_CPPFLAGS%;
+
+    const char *LLVM_LDFLAGS = %OCTAVE_CONF_LLVM_LDFLAGS%;
+
+    const char *LLVM_LIBS = %OCTAVE_CONF_LLVM_LIBS%;
+
+    const char *MKOCTFILE_DL_LDFLAGS = %OCTAVE_CONF_MKOCTFILE_DL_LDFLAGS%;
+
+    const char *OCTAVE_LINK_DEPS = %OCTAVE_CONF_OCTAVE_LINK_DEPS%;
+
+    const char *OCTAVE_LINK_OPTS = %OCTAVE_CONF_OCTAVE_LINK_OPTS%;
+
+    const char *OCTINCLUDEDIR = %OCTAVE_CONF_OCTINCLUDEDIR%;
+
+    const char *OCTLIBDIR = %OCTAVE_CONF_OCTLIBDIR%;
+
+    const char *OCT_LINK_DEPS = %OCTAVE_CONF_OCT_LINK_DEPS%;
+
+    const char *OCT_LINK_OPTS = %OCTAVE_CONF_OCT_LINK_OPTS%;
+
+    const char *OPENGL_LIBS = %OCTAVE_CONF_OPENGL_LIBS%;
+
+    const char *OSMESA_CPPFLAGS = %OCTAVE_CONF_OSMESA_CPPFLAGS%;
+
+    const char *OSMESA_LDFLAGS = %OCTAVE_CONF_OSMESA_LDFLAGS%;
+
+    const char *OSMESA_LIBS = %OCTAVE_CONF_OSMESA_LIBS%;
+
+    const char *PCRE_CPPFLAGS = %OCTAVE_CONF_PCRE_CPPFLAGS%;
+
+    const char *PCRE_LIBS = %OCTAVE_CONF_PCRE_LIBS%;
+
+    const char *PREFIX = %OCTAVE_CONF_PREFIX%;
+
+    const char *PTHREAD_CFLAGS = %OCTAVE_CONF_PTHREAD_CFLAGS%;
+
+    const char *PTHREAD_LIBS = %OCTAVE_CONF_PTHREAD_LIBS%;
+
+    const char *QHULL_CPPFLAGS = %OCTAVE_CONF_QHULL_CPPFLAGS%;
+
+    const char *QHULL_LDFLAGS = %OCTAVE_CONF_QHULL_LDFLAGS%;
+
+    const char *QHULL_LIBS = %OCTAVE_CONF_QHULL_LIBS%;
+
+    const char *QRUPDATE_CPPFLAGS = %OCTAVE_CONF_QRUPDATE_CPPFLAGS%;
+
+    const char *QRUPDATE_LDFLAGS = %OCTAVE_CONF_QRUPDATE_LDFLAGS%;
+
+    const char *QRUPDATE_LIBS = %OCTAVE_CONF_QRUPDATE_LIBS%;
+
+    const char *QT_CPPFLAGS = %OCTAVE_CONF_QT_CPPFLAGS%;
+
+    const char *QT_LDFLAGS = %OCTAVE_CONF_QT_LDFLAGS%;
+
+    const char *QT_LIBS = %OCTAVE_CONF_QT_LIBS%;
+
+    const char *RANLIB = %OCTAVE_CONF_RANLIB%;
+
+    const char *RDYNAMIC_FLAG = %OCTAVE_CONF_RDYNAMIC_FLAG%;
+
+    const char *READLINE_LIBS = %OCTAVE_CONF_READLINE_LIBS%;
+
+    const char *SED = %OCTAVE_CONF_SED%;
+
+    const char *SHARED_LIBS = %OCTAVE_CONF_SHARED_LIBS%;
+
+    const char *SHLEXT = %OCTAVE_CONF_SHLEXT%;
+
+    const char *SHLEXT_VER = %OCTAVE_CONF_SHLEXT_VER%;
+
+    const char *SH_LD = %OCTAVE_CONF_SH_LD%;
+
+    const char *SH_LDFLAGS = %OCTAVE_CONF_SH_LDFLAGS%;
+
+    const char *SONAME_FLAGS = %OCTAVE_CONF_SONAME_FLAGS%;
+
+    const char *STATIC_LIBS = %OCTAVE_CONF_STATIC_LIBS%;
+
+    const char *TERM_LIBS = %OCTAVE_CONF_TERM_LIBS%;
+
+    const char *UMFPACK_CPPFLAGS = %OCTAVE_CONF_UMFPACK_CPPFLAGS%;
+
+    const char *UMFPACK_LDFLAGS = %OCTAVE_CONF_UMFPACK_LDFLAGS%;
+
+    const char *UMFPACK_LIBS = %OCTAVE_CONF_UMFPACK_LIBS%;
+
+    const char *WARN_CFLAGS = %OCTAVE_CONF_WARN_CFLAGS%;
+
+    const char *WARN_CXXFLAGS = %OCTAVE_CONF_WARN_CXXFLAGS%;
+
+    const char *X11_INCFLAGS = %OCTAVE_CONF_X11_INCFLAGS%;
+
+    const char *X11_LIBS = %OCTAVE_CONF_X11_LIBS%;
+
+    const char *XTRA_CFLAGS = %OCTAVE_CONF_XTRA_CFLAGS%;
+
+    const char *XTRA_CXXFLAGS = %OCTAVE_CONF_XTRA_CXXFLAGS%;
+
+    const char *YACC = %OCTAVE_CONF_YACC%;
+
+    const char *YFLAGS = %OCTAVE_CONF_YFLAGS%;
+
+    const char *Z_CPPFLAGS = %OCTAVE_CONF_Z_CPPFLAGS%;
+
+    const char *Z_LDFLAGS = %OCTAVE_CONF_Z_LDFLAGS%;
+
+    const char *Z_LIBS = %OCTAVE_CONF_Z_LIBS%;
+
+    const char *config_opts = %OCTAVE_CONF_config_opts%;
+  };
+};
diff -r ddf0a5f3a967 -r d78e45987d6a libinterp/config-features.sh
--- a/libinterp/config-features.sh	Sun Feb 07 14:06:43 2016 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-#! /bin/sh
-
-## Attempt to get traditional sort behavior based on byte values.
-LC_ALL="C"
-export LC_ALL
-
-set -e
-AWK=${AWK:-awk}
-
-conffile=$1
-
-cat << EOF
-// DO NOT EDIT!  Generated automatically from $conffile by Make."
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "oct-conf-features.h"
-#include "ov.h"
-
-namespace octave
-{
-  namespace config
-  {
-    octave_scalar_map
-    features (void)
-    {
-      static bool initialized = false;
-
-      static octave_scalar_map m;
-
-      if (! initialized)
-        {
-EOF
-
-$AWK \
-  '/#define (HAVE|ENABLE)_/ {
-     sub (/HAVE_/, "", $2);
-     printf ("          m.assign (\"%s\", octave_value (true));\n", $2);
-   }
-   /\/\* #undef (HAVE|ENABLE)_/ {
-     sub (/HAVE_/, "", $3);
-     printf ("          m.assign (\"%s\", octave_value (false));\n", $3);
-   } {
-   }' $conffile | sort
-
-cat << EOF
-
-          initialized = true;
-        }
-
-      return m;
-    }
-  };
-};
-EOF
diff -r ddf0a5f3a967 -r d78e45987d6a libinterp/corefcn/toplev.cc
--- a/libinterp/corefcn/toplev.cc	Sun Feb 07 14:06:43 2016 -0500
+++ b/libinterp/corefcn/toplev.cc	Sun Feb 07 14:56:17 2016 -0500
@@ -50,6 +50,7 @@
 #include "singleton-cleanup.h"
 #include "str-vec.h"
 
+#include "build-env.h"
 #include "defaults.h"
 #include "defun.h"
 #include "error.h"
@@ -59,8 +60,6 @@
 #include "lex.h"
 #include "load-save.h"
 #include "octave-link.h"
-#include "oct-conf.h"
-#include "oct-conf-features.h"
 #include "oct-hist.h"
 #include "oct-map.h"
 #include "ovl.h"
@@ -1261,152 +1260,152 @@
 
   static const conf_info_struct conf_info[] =
   {
-    { false, "ALL_CFLAGS", octave::config::ALL_CFLAGS },
-    { false, "ALL_CXXFLAGS", octave::config::ALL_CXXFLAGS },
-    { false, "ALL_FFLAGS", octave::config::ALL_FFLAGS },
-    { false, "ALL_LDFLAGS", octave::config::ALL_LDFLAGS },
-    { false, "AMD_CPPFLAGS", octave::config::AMD_CPPFLAGS },
-    { false, "AMD_LDFLAGS", octave::config::AMD_LDFLAGS },
-    { false, "AMD_LIBS", octave::config::AMD_LIBS },
-    { false, "AR", octave::config::AR },
-    { false, "ARFLAGS", octave::config::ARFLAGS },
-    { false, "ARPACK_CPPFLAGS", octave::config::ARPACK_CPPFLAGS },
-    { false, "ARPACK_LDFLAGS", octave::config::ARPACK_LDFLAGS },
-    { false, "ARPACK_LIBS", octave::config::ARPACK_LIBS },
-    { false, "BLAS_LIBS", octave::config::BLAS_LIBS },
-    { false, "CAMD_CPPFLAGS", octave::config::CAMD_CPPFLAGS },
-    { false, "CAMD_LDFLAGS", octave::config::CAMD_LDFLAGS },
-    { false, "CAMD_LIBS", octave::config::CAMD_LIBS },
-    { false, "CARBON_LIBS", octave::config::CARBON_LIBS },
-    { false, "CC", octave::config::CC },
-    { false, "CCOLAMD_CPPFLAGS", octave::config::CCOLAMD_CPPFLAGS },
-    { false, "CCOLAMD_LDFLAGS", octave::config::CCOLAMD_LDFLAGS },
-    { false, "CCOLAMD_LIBS", octave::config::CCOLAMD_LIBS },
-    { false, "CFLAGS", octave::config::CFLAGS },
-    { false, "CHOLMOD_CPPFLAGS", octave::config::CHOLMOD_CPPFLAGS },
-    { false, "CHOLMOD_LDFLAGS", octave::config::CHOLMOD_LDFLAGS },
-    { false, "CHOLMOD_LIBS", octave::config::CHOLMOD_LIBS },
-    { false, "COLAMD_CPPFLAGS", octave::config::COLAMD_CPPFLAGS },
-    { false, "COLAMD_LDFLAGS", octave::config::COLAMD_LDFLAGS },
-    { false, "COLAMD_LIBS", octave::config::COLAMD_LIBS },
-    { false, "CPICFLAG", octave::config::CPICFLAG },
-    { false, "CPPFLAGS", octave::config::CPPFLAGS },
-    { false, "CURL_CPPFLAGS", octave::config::CURL_CPPFLAGS },
-    { false, "CURL_LDFLAGS", octave::config::CURL_LDFLAGS },
-    { false, "CURL_LIBS", octave::config::CURL_LIBS },
-    { false, "CXSPARSE_CPPFLAGS", octave::config::CXSPARSE_CPPFLAGS },
-    { false, "CXSPARSE_LDFLAGS", octave::config::CXSPARSE_LDFLAGS },
-    { false, "CXSPARSE_LIBS", octave::config::CXSPARSE_LIBS },
-    { false, "CXX", octave::config::CXX },
-    { false, "CXXCPP", octave::config::CXXCPP },
-    { false, "CXXFLAGS", octave::config::CXXFLAGS },
-    { false, "CXXPICFLAG", octave::config::CXXPICFLAG },
+    { false, "ALL_CFLAGS", octave::build_env::ALL_CFLAGS },
+    { false, "ALL_CXXFLAGS", octave::build_env::ALL_CXXFLAGS },
+    { false, "ALL_FFLAGS", octave::build_env::ALL_FFLAGS },
+    { false, "ALL_LDFLAGS", octave::build_env::ALL_LDFLAGS },
+    { false, "AMD_CPPFLAGS", octave::build_env::AMD_CPPFLAGS },
+    { false, "AMD_LDFLAGS", octave::build_env::AMD_LDFLAGS },
+    { false, "AMD_LIBS", octave::build_env::AMD_LIBS },
+    { false, "AR", octave::build_env::AR },
+    { false, "ARFLAGS", octave::build_env::ARFLAGS },
+    { false, "ARPACK_CPPFLAGS", octave::build_env::ARPACK_CPPFLAGS },
+    { false, "ARPACK_LDFLAGS", octave::build_env::ARPACK_LDFLAGS },
+    { false, "ARPACK_LIBS", octave::build_env::ARPACK_LIBS },
+    { false, "BLAS_LIBS", octave::build_env::BLAS_LIBS },
+    { false, "CAMD_CPPFLAGS", octave::build_env::CAMD_CPPFLAGS },
+    { false, "CAMD_LDFLAGS", octave::build_env::CAMD_LDFLAGS },
+    { false, "CAMD_LIBS", octave::build_env::CAMD_LIBS },
+    { false, "CARBON_LIBS", octave::build_env::CARBON_LIBS },
+    { false, "CC", octave::build_env::CC },
+    { false, "CCOLAMD_CPPFLAGS", octave::build_env::CCOLAMD_CPPFLAGS },
+    { false, "CCOLAMD_LDFLAGS", octave::build_env::CCOLAMD_LDFLAGS },
+    { false, "CCOLAMD_LIBS", octave::build_env::CCOLAMD_LIBS },
+    { false, "CFLAGS", octave::build_env::CFLAGS },
+    { false, "CHOLMOD_CPPFLAGS", octave::build_env::CHOLMOD_CPPFLAGS },
+    { false, "CHOLMOD_LDFLAGS", octave::build_env::CHOLMOD_LDFLAGS },
+    { false, "CHOLMOD_LIBS", octave::build_env::CHOLMOD_LIBS },
+    { false, "COLAMD_CPPFLAGS", octave::build_env::COLAMD_CPPFLAGS },
+    { false, "COLAMD_LDFLAGS", octave::build_env::COLAMD_LDFLAGS },
+    { false, "COLAMD_LIBS", octave::build_env::COLAMD_LIBS },
+    { false, "CPICFLAG", octave::build_env::CPICFLAG },
+    { false, "CPPFLAGS", octave::build_env::CPPFLAGS },
+    { false, "CURL_CPPFLAGS", octave::build_env::CURL_CPPFLAGS },
+    { false, "CURL_LDFLAGS", octave::build_env::CURL_LDFLAGS },
+    { false, "CURL_LIBS", octave::build_env::CURL_LIBS },
+    { false, "CXSPARSE_CPPFLAGS", octave::build_env::CXSPARSE_CPPFLAGS },
+    { false, "CXSPARSE_LDFLAGS", octave::build_env::CXSPARSE_LDFLAGS },
+    { false, "CXSPARSE_LIBS", octave::build_env::CXSPARSE_LIBS },
+    { false, "CXX", octave::build_env::CXX },
+    { false, "CXXCPP", octave::build_env::CXXCPP },
+    { false, "CXXFLAGS", octave::build_env::CXXFLAGS },
+    { false, "CXXPICFLAG", octave::build_env::CXXPICFLAG },
     { false, "DEFAULT_PAGER", OCTAVE_DEFAULT_PAGER },
-    { false, "DEFS", octave::config::DEFS },
-    { false, "DL_LD", octave::config::DL_LD },
-    { false, "DL_LDFLAGS", octave::config::DL_LDFLAGS },
-    { false, "DL_LIBS", octave::config::DL_LIBS },
-    { false, "GCC_VERSION", octave::config::GCC_VERSION },
-    { false, "GXX_VERSION", octave::config::GXX_VERSION },
-    { false, "EXEEXT", octave::config::EXEEXT },
-    { false, "F77", octave::config::F77 },
-    { false, "F77_FLOAT_STORE_FLAG", octave::config::F77_FLOAT_STORE_FLAG },
-    { false, "F77_INTEGER_8_FLAG", octave::config::F77_INTEGER_8_FLAG },
-    { false, "FFLAGS", octave::config::FFLAGS },
-    { false, "FFTW3_CPPFLAGS", octave::config::FFTW3_CPPFLAGS },
-    { false, "FFTW3_LDFLAGS", octave::config::FFTW3_LDFLAGS },
-    { false, "FFTW3_LIBS", octave::config::FFTW3_LIBS },
-    { false, "FFTW3F_CPPFLAGS", octave::config::FFTW3F_CPPFLAGS },
-    { false, "FFTW3F_LDFLAGS", octave::config::FFTW3F_LDFLAGS },
-    { false, "FFTW3F_LIBS", octave::config::FFTW3F_LIBS },
-    { false, "FLIBS", octave::config::FLIBS },
-    { false, "FLTK_CPPFLAGS", octave::config::FLTK_CPPFLAGS },
-    { false, "FLTK_LDFLAGS", octave::config::FLTK_LDFLAGS },
-    { false, "FLTK_LIBS", octave::config::FLTK_LIBS },
-    { false, "FONTCONFIG_CPPFLAGS", octave::config::FONTCONFIG_CPPFLAGS },
-    { false, "FONTCONFIG_LIBS", octave::config::FONTCONFIG_LIBS },
-    { false, "FPICFLAG", octave::config::FPICFLAG },
-    { false, "FT2_CPPFLAGS", octave::config::FT2_CPPFLAGS },
-    { false, "FT2_LIBS", octave::config::FT2_LIBS },
-    { false, "GLPK_CPPFLAGS", octave::config::GLPK_CPPFLAGS },
-    { false, "GLPK_LDFLAGS", octave::config::GLPK_LDFLAGS },
-    { false, "GLPK_LIBS", octave::config::GLPK_LIBS },
-    { false, "GNUPLOT", octave::config::GNUPLOT },
-    { false, "HDF5_CPPFLAGS", octave::config::HDF5_CPPFLAGS },
-    { false, "HDF5_LDFLAGS", octave::config::HDF5_LDFLAGS },
-    { false, "HDF5_LIBS", octave::config::HDF5_LIBS },
-    { false, "LAPACK_LIBS", octave::config::LAPACK_LIBS },
-    { false, "LDFLAGS", octave::config::LDFLAGS },
-    { false, "LD_CXX", octave::config::LD_CXX },
-    { false, "LD_STATIC_FLAG", octave::config::LD_STATIC_FLAG },
-    { false, "LEX", octave::config::LEX },
-    { false, "LEXLIB", octave::config::LEXLIB },
-    { false, "LFLAGS", octave::config::LFLAGS },
-    { false, "LIBEXT", octave::config::LIBEXT },
-    { false, "LIBFLAGS", octave::config::LIBFLAGS },
-    { false, "LIBOCTAVE", octave::config::LIBOCTAVE },
-    { false, "LIBOCTINTERP", octave::config::LIBOCTINTERP },
-    { false, "LIBS", octave::config::LIBS },
-    { false, "LLVM_CPPFLAGS", octave::config::LLVM_CPPFLAGS },
-    { false, "LLVM_LDFLAGS", octave::config::LLVM_LDFLAGS },
-    { false, "LLVM_LIBS", octave::config::LLVM_LIBS },
-    { false, "LN_S", octave::config::LN_S },
-    { false, "MAGICK_CPPFLAGS", octave::config::MAGICK_CPPFLAGS },
-    { false, "MAGICK_LDFLAGS", octave::config::MAGICK_LDFLAGS },
-    { false, "MAGICK_LIBS", octave::config::MAGICK_LIBS },
-    { false, "MKOCTFILE_DL_LDFLAGS", octave::config::MKOCTFILE_DL_LDFLAGS },
-    { false, "OCTAVE_LINK_DEPS", octave::config::OCTAVE_LINK_DEPS },
-    { false, "OCTAVE_LINK_OPTS", octave::config::OCTAVE_LINK_OPTS },
-    { false, "OCT_LINK_DEPS", octave::config::OCT_LINK_DEPS },
-    { false, "OCT_LINK_OPTS", octave::config::OCT_LINK_OPTS },
-    { false, "OPENGL_LIBS", octave::config::OPENGL_LIBS },
-    { false, "OSMESA_CPPFLAGS", octave::config::OSMESA_CPPFLAGS },
-    { false, "OSMESA_LDFLAGS", octave::config::OSMESA_LDFLAGS },
-    { false, "OSMESA_LIBS", octave::config::OSMESA_LIBS },
-    { false, "PCRE_CPPFLAGS", octave::config::PCRE_CPPFLAGS },
-    { false, "PCRE_LIBS", octave::config::PCRE_LIBS },
-    { false, "PTHREAD_CFLAGS", octave::config::PTHREAD_CFLAGS },
-    { false, "PTHREAD_LIBS", octave::config::PTHREAD_LIBS },
-    { false, "QHULL_CPPFLAGS", octave::config::QHULL_CPPFLAGS },
-    { false, "QHULL_LDFLAGS", octave::config::QHULL_LDFLAGS },
-    { false, "QHULL_LIBS", octave::config::QHULL_LIBS },
-    { false, "QRUPDATE_CPPFLAGS", octave::config::QRUPDATE_CPPFLAGS },
-    { false, "QRUPDATE_LDFLAGS", octave::config::QRUPDATE_LDFLAGS },
-    { false, "QRUPDATE_LIBS", octave::config::QRUPDATE_LIBS },
-    { false, "QT_CPPFLAGS", octave::config::QT_CPPFLAGS },
-    { false, "QT_LDFLAGS", octave::config::QT_LDFLAGS },
-    { false, "QT_LIBS", octave::config::QT_LIBS },
-    { false, "RANLIB", octave::config::RANLIB },
-    { false, "RDYNAMIC_FLAG", octave::config::RDYNAMIC_FLAG },
-    { false, "READLINE_LIBS", octave::config::READLINE_LIBS },
-    { false, "SED", octave::config::SED },
-    { false, "SHARED_LIBS", octave::config::SHARED_LIBS },
-    { false, "SHLEXT", octave::config::SHLEXT },
-    { false, "SHLEXT_VER", octave::config::SHLEXT_VER },
-    { false, "SH_LD", octave::config::SH_LD },
-    { false, "SH_LDFLAGS", octave::config::SH_LDFLAGS },
-    { false, "SONAME_FLAGS", octave::config::SONAME_FLAGS },
-    { false, "STATIC_LIBS", octave::config::STATIC_LIBS },
-    { false, "TERM_LIBS", octave::config::TERM_LIBS },
-    { false, "UMFPACK_CPPFLAGS", octave::config::UMFPACK_CPPFLAGS },
-    { false, "UMFPACK_LDFLAGS", octave::config::UMFPACK_LDFLAGS },
-    { false, "UMFPACK_LIBS", octave::config::UMFPACK_LIBS },
-    { false, "WARN_CFLAGS", octave::config::WARN_CFLAGS },
-    { false, "WARN_CXXFLAGS", octave::config::WARN_CXXFLAGS },
-    { false, "X11_INCFLAGS", octave::config::X11_INCFLAGS },
-    { false, "X11_LIBS", octave::config::X11_LIBS },
-    { false, "XTRA_CFLAGS", octave::config::XTRA_CFLAGS },
-    { false, "XTRA_CXXFLAGS", octave::config::XTRA_CXXFLAGS },
-    { false, "YACC", octave::config::YACC },
-    { false, "YFLAGS", octave::config::YFLAGS },
-    { false, "Z_CPPFLAGS", octave::config::Z_CPPFLAGS },
-    { false, "Z_LDFLAGS", octave::config::Z_LDFLAGS },
-    { false, "Z_LIBS", octave::config::Z_LIBS },
+    { false, "DEFS", octave::build_env::DEFS },
+    { false, "DL_LD", octave::build_env::DL_LD },
+    { false, "DL_LDFLAGS", octave::build_env::DL_LDFLAGS },
+    { false, "DL_LIBS", octave::build_env::DL_LIBS },
+    { false, "GCC_VERSION", octave::build_env::GCC_VERSION },
+    { false, "GXX_VERSION", octave::build_env::GXX_VERSION },
+    { false, "EXEEXT", octave::build_env::EXEEXT },
+    { false, "F77", octave::build_env::F77 },
+    { false, "F77_FLOAT_STORE_FLAG", octave::build_env::F77_FLOAT_STORE_FLAG },
+    { false, "F77_INTEGER_8_FLAG", octave::build_env::F77_INTEGER_8_FLAG },
+    { false, "FFLAGS", octave::build_env::FFLAGS },
+    { false, "FFTW3_CPPFLAGS", octave::build_env::FFTW3_CPPFLAGS },
+    { false, "FFTW3_LDFLAGS", octave::build_env::FFTW3_LDFLAGS },
+    { false, "FFTW3_LIBS", octave::build_env::FFTW3_LIBS },
+    { false, "FFTW3F_CPPFLAGS", octave::build_env::FFTW3F_CPPFLAGS },
+    { false, "FFTW3F_LDFLAGS", octave::build_env::FFTW3F_LDFLAGS },
+    { false, "FFTW3F_LIBS", octave::build_env::FFTW3F_LIBS },
+    { false, "FLIBS", octave::build_env::FLIBS },
+    { false, "FLTK_CPPFLAGS", octave::build_env::FLTK_CPPFLAGS },
+    { false, "FLTK_LDFLAGS", octave::build_env::FLTK_LDFLAGS },
+    { false, "FLTK_LIBS", octave::build_env::FLTK_LIBS },
+    { false, "FONTCONFIG_CPPFLAGS", octave::build_env::FONTCONFIG_CPPFLAGS },
+    { false, "FONTCONFIG_LIBS", octave::build_env::FONTCONFIG_LIBS },
+    { false, "FPICFLAG", octave::build_env::FPICFLAG },
+    { false, "FT2_CPPFLAGS", octave::build_env::FT2_CPPFLAGS },
+    { false, "FT2_LIBS", octave::build_env::FT2_LIBS },
+    { false, "GLPK_CPPFLAGS", octave::build_env::GLPK_CPPFLAGS },
+    { false, "GLPK_LDFLAGS", octave::build_env::GLPK_LDFLAGS },
+    { false, "GLPK_LIBS", octave::build_env::GLPK_LIBS },
+    { false, "GNUPLOT", octave::build_env::GNUPLOT },
+    { false, "HDF5_CPPFLAGS", octave::build_env::HDF5_CPPFLAGS },
+    { false, "HDF5_LDFLAGS", octave::build_env::HDF5_LDFLAGS },
+    { false, "HDF5_LIBS", octave::build_env::HDF5_LIBS },
+    { false, "LAPACK_LIBS", octave::build_env::LAPACK_LIBS },
+    { false, "LDFLAGS", octave::build_env::LDFLAGS },
+    { false, "LD_CXX", octave::build_env::LD_CXX },
+    { false, "LD_STATIC_FLAG", octave::build_env::LD_STATIC_FLAG },
+    { false, "LEX", octave::build_env::LEX },
+    { false, "LEXLIB", octave::build_env::LEXLIB },
+    { false, "LFLAGS", octave::build_env::LFLAGS },
+    { false, "LIBEXT", octave::build_env::LIBEXT },
+    { false, "LIBFLAGS", octave::build_env::LIBFLAGS },
+    { false, "LIBOCTAVE", octave::build_env::LIBOCTAVE },
+    { false, "LIBOCTINTERP", octave::build_env::LIBOCTINTERP },
+    { false, "LIBS", octave::build_env::LIBS },
+    { false, "LLVM_CPPFLAGS", octave::build_env::LLVM_CPPFLAGS },
+    { false, "LLVM_LDFLAGS", octave::build_env::LLVM_LDFLAGS },
+    { false, "LLVM_LIBS", octave::build_env::LLVM_LIBS },
+    { false, "LN_S", octave::build_env::LN_S },
+    { false, "MAGICK_CPPFLAGS", octave::build_env::MAGICK_CPPFLAGS },
+    { false, "MAGICK_LDFLAGS", octave::build_env::MAGICK_LDFLAGS },
+    { false, "MAGICK_LIBS", octave::build_env::MAGICK_LIBS },
+    { false, "MKOCTFILE_DL_LDFLAGS", octave::build_env::MKOCTFILE_DL_LDFLAGS },
+    { false, "OCTAVE_LINK_DEPS", octave::build_env::OCTAVE_LINK_DEPS },
+    { false, "OCTAVE_LINK_OPTS", octave::build_env::OCTAVE_LINK_OPTS },
+    { false, "OCT_LINK_DEPS", octave::build_env::OCT_LINK_DEPS },
+    { false, "OCT_LINK_OPTS", octave::build_env::OCT_LINK_OPTS },
+    { false, "OPENGL_LIBS", octave::build_env::OPENGL_LIBS },
+    { false, "OSMESA_CPPFLAGS", octave::build_env::OSMESA_CPPFLAGS },
+    { false, "OSMESA_LDFLAGS", octave::build_env::OSMESA_LDFLAGS },
+    { false, "OSMESA_LIBS", octave::build_env::OSMESA_LIBS },
+    { false, "PCRE_CPPFLAGS", octave::build_env::PCRE_CPPFLAGS },
+    { false, "PCRE_LIBS", octave::build_env::PCRE_LIBS },
+    { false, "PTHREAD_CFLAGS", octave::build_env::PTHREAD_CFLAGS },
+    { false, "PTHREAD_LIBS", octave::build_env::PTHREAD_LIBS },
+    { false, "QHULL_CPPFLAGS", octave::build_env::QHULL_CPPFLAGS },
+    { false, "QHULL_LDFLAGS", octave::build_env::QHULL_LDFLAGS },
+    { false, "QHULL_LIBS", octave::build_env::QHULL_LIBS },
+    { false, "QRUPDATE_CPPFLAGS", octave::build_env::QRUPDATE_CPPFLAGS },
+    { false, "QRUPDATE_LDFLAGS", octave::build_env::QRUPDATE_LDFLAGS },
+    { false, "QRUPDATE_LIBS", octave::build_env::QRUPDATE_LIBS },
+    { false, "QT_CPPFLAGS", octave::build_env::QT_CPPFLAGS },
+    { false, "QT_LDFLAGS", octave::build_env::QT_LDFLAGS },
+    { false, "QT_LIBS", octave::build_env::QT_LIBS },
+    { false, "RANLIB", octave::build_env::RANLIB },
+    { false, "RDYNAMIC_FLAG", octave::build_env::RDYNAMIC_FLAG },
+    { false, "READLINE_LIBS", octave::build_env::READLINE_LIBS },
+    { false, "SED", octave::build_env::SED },
+    { false, "SHARED_LIBS", octave::build_env::SHARED_LIBS },
+    { false, "SHLEXT", octave::build_env::SHLEXT },
+    { false, "SHLEXT_VER", octave::build_env::SHLEXT_VER },
+    { false, "SH_LD", octave::build_env::SH_LD },
+    { false, "SH_LDFLAGS", octave::build_env::SH_LDFLAGS },
+    { false, "SONAME_FLAGS", octave::build_env::SONAME_FLAGS },
+    { false, "STATIC_LIBS", octave::build_env::STATIC_LIBS },
+    { false, "TERM_LIBS", octave::build_env::TERM_LIBS },
+    { false, "UMFPACK_CPPFLAGS", octave::build_env::UMFPACK_CPPFLAGS },
+    { false, "UMFPACK_LDFLAGS", octave::build_env::UMFPACK_LDFLAGS },
+    { false, "UMFPACK_LIBS", octave::build_env::UMFPACK_LIBS },
+    { false, "WARN_CFLAGS", octave::build_env::WARN_CFLAGS },
+    { false, "WARN_CXXFLAGS", octave::build_env::WARN_CXXFLAGS },
+    { false, "X11_INCFLAGS", octave::build_env::X11_INCFLAGS },
+    { false, "X11_LIBS", octave::build_env::X11_LIBS },
+    { false, "XTRA_CFLAGS", octave::build_env::XTRA_CFLAGS },
+    { false, "XTRA_CXXFLAGS", octave::build_env::XTRA_CXXFLAGS },
+    { false, "YACC", octave::build_env::YACC },
+    { false, "YFLAGS", octave::build_env::YFLAGS },
+    { false, "Z_CPPFLAGS", octave::build_env::Z_CPPFLAGS },
+    { false, "Z_LDFLAGS", octave::build_env::Z_LDFLAGS },
+    { false, "Z_LIBS", octave::build_env::Z_LIBS },
     { false, "api_version", OCTAVE_API_VERSION },
     { true, "archlibdir", OCTAVE_ARCHLIBDIR },
     { true, "bindir", OCTAVE_BINDIR },
     { false, "canonical_host_type", OCTAVE_CANONICAL_HOST_TYPE },
-    { false, "config_opts", octave::config::config_opts },
+    { false, "config_opts", octave::build_env::config_opts },
     { true, "datadir", OCTAVE_DATADIR },
     { true, "datarootdir", OCTAVE_DATAROOTDIR },
     { true, "exec_prefix", OCTAVE_EXEC_PREFIX },
@@ -1456,7 +1455,7 @@
       m.assign ("words_little_endian",
                 octave_value (oct_mach_info::words_little_endian ()));
 
-      m.assign ("features", octave_value (octave::config::features ()));
+      m.assign ("features", octave_value (octave::build_env::features ()));
 
       int i = 0;
 
diff -r ddf0a5f3a967 -r d78e45987d6a libinterp/dldfcn/__init_gnuplot__.cc
--- a/libinterp/dldfcn/__init_gnuplot__.cc	Sun Feb 07 14:06:43 2016 -0500
+++ b/libinterp/dldfcn/__init_gnuplot__.cc	Sun Feb 07 14:56:17 2016 -0500
@@ -33,12 +33,12 @@
 #  include <config.h>
 #endif
 
+#include "build-env.h"
 #include "builtins.h"
 #include "defun-dld.h"
 #include "error.h"
 #include "file-stat.h"
 #include "graphics.h"
-#include "oct-conf.h"
 #include "oct-env.h"
 #include "parse.h"
 #include "utils.h"
@@ -170,7 +170,7 @@
 static bool
 have_gnuplot_binary (void)
 {
-  const std::string exeext = octave::config::EXEEXT;
+  const std::string exeext = octave::build_env::EXEEXT;
   const std::string path = octave_env::getenv ("PATH");
 
   octave_value_list tmp = feval ("gnuplot_binary", octave_value_list ());
diff -r ddf0a5f3a967 -r d78e45987d6a libinterp/module.mk
--- a/libinterp/module.mk	Sun Feb 07 14:06:43 2016 -0500
+++ b/libinterp/module.mk	Sun Feb 07 14:56:17 2016 -0500
@@ -42,9 +42,9 @@
 
 BUILT_SOURCES += \
   $(GENERATED_MAKE_BUILTINS_INCS) \
+  libinterp/build-env.cc \
   libinterp/builtin-defun-decls.h \
   libinterp/builtins.cc \
-  libinterp/oct-conf.cc \
   libinterp/corefcn/oct-errno.cc \
   libinterp/corefcn/oct-tex-lexer.cc \
   libinterp/corefcn/oct-tex-parser.cc \
@@ -73,14 +73,14 @@
 ## Files that are created during build process and installed,
 ## BUT not distributed in tarball.
 LIBINTERP_BUILT_NODISTFILES = \
+  libinterp/build-env.cc \
+  libinterp/build-env-features.cc \
   libinterp/corefcn/mxarray.h \
   libinterp/corefcn/oct-errno.cc \
   libinterp/corefcn/defaults.h \
   libinterp/corefcn/graphics.h \
   libinterp/builtin-defun-decls.h \
   libinterp/operators/ops.cc \
-  libinterp/oct-conf.cc \
-  libinterp/oct-conf-features.cc \
   libinterp/version.h \
   $(OPT_HANDLERS) \
   $(ALL_DEF_FILES) \
@@ -88,7 +88,8 @@
 
 libinterp_EXTRA_DIST += \
   libinterp/DOCSTRINGS \
-  libinterp/config-features.sh \
+  libinterp/build-env.in.cc \
+  libinterp/build-env-features.sh \
   libinterp/find-defun-files.sh \
   libinterp/gendoc.pl \
   libinterp/genprops.awk \
@@ -97,7 +98,6 @@
   libinterp/mkbuiltins \
   libinterp/mkdefs \
   libinterp/mkops \
-  libinterp/oct-conf.in.cc \
   libinterp/version.in.h \
   $(LIBINTERP_BUILT_DISTFILES)
 
@@ -106,8 +106,7 @@
   libinterp/parse-tree/oct-gperf.h \
   libinterp/builtins.h \
   libinterp/builtin-defun-decls.h \
-  libinterp/oct-conf.h \
-  libinterp/oct-conf-features.h \
+  libinterp/build-env.h \
   libinterp/octave.h \
   libinterp/options-usage.h \
   $(OCTAVE_VALUE_INC) \
@@ -161,8 +160,8 @@
   libinterp/operators/ops.cc \
   libinterp/builtin-defun-decls.h \
   libinterp/builtins.cc \
-  libinterp/oct-conf.cc \
-  libinterp/oct-conf-features.cc \
+  libinterp/build-env.cc \
+  libinterp/build-env-features.cc \
   libinterp/version.h
 
 libinterp_liboctinterp_la_LIBADD = \
@@ -246,16 +245,16 @@
 ## Special rules:
 ## Mostly for sources which must be built before rest of compilation.
 
-## oct-conf.cc must depend on Makefile.
+## build-env.cc must depend on Makefile.
 ## Calling configure may change default/config values.
 ## However, calling configure will also regenerate the Makefiles from
 ## Makefile.am and trigger the rules below.
-libinterp/oct-conf.cc: libinterp/oct-conf.in.cc Makefile
+libinterp/build-env.cc: libinterp/build-env.in.cc Makefile
 	$(AM_V_GEN)$(do_subst_config_vals)
 
-libinterp/oct-conf-features.cc: $(top_builddir)/config.h libinterp/config-features.sh
+libinterp/build-env-features.cc: $(top_builddir)/config.h libinterp/build-env-features.sh
 	$(AM_V_GEN)rm -f $@-t && \
-	$(srcdir)/libinterp/config-features.sh $< > $@-t && \
+	$(srcdir)/libinterp/build-env-features.sh $< > $@-t && \
 	$(simple_move_if_change_rule)
 
 libinterp/version.h: libinterp/version.in.h Makefile
diff -r ddf0a5f3a967 -r d78e45987d6a libinterp/oct-conf-features.h
--- a/libinterp/oct-conf-features.h	Sun Feb 07 14:06:43 2016 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-/*
-
-Copyright (C) 2016 John W. Eaton
-
-This file is part of Octave.
-
-Octave is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 3 of the License, or (at your
-option) any later version.
-
-Octave is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License
-along with Octave; see the file COPYING.  If not, see
-<http://www.gnu.org/licenses/>.
-
-*/
-
-#if ! defined (octave_oct_conf_features_h)
-#define octave_oct_conf_features_h 1
-
-#include "oct-map.h"
-
-namespace octave
-{
-  namespace config
-  {
-    extern OCTAVE_API octave_scalar_map features (void);
-  };
-};
-
-#endif
diff -r ddf0a5f3a967 -r d78e45987d6a libinterp/oct-conf.h
--- a/libinterp/oct-conf.h	Sun Feb 07 14:06:43 2016 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,179 +0,0 @@
-/*
-
-Copyright (C) 1996-2015 John W. Eaton
-
-This file is part of Octave.
-
-Octave is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 3 of the License, or (at your
-option) any later version.
-
-Octave is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License
-along with Octave; see the file COPYING.  If not, see
-<http://www.gnu.org/licenses/>.
-
-*/
-
-#if ! defined (octave_oct_conf_h)
-#define octave_oct_conf_h 1
-
-namespace octave
-{
-  namespace config
-  {
-    extern const char *ALL_CFLAGS;
-    extern const char *ALL_CXXFLAGS;
-    extern const char *ALL_FFLAGS;
-    extern const char *ALL_LDFLAGS;
-    extern const char *AMD_CPPFLAGS;
-    extern const char *AMD_LDFLAGS;
-    extern const char *AMD_LIBS;
-    extern const char *ARFLAGS;
-    extern const char *AR;
-    extern const char *ARPACK_CPPFLAGS;
-    extern const char *ARPACK_LDFLAGS;
-    extern const char *ARPACK_LIBS;
-    extern const char *BLAS_LIBS;
-    extern const char *CAMD_CPPFLAGS;
-    extern const char *CAMD_LDFLAGS;
-    extern const char *CAMD_LIBS;
-    extern const char *CARBON_LIBS;
-    extern const char *CC;
-    extern const char *CCOLAMD_CPPFLAGS;
-    extern const char *CCOLAMD_LDFLAGS;
-    extern const char *CCOLAMD_LIBS;
-    extern const char *CFLAGS;
-    extern const char *CHOLMOD_CPPFLAGS;
-    extern const char *CHOLMOD_LDFLAGS;
-    extern const char *CHOLMOD_LIBS;
-    extern const char *COLAMD_CPPFLAGS;
-    extern const char *COLAMD_LDFLAGS;
-    extern const char *COLAMD_LIBS;
-    extern const char *CPICFLAG;
-    extern const char *CPPFLAGS;
-    extern const char *CURL_CPPFLAGS;
-    extern const char *CURL_LDFLAGS;
-    extern const char *CURL_LIBS;
-    extern const char *CXSPARSE_CPPFLAGS;
-    extern const char *CXSPARSE_LDFLAGS;
-    extern const char *CXSPARSE_LIBS;
-    extern const char *CXXCPP;
-    extern const char *CXXFLAGS;
-    extern const char *CXXPICFLAG;
-    extern const char *CXX;
-    extern const char *DEFAULT_PAGER;
-    extern const char *DEFS;
-    extern const char *DL_LD;
-    extern const char *DL_LDFLAGS;
-    extern const char *DL_LIBS;
-    extern const char *EXEEXT;
-    extern const char *GCC_VERSION;
-    extern const char *GXX_VERSION;
-    extern const char *F77;
-    extern const char *F77_FLOAT_STORE_FLAG;
-    extern const char *F77_INTEGER_8_FLAG;
-    extern const char *FFLAGS;
-    extern const char *FFTW3_CPPFLAGS;
-    extern const char *FFTW3_LDFLAGS;
-    extern const char *FFTW3_LIBS;
-    extern const char *FFTW3F_CPPFLAGS;
-    extern const char *FFTW3F_LDFLAGS;
-    extern const char *FFTW3F_LIBS;
-    extern const char *FLIBS;
-    extern const char *FLTK_CPPFLAGS;
-    extern const char *FLTK_LDFLAGS;
-    extern const char *FLTK_LIBS;
-    extern const char *FONTCONFIG_CPPFLAGS;
-    extern const char *FONTCONFIG_LIBS;
-    extern const char *FPICFLAG;
-    extern const char *FT2_CPPFLAGS;
-    extern const char *FT2_LIBS;
-    extern const char *GLPK_CPPFLAGS;
-    extern const char *GLPK_LDFLAGS;
-    extern const char *GLPK_LIBS;
-    extern const char *GNUPLOT;
-    extern const char *HDF5_CPPFLAGS;
-    extern const char *HDF5_LDFLAGS;
-    extern const char *HDF5_LIBS;
-    extern const char *INCLUDEDIR;
-    extern const char *LAPACK_LIBS;
-    extern const char *LDFLAGS;
-    extern const char *LD_CXX;
-    extern const char *LD_STATIC_FLAG;
-    extern const char *LEXLIB;
-    extern const char *LEX;
-    extern const char *LFLAGS;
-    extern const char *LIBEXT;
-    extern const char *LIBFLAGS;
-    extern const char *LIBOCTAVE;
-    extern const char *LIBOCTINTERP;
-    extern const char *LIBS;
-    extern const char *LN_S;
-    extern const char *MAGICK_CPPFLAGS;
-    extern const char *MAGICK_LDFLAGS;
-    extern const char *MAGICK_LIBS;
-    extern const char *LLVM_CPPFLAGS;
-    extern const char *LLVM_LDFLAGS;
-    extern const char *LLVM_LIBS;
-    extern const char *MKOCTFILE_DL_LDFLAGS;
-    extern const char *OCTAVE_LINK_DEPS;
-    extern const char *OCTAVE_LINK_OPTS;
-    extern const char *OCTINCLUDEDIR;
-    extern const char *OCTLIBDIR;
-    extern const char *OCT_LINK_DEPS;
-    extern const char *OCT_LINK_OPTS;
-    extern const char *OPENGL_LIBS;
-    extern const char *OSMESA_CPPFLAGS;
-    extern const char *OSMESA_LDFLAGS;
-    extern const char *OSMESA_LIBS;
-    extern const char *PCRE_CPPFLAGS;
-    extern const char *PCRE_LIBS;
-    extern const char *PREFIX;
-    extern const char *PTHREAD_CFLAGS;
-    extern const char *PTHREAD_LIBS;
-    extern const char *QHULL_CPPFLAGS;
-    extern const char *QHULL_LDFLAGS;
-    extern const char *QHULL_LIBS;
-    extern const char *QRUPDATE_CPPFLAGS;
-    extern const char *QRUPDATE_LDFLAGS;
-    extern const char *QRUPDATE_LIBS;
-    extern const char *QT_CPPFLAGS;
-    extern const char *QT_LDFLAGS;
-    extern const char *QT_LIBS;
-    extern const char *RANLIB;
-    extern const char *RDYNAMIC_FLAG;
-    extern const char *READLINE_LIBS;
-    extern const char *SED;
-    extern const char *SHARED_LIBS;
-    extern const char *SHLEXT;
-    extern const char *SHLEXT_VER;
-    extern const char *SH_LD;
-    extern const char *SH_LDFLAGS;
-    extern const char *SONAME_FLAGS;
-    extern const char *STATIC_LIBS;
-    extern const char *TERM_LIBS;
-    extern const char *UMFPACK_CPPFLAGS;
-    extern const char *UMFPACK_LDFLAGS;
-    extern const char *UMFPACK_LIBS;
-    extern const char *WARN_CFLAGS;
-    extern const char *WARN_CXXFLAGS;
-    extern const char *X11_INCFLAGS;
-    extern const char *X11_LIBS;
-    extern const char *XTRA_CFLAGS;
-    extern const char *XTRA_CXXFLAGS;
-    extern const char *YACC;
-    extern const char *YFLAGS;
-    extern const char *Z_CPPFLAGS;
-    extern const char *Z_LDFLAGS;
-    extern const char *Z_LIBS;
-    extern const char *config_opts;
-  };
-};
-
-#endif
diff -r ddf0a5f3a967 -r d78e45987d6a libinterp/oct-conf.in.cc
--- a/libinterp/oct-conf.in.cc	Sun Feb 07 14:06:43 2016 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,326 +0,0 @@
-// %NO_EDIT_WARNING%
-/*
-
-Copyright (C) 1996-2015 John W. Eaton
-
-This file is part of Octave.
-
-Octave is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 3 of the License, or (at your
-option) any later version.
-
-Octave is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License
-along with Octave; see the file COPYING.  If not, see
-<http://www.gnu.org/licenses/>.
-
-*/
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
-#include "oct-conf.h"
-
-namespace octave
-{
-  namespace config
-  {
-    const char *ALL_CFLAGS = %OCTAVE_CONF_ALL_CFLAGS%;
-
-    const char *ALL_CXXFLAGS = %OCTAVE_CONF_ALL_CXXFLAGS%;
-
-    const char *ALL_FFLAGS = %OCTAVE_CONF_ALL_FFLAGS%;
-
-    const char *ALL_LDFLAGS = %OCTAVE_CONF_ALL_LDFLAGS%;
-
-    const char *AMD_CPPFLAGS = %OCTAVE_CONF_AMD_CPPFLAGS%;
-
-    const char *AMD_LDFLAGS = %OCTAVE_CONF_AMD_LDFLAGS%;
-
-    const char *AMD_LIBS = %OCTAVE_CONF_AMD_LIBS%;
-
-    const char *ARFLAGS = %OCTAVE_CONF_ARFLAGS%;
-
-    const char *AR = %OCTAVE_CONF_AR%;
-
-    const char *ARPACK_CPPFLAGS = %OCTAVE_CONF_ARPACK_CPPFLAGS%;
-
-    const char *ARPACK_LDFLAGS = %OCTAVE_CONF_ARPACK_LDFLAGS%;
-
-    const char *ARPACK_LIBS = %OCTAVE_CONF_ARPACK_LIBS%;
-
-    const char *BLAS_LIBS = %OCTAVE_CONF_BLAS_LIBS%;
-
-    const char *CAMD_CPPFLAGS = %OCTAVE_CONF_CAMD_CPPFLAGS%;
-
-    const char *CAMD_LDFLAGS = %OCTAVE_CONF_CAMD_LDFLAGS%;
-
-    const char *CAMD_LIBS = %OCTAVE_CONF_CAMD_LIBS%;
-
-    const char *CARBON_LIBS = %OCTAVE_CONF_CARBON_LIBS%;
-
-    const char *CC = %OCTAVE_CONF_CC%;
-
-    const char *CCOLAMD_CPPFLAGS = %OCTAVE_CONF_CCOLAMD_CPPFLAGS%;
-
-    const char *CCOLAMD_LDFLAGS = %OCTAVE_CONF_CCOLAMD_LDFLAGS%;
-
-    const char *CCOLAMD_LIBS = %OCTAVE_CONF_CCOLAMD_LIBS%;
-
-    const char *CFLAGS = %OCTAVE_CONF_CFLAGS%;
-
-    const char *CHOLMOD_CPPFLAGS = %OCTAVE_CONF_CHOLMOD_CPPFLAGS%;
-
-    const char *CHOLMOD_LDFLAGS = %OCTAVE_CONF_CHOLMOD_LDFLAGS%;
-
-    const char *CHOLMOD_LIBS = %OCTAVE_CONF_CHOLMOD_LIBS%;
-
-    const char *COLAMD_CPPFLAGS = %OCTAVE_CONF_COLAMD_CPPFLAGS%;
-
-    const char *COLAMD_LDFLAGS = %OCTAVE_CONF_COLAMD_LDFLAGS%;
-
-    const char *COLAMD_LIBS = %OCTAVE_CONF_COLAMD_LIBS%;
-
-    const char *CPICFLAG = %OCTAVE_CONF_CPICFLAG%;
-
-    const char *CPPFLAGS = %OCTAVE_CONF_CPPFLAGS%;
-
-    const char *CURL_CPPFLAGS = %OCTAVE_CONF_CURL_CPPFLAGS%;
-
-    const char *CURL_LDFLAGS = %OCTAVE_CONF_CURL_LDFLAGS%;
-
-    const char *CURL_LIBS = %OCTAVE_CONF_CURL_LIBS%;
-
-    const char *CXSPARSE_CPPFLAGS = %OCTAVE_CONF_CXSPARSE_CPPFLAGS%;
-
-    const char *CXSPARSE_LDFLAGS = %OCTAVE_CONF_CXSPARSE_LDFLAGS%;
-
-    const char *CXSPARSE_LIBS = %OCTAVE_CONF_CXSPARSE_LIBS%;
-
-    const char *CXXCPP = %OCTAVE_CONF_CXXCPP%;
-
-    const char *CXXFLAGS = %OCTAVE_CONF_CXXFLAGS%;
-
-    const char *CXXPICFLAG = %OCTAVE_CONF_CXXPICFLAG%;
-
-    const char *CXX = %OCTAVE_CONF_CXX%;
-
-    const char *DEFAULT_PAGER = %OCTAVE_CONF_DEFAULT_PAGER%;
-
-    const char *DEFS = %OCTAVE_CONF_DEFS%;
-
-    const char *DL_LD = %OCTAVE_CONF_DL_LD%;
-
-    const char *DL_LDFLAGS = %OCTAVE_CONF_DL_LDFLAGS%;
-
-    const char *DL_LIBS = %OCTAVE_CONF_DL_LIBS%;
-
-    const char *EXEEXT = %OCTAVE_CONF_EXEEXT%;
-
-    const char *GCC_VERSION = %OCTAVE_CONF_GCC_VERSION%;
-
-    const char *GXX_VERSION = %OCTAVE_CONF_GXX_VERSION%;
-
-    const char *F77 = %OCTAVE_CONF_F77%;
-
-    const char *F77_FLOAT_STORE_FLAG = %OCTAVE_CONF_F77_FLOAT_STORE_FLAG%;
-
-    const char *F77_INTEGER_8_FLAG = %OCTAVE_CONF_F77_INTEGER_8_FLAG%;
-
-    const char *FFLAGS = %OCTAVE_CONF_FFLAGS%;
-
-    const char *FFTW3_CPPFLAGS = %OCTAVE_CONF_FFTW3_CPPFLAGS%;
-
-    const char *FFTW3_LDFLAGS = %OCTAVE_CONF_FFTW3_LDFLAGS%;
-
-    const char *FFTW3_LIBS = %OCTAVE_CONF_FFTW3_LIBS%;
-
-    const char *FFTW3F_CPPFLAGS = %OCTAVE_CONF_FFTW3F_CPPFLAGS%;
-
-    const char *FFTW3F_LDFLAGS = %OCTAVE_CONF_FFTW3F_LDFLAGS%;
-
-    const char *FFTW3F_LIBS = %OCTAVE_CONF_FFTW3F_LIBS%;
-
-    const char *FLIBS = %OCTAVE_CONF_FLIBS%;
-
-    const char *FLTK_CPPFLAGS = %OCTAVE_CONF_FLTK_CPPFLAGS%;
-
-    const char *FLTK_LDFLAGS = %OCTAVE_CONF_FLTK_LDFLAGS%;
-
-    const char *FLTK_LIBS = %OCTAVE_CONF_FLTK_LIBS%;
-
-    const char *FONTCONFIG_CPPFLAGS = %OCTAVE_CONF_FONTCONFIG_CPPFLAGS%;
-
-    const char *FONTCONFIG_LIBS = %OCTAVE_CONF_FONTCONFIG_LIBS%;
-
-    const char *FPICFLAG = %OCTAVE_CONF_FPICFLAG%;
-
-    const char *FT2_CPPFLAGS = %OCTAVE_CONF_FT2_CPPFLAGS%;
-
-    const char *FT2_LIBS = %OCTAVE_CONF_FT2_LIBS%;
-
-    const char *GLPK_CPPFLAGS = %OCTAVE_CONF_GLPK_CPPFLAGS%;
-
-    const char *GLPK_LDFLAGS = %OCTAVE_CONF_GLPK_LDFLAGS%;
-
-    const char *GLPK_LIBS = %OCTAVE_CONF_GLPK_LIBS%;
-
-    const char *GNUPLOT = %OCTAVE_CONF_GNUPLOT%;
-
-    const char *HDF5_CPPFLAGS = %OCTAVE_CONF_HDF5_CPPFLAGS%;
-
-    const char *HDF5_LDFLAGS = %OCTAVE_CONF_HDF5_LDFLAGS%;
-
-    const char *HDF5_LIBS = %OCTAVE_CONF_HDF5_LIBS%;
-
-    const char *INCLUDEDIR = %OCTAVE_CONF_INCLUDEDIR%;
-
-    const char *LAPACK_LIBS = %OCTAVE_CONF_LAPACK_LIBS%;
-
-    const char *LDFLAGS = %OCTAVE_CONF_LDFLAGS%;
-
-    const char *LD_CXX = %OCTAVE_CONF_LD_CXX%;
-
-    const char *LD_STATIC_FLAG = %OCTAVE_CONF_LD_STATIC_FLAG%;
-
-    const char *LEXLIB = %OCTAVE_CONF_LEXLIB%;
-
-    const char *LEX = %OCTAVE_CONF_LEX%;
-
-    const char *LFLAGS = %OCTAVE_CONF_LFLAGS%;
-
-    const char *LIBEXT = %OCTAVE_CONF_LIBEXT%;
-
-    const char *LIBFLAGS = %OCTAVE_CONF_LIBFLAGS%;
-
-    const char *LIBOCTAVE = %OCTAVE_CONF_LIBOCTAVE%;
-
-    const char *LIBOCTINTERP = %OCTAVE_CONF_LIBOCTINTERP%;
-
-    const char *LIBS = %OCTAVE_CONF_LIBS%;
-
-    const char *LN_S = %OCTAVE_CONF_LN_S%;
-
-    const char *MAGICK_CPPFLAGS = %OCTAVE_CONF_MAGICK_CPPFLAGS%;
-
-    const char *MAGICK_LDFLAGS = %OCTAVE_CONF_MAGICK_LDFLAGS%;
-
-    const char *MAGICK_LIBS = %OCTAVE_CONF_MAGICK_LIBS%;
-
-    const char *LLVM_CPPFLAGS = %OCTAVE_CONF_LLVM_CPPFLAGS%;
-
-    const char *LLVM_LDFLAGS = %OCTAVE_CONF_LLVM_LDFLAGS%;
-
-    const char *LLVM_LIBS = %OCTAVE_CONF_LLVM_LIBS%;
-
-    const char *MKOCTFILE_DL_LDFLAGS = %OCTAVE_CONF_MKOCTFILE_DL_LDFLAGS%;
-
-    const char *OCTAVE_LINK_DEPS = %OCTAVE_CONF_OCTAVE_LINK_DEPS%;
-
-    const char *OCTAVE_LINK_OPTS = %OCTAVE_CONF_OCTAVE_LINK_OPTS%;
-
-    const char *OCTINCLUDEDIR = %OCTAVE_CONF_OCTINCLUDEDIR%;
-
-    const char *OCTLIBDIR = %OCTAVE_CONF_OCTLIBDIR%;
-
-    const char *OCT_LINK_DEPS = %OCTAVE_CONF_OCT_LINK_DEPS%;
-
-    const char *OCT_LINK_OPTS = %OCTAVE_CONF_OCT_LINK_OPTS%;
-
-    const char *OPENGL_LIBS = %OCTAVE_CONF_OPENGL_LIBS%;
-
-    const char *OSMESA_CPPFLAGS = %OCTAVE_CONF_OSMESA_CPPFLAGS%;
-
-    const char *OSMESA_LDFLAGS = %OCTAVE_CONF_OSMESA_LDFLAGS%;
-
-    const char *OSMESA_LIBS = %OCTAVE_CONF_OSMESA_LIBS%;
-
-    const char *PCRE_CPPFLAGS = %OCTAVE_CONF_PCRE_CPPFLAGS%;
-
-    const char *PCRE_LIBS = %OCTAVE_CONF_PCRE_LIBS%;
-
-    const char *PREFIX = %OCTAVE_CONF_PREFIX%;
-
-    const char *PTHREAD_CFLAGS = %OCTAVE_CONF_PTHREAD_CFLAGS%;
-
-    const char *PTHREAD_LIBS = %OCTAVE_CONF_PTHREAD_LIBS%;
-
-    const char *QHULL_CPPFLAGS = %OCTAVE_CONF_QHULL_CPPFLAGS%;
-
-    const char *QHULL_LDFLAGS = %OCTAVE_CONF_QHULL_LDFLAGS%;
-
-    const char *QHULL_LIBS = %OCTAVE_CONF_QHULL_LIBS%;
-
-    const char *QRUPDATE_CPPFLAGS = %OCTAVE_CONF_QRUPDATE_CPPFLAGS%;
-
-    const char *QRUPDATE_LDFLAGS = %OCTAVE_CONF_QRUPDATE_LDFLAGS%;
-
-    const char *QRUPDATE_LIBS = %OCTAVE_CONF_QRUPDATE_LIBS%;
-
-    const char *QT_CPPFLAGS = %OCTAVE_CONF_QT_CPPFLAGS%;
-
-    const char *QT_LDFLAGS = %OCTAVE_CONF_QT_LDFLAGS%;
-
-    const char *QT_LIBS = %OCTAVE_CONF_QT_LIBS%;
-
-    const char *RANLIB = %OCTAVE_CONF_RANLIB%;
-
-    const char *RDYNAMIC_FLAG = %OCTAVE_CONF_RDYNAMIC_FLAG%;
-
-    const char *READLINE_LIBS = %OCTAVE_CONF_READLINE_LIBS%;
-
-    const char *SED = %OCTAVE_CONF_SED%;
-
-    const char *SHARED_LIBS = %OCTAVE_CONF_SHARED_LIBS%;
-
-    const char *SHLEXT = %OCTAVE_CONF_SHLEXT%;
-
-    const char *SHLEXT_VER = %OCTAVE_CONF_SHLEXT_VER%;
-
-    const char *SH_LD = %OCTAVE_CONF_SH_LD%;
-
-    const char *SH_LDFLAGS = %OCTAVE_CONF_SH_LDFLAGS%;
-
-    const char *SONAME_FLAGS = %OCTAVE_CONF_SONAME_FLAGS%;
-
-    const char *STATIC_LIBS = %OCTAVE_CONF_STATIC_LIBS%;
-
-    const char *TERM_LIBS = %OCTAVE_CONF_TERM_LIBS%;
-
-    const char *UMFPACK_CPPFLAGS = %OCTAVE_CONF_UMFPACK_CPPFLAGS%;
-
-    const char *UMFPACK_LDFLAGS = %OCTAVE_CONF_UMFPACK_LDFLAGS%;
-
-    const char *UMFPACK_LIBS = %OCTAVE_CONF_UMFPACK_LIBS%;
-
-    const char *WARN_CFLAGS = %OCTAVE_CONF_WARN_CFLAGS%;
-
-    const char *WARN_CXXFLAGS = %OCTAVE_CONF_WARN_CXXFLAGS%;
-
-    const char *X11_INCFLAGS = %OCTAVE_CONF_X11_INCFLAGS%;
-
-    const char *X11_LIBS = %OCTAVE_CONF_X11_LIBS%;
-
-    const char *XTRA_CFLAGS = %OCTAVE_CONF_XTRA_CFLAGS%;
-
-    const char *XTRA_CXXFLAGS = %OCTAVE_CONF_XTRA_CXXFLAGS%;
-
-    const char *YACC = %OCTAVE_CONF_YACC%;
-
-    const char *YFLAGS = %OCTAVE_CONF_YFLAGS%;
-
-    const char *Z_CPPFLAGS = %OCTAVE_CONF_Z_CPPFLAGS%;
-
-    const char *Z_LDFLAGS = %OCTAVE_CONF_Z_LDFLAGS%;
-
-    const char *Z_LIBS = %OCTAVE_CONF_Z_LIBS%;
-
-    const char *config_opts = %OCTAVE_CONF_config_opts%;
-  };
-};
diff -r ddf0a5f3a967 -r d78e45987d6a libinterp/octave.cc
--- a/libinterp/octave.cc	Sun Feb 07 14:06:43 2016 -0500
+++ b/libinterp/octave.cc	Sun Feb 07 14:56:17 2016 -0500
@@ -47,6 +47,7 @@
 #include "oct-env.h"
 #include "str-vec.h"
 
+#include "build-env.h"
 #include "builtins.h"
 #include "defaults.h"
 #include "Cell.h"
@@ -60,7 +61,6 @@
 #include "load-path.h"
 #include "load-save.h"
 #include "octave.h"
-#include "oct-conf.h"
 #include "oct-hist.h"
 #include "oct-map.h"
 #include "oct-mutex.h"