--- a/libinterp/build-env.h	Tue Dec 29 18:21:12 2020 +0100
+++ b/libinterp/build-env.h	Tue Dec 29 18:23:42 2020 +0100
@@ -34,152 +34,152 @@
 {
   namespace build_env
   {
-    extern OCTAVE_API octave_scalar_map features (void);
+    extern OCTINTERP_API octave_scalar_map features (void);
 
-    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_LDFLAGS;
-    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 *KLU_CPPFLAGS;
-    extern const char *KLU_LDFLAGS;
-    extern const char *KLU_LIBS;
-    extern const char *LAPACK_LIBS;
-    extern const char *LDFLAGS;
-    extern const char *LD_STATIC_FLAG;
-    extern const char *LEXLIB;
-    extern const char *LEX;
-    extern const char *LFLAGS;
-    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 *PCRE_CPPFLAGS;
-    extern const char *PCRE_LDFLAGS;
-    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 *QT_OPENGL_LIBS;
-    extern const char *RANLIB;
-    extern const char *RDYNAMIC_FLAG;
-    extern const char *READLINE_LIBS;
-    extern const char *SHARED_LIBS;
-    extern const char *SH_LDFLAGS;
-    extern const char *STATIC_LIBS;
-    extern const char *SUITESPARSECONFIG_LIBS;
-    extern const char *SUNDIALS_IDA_CPPFLAGS;
-    extern const char *SUNDIALS_IDA_LDFLAGS;
-    extern const char *SUNDIALS_IDA_LIBS;
-    extern const char *SUNDIALS_NVECSERIAL_CPPFLAGS;
-    extern const char *SUNDIALS_NVECSERIAL_LDFLAGS;
-    extern const char *SUNDIALS_NVECSERIAL_LIBS;
-    extern const char *SUNDIALS_SUNLINSOLKLU_CPPFLAGS;
-    extern const char *SUNDIALS_SUNLINSOLKLU_LDFLAGS;
-    extern const char *SUNDIALS_SUNLINSOLKLU_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;
+    extern OCTINTERP_API const char *AMD_CPPFLAGS;
+    extern OCTINTERP_API const char *AMD_LDFLAGS;
+    extern OCTINTERP_API const char *AMD_LIBS;
+    extern OCTINTERP_API const char *ARFLAGS;
+    extern OCTINTERP_API const char *AR;
+    extern OCTINTERP_API const char *ARPACK_CPPFLAGS;
+    extern OCTINTERP_API const char *ARPACK_LDFLAGS;
+    extern OCTINTERP_API const char *ARPACK_LIBS;
+    extern OCTINTERP_API const char *BLAS_LIBS;
+    extern OCTINTERP_API const char *CAMD_CPPFLAGS;
+    extern OCTINTERP_API const char *CAMD_LDFLAGS;
+    extern OCTINTERP_API const char *CAMD_LIBS;
+    extern OCTINTERP_API const char *CARBON_LIBS;
+    extern OCTINTERP_API const char *CC;
+    extern OCTINTERP_API const char *CCOLAMD_CPPFLAGS;
+    extern OCTINTERP_API const char *CCOLAMD_LDFLAGS;
+    extern OCTINTERP_API const char *CCOLAMD_LIBS;
+    extern OCTINTERP_API const char *CFLAGS;
+    extern OCTINTERP_API const char *CHOLMOD_CPPFLAGS;
+    extern OCTINTERP_API const char *CHOLMOD_LDFLAGS;
+    extern OCTINTERP_API const char *CHOLMOD_LIBS;
+    extern OCTINTERP_API const char *COLAMD_CPPFLAGS;
+    extern OCTINTERP_API const char *COLAMD_LDFLAGS;
+    extern OCTINTERP_API const char *COLAMD_LIBS;
+    extern OCTINTERP_API const char *CPICFLAG;
+    extern OCTINTERP_API const char *CPPFLAGS;
+    extern OCTINTERP_API const char *CURL_CPPFLAGS;
+    extern OCTINTERP_API const char *CURL_LDFLAGS;
+    extern OCTINTERP_API const char *CURL_LIBS;
+    extern OCTINTERP_API const char *CXSPARSE_CPPFLAGS;
+    extern OCTINTERP_API const char *CXSPARSE_LDFLAGS;
+    extern OCTINTERP_API const char *CXSPARSE_LIBS;
+    extern OCTINTERP_API const char *CXXCPP;
+    extern OCTINTERP_API const char *CXXFLAGS;
+    extern OCTINTERP_API const char *CXXPICFLAG;
+    extern OCTINTERP_API const char *CXX;
+    extern OCTINTERP_API const char *DEFAULT_PAGER;
+    extern OCTINTERP_API const char *DEFS;
+    extern OCTINTERP_API const char *DL_LDFLAGS;
+    extern OCTINTERP_API const char *EXEEXT;
+    extern OCTINTERP_API const char *GCC_VERSION;
+    extern OCTINTERP_API const char *GXX_VERSION;
+    extern OCTINTERP_API const char *F77;
+    extern OCTINTERP_API const char *F77_FLOAT_STORE_FLAG;
+    extern OCTINTERP_API const char *F77_INTEGER_8_FLAG;
+    extern OCTINTERP_API const char *FFLAGS;
+    extern OCTINTERP_API const char *FFTW3_CPPFLAGS;
+    extern OCTINTERP_API const char *FFTW3_LDFLAGS;
+    extern OCTINTERP_API const char *FFTW3_LIBS;
+    extern OCTINTERP_API const char *FFTW3F_CPPFLAGS;
+    extern OCTINTERP_API const char *FFTW3F_LDFLAGS;
+    extern OCTINTERP_API const char *FFTW3F_LIBS;
+    extern OCTINTERP_API const char *FLIBS;
+    extern OCTINTERP_API const char *FLTK_CPPFLAGS;
+    extern OCTINTERP_API const char *FLTK_LDFLAGS;
+    extern OCTINTERP_API const char *FLTK_LIBS;
+    extern OCTINTERP_API const char *FONTCONFIG_CPPFLAGS;
+    extern OCTINTERP_API const char *FONTCONFIG_LIBS;
+    extern OCTINTERP_API const char *FPICFLAG;
+    extern OCTINTERP_API const char *FT2_CPPFLAGS;
+    extern OCTINTERP_API const char *FT2_LIBS;
+    extern OCTINTERP_API const char *GLPK_CPPFLAGS;
+    extern OCTINTERP_API const char *GLPK_LDFLAGS;
+    extern OCTINTERP_API const char *GLPK_LIBS;
+    extern OCTINTERP_API const char *GNUPLOT;
+    extern OCTINTERP_API const char *HDF5_CPPFLAGS;
+    extern OCTINTERP_API const char *HDF5_LDFLAGS;
+    extern OCTINTERP_API const char *HDF5_LIBS;
+    extern OCTINTERP_API const char *INCLUDEDIR;
+    extern OCTINTERP_API const char *KLU_CPPFLAGS;
+    extern OCTINTERP_API const char *KLU_LDFLAGS;
+    extern OCTINTERP_API const char *KLU_LIBS;
+    extern OCTINTERP_API const char *LAPACK_LIBS;
+    extern OCTINTERP_API const char *LDFLAGS;
+    extern OCTINTERP_API const char *LD_STATIC_FLAG;
+    extern OCTINTERP_API const char *LEXLIB;
+    extern OCTINTERP_API const char *LEX;
+    extern OCTINTERP_API const char *LFLAGS;
+    extern OCTINTERP_API const char *LIBOCTAVE;
+    extern OCTINTERP_API const char *LIBOCTINTERP;
+    extern OCTINTERP_API const char *LIBS;
+    extern OCTINTERP_API const char *LN_S;
+    extern OCTINTERP_API const char *MAGICK_CPPFLAGS;
+    extern OCTINTERP_API const char *MAGICK_LDFLAGS;
+    extern OCTINTERP_API const char *MAGICK_LIBS;
+    extern OCTINTERP_API const char *LLVM_CPPFLAGS;
+    extern OCTINTERP_API const char *LLVM_LDFLAGS;
+    extern OCTINTERP_API const char *LLVM_LIBS;
+    extern OCTINTERP_API const char *MKOCTFILE_DL_LDFLAGS;
+    extern OCTINTERP_API const char *OCTAVE_LINK_DEPS;
+    extern OCTINTERP_API const char *OCTAVE_LINK_OPTS;
+    extern OCTINTERP_API const char *OCTINCLUDEDIR;
+    extern OCTINTERP_API const char *OCTLIBDIR;
+    extern OCTINTERP_API const char *OCT_LINK_DEPS;
+    extern OCTINTERP_API const char *OCT_LINK_OPTS;
+    extern OCTINTERP_API const char *OPENGL_LIBS;
+    extern OCTINTERP_API const char *PCRE_CPPFLAGS;
+    extern OCTINTERP_API const char *PCRE_LDFLAGS;
+    extern OCTINTERP_API const char *PCRE_LIBS;
+    extern OCTINTERP_API const char *PREFIX;
+    extern OCTINTERP_API const char *PTHREAD_CFLAGS;
+    extern OCTINTERP_API const char *PTHREAD_LIBS;
+    extern OCTINTERP_API const char *QHULL_CPPFLAGS;
+    extern OCTINTERP_API const char *QHULL_LDFLAGS;
+    extern OCTINTERP_API const char *QHULL_LIBS;
+    extern OCTINTERP_API const char *QRUPDATE_CPPFLAGS;
+    extern OCTINTERP_API const char *QRUPDATE_LDFLAGS;
+    extern OCTINTERP_API const char *QRUPDATE_LIBS;
+    extern OCTINTERP_API const char *QT_CPPFLAGS;
+    extern OCTINTERP_API const char *QT_LDFLAGS;
+    extern OCTINTERP_API const char *QT_LIBS;
+    extern OCTINTERP_API const char *QT_OPENGL_LIBS;
+    extern OCTINTERP_API const char *RANLIB;
+    extern OCTINTERP_API const char *RDYNAMIC_FLAG;
+    extern OCTINTERP_API const char *READLINE_LIBS;
+    extern OCTINTERP_API const char *SHARED_LIBS;
+    extern OCTINTERP_API const char *SH_LDFLAGS;
+    extern OCTINTERP_API const char *STATIC_LIBS;
+    extern OCTINTERP_API const char *SUITESPARSECONFIG_LIBS;
+    extern OCTINTERP_API const char *SUNDIALS_IDA_CPPFLAGS;
+    extern OCTINTERP_API const char *SUNDIALS_IDA_LDFLAGS;
+    extern OCTINTERP_API const char *SUNDIALS_IDA_LIBS;
+    extern OCTINTERP_API const char *SUNDIALS_NVECSERIAL_CPPFLAGS;
+    extern OCTINTERP_API const char *SUNDIALS_NVECSERIAL_LDFLAGS;
+    extern OCTINTERP_API const char *SUNDIALS_NVECSERIAL_LIBS;
+    extern OCTINTERP_API const char *SUNDIALS_SUNLINSOLKLU_CPPFLAGS;
+    extern OCTINTERP_API const char *SUNDIALS_SUNLINSOLKLU_LDFLAGS;
+    extern OCTINTERP_API const char *SUNDIALS_SUNLINSOLKLU_LIBS;
+    extern OCTINTERP_API const char *TERM_LIBS;
+    extern OCTINTERP_API const char *UMFPACK_CPPFLAGS;
+    extern OCTINTERP_API const char *UMFPACK_LDFLAGS;
+    extern OCTINTERP_API const char *UMFPACK_LIBS;
+    extern OCTINTERP_API const char *WARN_CFLAGS;
+    extern OCTINTERP_API const char *WARN_CXXFLAGS;
+    extern OCTINTERP_API const char *X11_INCFLAGS;
+    extern OCTINTERP_API const char *X11_LIBS;
+    extern OCTINTERP_API const char *XTRA_CFLAGS;
+    extern OCTINTERP_API const char *XTRA_CXXFLAGS;
+    extern OCTINTERP_API const char *YACC;
+    extern OCTINTERP_API const char *YFLAGS;
+    extern OCTINTERP_API const char *Z_CPPFLAGS;
+    extern OCTINTERP_API const char *Z_LDFLAGS;
+    extern OCTINTERP_API const char *Z_LIBS;
+    extern OCTINTERP_API const char *config_opts;
   }
 }