Mercurial > hg > octave-nkf

changeset 3584:aa31644d9779

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2000-02-07 09:24:38 by jwe]
author jwe
date Mon, 07 Feb 2000 09:24:41 +0000
parents 78827ee3508f
children d9803711e047
files ChangeLog Makeconf.in src/ChangeLog src/defaults.h.in src/help.cc src/oct-conf.h.in src/pager.cc src/pt-except.cc src/toplev.cc src/version.h
diffstat 10 files changed, 501 insertions(+), 182 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-02-07  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* Makeconf.in (do-subst-default-vals, do-subst-config-vals):
+	Substitute more complete set of values.
+
 2000-02-01  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* aclocal.m4 (octave_cv_string_npos): Add std:: qualifier.
--- a/Makeconf.in
+++ b/Makeconf.in
@@ -315,66 +315,110 @@
 define do-subst-config-vals
 echo "making $@ from $<"
 sed < $< \
-  -e "s;%BUG_CXXFLAGS%;\"${BUG_CXXFLAGS}\";" \
-  -e "s;%CC%;\"${CC}\";" \
-  -e "s;%CC_VERSION%;\"${CC_VERSION}\";" \
-  -e "s;%CFLAGS%;\"${BUG_CFLAGS}\";" \
-  -e "s;%CPICFLAG%;\"${CPICFLAG}\";" \
-  -e "s;%CPPFLAGS%;\"${CPPFLAGS}\";" \
-  -e "s;%CXX%;\"${CXX}\";" \
-  -e "s;%CXXFLAGS%;\"${CXXFLAGS}\";" \
-  -e "s;%CXXPICFLAG%;\"${CXXPICFLAG}\";" \
-  -e "s;%CXX_VERSION%;\"${CXX_VERSION}\";" \
-  -e "s;%F2C%;\"${F2C}\";" \
-  -e "s;%F2CFLAGS%;\"${F2CFLAGS}\";" \
-  -e "s;%F77%;\"${F77}\";" \
-  -e "s;%FFLAGS%;\"${FFLAGS}\";" \
-  -e "s;%FLIBS%;\"${FLIBS}\";" \
-  -e "s;%FPICFLAG%;\"${FPICFLAG}\";" \
-  -e "s;%INCFLAGS%;\"-I${octincludedir} -I${includedir}\";" \
-  -e "s;%LDFLAGS%;\"${LDFLAGS}\";" \
-  -e "s;%LEXLIB%;\"${LEXLIB}\";" \
-  -e "s;%LIBDLFCN%;\"${LIBDLFCN}\";" \
-  -e "s;%LIBGLOB%;\"${LIBGLOB}\";" \
-  -e "s;%LIBFLAGS%;\"-L${octlibdir}\";" \
-  -e "s;%LIBPLPLOT%;\"${LIBPLPLOT}\";" \
-  -e "s;%LIBS%;\"${LIBS}\";" \
-  -e "s;%RLD_FLAG%;\"${RLD_FLAG}\";" \
-  -e "s;%SH_LD%;\"${SH_LD}\";" \
-  -e "s;%SH_LDFLAGS%;\"${SH_LDFLAGS}\";" \
-  -e "s;%CANONICAL_HOST_TYPE%;\"${canonical_host_type}\";" \
-  -e "s;%TERMLIBS%;\"${TERMLIBS}\";" \
-  -e "s;%VERSION%;\"${version}\";" \
-  -e "s;%XTRA_CFLAGS%;\"${XTRA_CFLAGS}\";" \
-  -e "s;%XTRA_CXXFLAGS%;\"${XTRA_CXXFLAGS}\";" \
-  -e "s;%config_opts%;\"${config_opts}\";" | \
-  sed  -e "s;%DEFS%;\"${UGLY_DEFS}\";" > $@.tmp
+  -e "s;%OCTAVE_CONF_ALL_CFLAGS%;\"${ALL_CFLAGS}\";" \
+  -e "s;%OCTAVE_CONF_ALL_CXXFLAGS%;\"${ALL_CXXFLAGS}\";" \
+  -e "s;%OCTAVE_CONF_ALL_FFLAGS%;\"${ALL_FFLAGS}\";" \
+  -e "s;%OCTAVE_CONF_ALL_LDFLAGS%;\"${ALL_LDFLAGS}\";" \
+  -e "s;%OCTAVE_CONF_AR%;\"${AR}\";" \
+  -e "s;%OCTAVE_CONF_ARFLAGS%;\"${ARFLAGS}\";" \
+  -e "s;%OCTAVE_CONF_CC%;\"${CC}\";" \
+  -e "s;%OCTAVE_CONF_CC_VERSION%;\"${CC_VERSION}\";" \
+  -e "s;%OCTAVE_CONF_CFLAGS%;\"${CFLAGS}\";" \
+  -e "s;%OCTAVE_CONF_CPICFLAG%;\"${CPICFLAG}\";" \
+  -e "s;%OCTAVE_CONF_CPPFLAGS%;\"${CPPFLAGS}\";" \
+  -e "s;%OCTAVE_CONF_CXX%;\"${CXX}\";" \
+  -e "s;%OCTAVE_CONF_CXXCPP%;\"${CXXCPP}\";" \
+  -e "s;%OCTAVE_CONF_CXXFLAGS%;\"${CXXFLAGS}\";" \
+  -e "s;%OCTAVE_CONF_CXXPICFLAG%;\"${CXXPICFLAG}\";" \
+  -e "s;%OCTAVE_CONF_CXX_VERSION%;\"${CXX_VERSION}\";" \
+  -e "s;%OCTAVE_CONF_DEFAULT_PAGER%;\"${DEFAULT_PAGER}\";" \
+  -e "s;%OCTAVE_CONF_DLFCN_INCFLAGS%;\"${DLFCN_INCFLAGS}\";" \
+  -e "s;%OCTAVE_CONF_EXE%;\"${EXE}\";" \
+  -e "s;%OCTAVE_CONF_F2C%;\"${F2C}\";" \
+  -e "s;%OCTAVE_CONF_F2CFLAGS%;\"${F2CFLAGS}\";" \
+  -e "s;%OCTAVE_CONF_F77%;\"${F77}\";" \
+  -e "s;%OCTAVE_CONF_FC%;\"${FC}\";" \
+  -e "s;%OCTAVE_CONF_FFLAGS%;\"${FFLAGS}\";" \
+  -e "s;%OCTAVE_CONF_FLIBS%;\"${FLIBS}\";" \
+  -e "s;%OCTAVE_CONF_FORTRAN_MAIN_FLAG%;\"${FORTRAN_MAIN_FLAG}\";" \
+  -e "s;%OCTAVE_CONF_FPICFLAG%;\"${FPICFLAG}\";" \
+  -e "s;%OCTAVE_CONF_GLOB_INCFLAGS%;\"${GLOB_INCFLAGS}\";" \
+  -e "s;%OCTAVE_CONF_INCFLAGS%;\"${INCFLAGS}\";" \
+  -e "s;%OCTAVE_CONF_LDFLAGS%;\"${LDFLAGS}\";" \
+  -e "s;%OCTAVE_CONF_LD_STATIC_FLAG%;\"${LD_STATIC_FLAG}\";" \
+  -e "s;%OCTAVE_CONF_LEX%;\"${LEX}\";" \
+  -e "s;%OCTAVE_CONF_LEXLIB%;\"${LEXLIB}\";" \
+  -e "s;%OCTAVE_CONF_LFLAGS%;\"${LFLAGS}\";" \
+  -e "s;%OCTAVE_CONF_LIBCRUFT%;\"${LIBCRUFT}\";" \
+  -e "s;%OCTAVE_CONF_LIBDLFCN%;\"${LIBDLFCN}\";" \
+  -e "s;%OCTAVE_CONF_LIBEXT%;\"${LIBEXT}\";" \
+  -e "s;%OCTAVE_CONF_LIBFLAGS%;\"${LIBFLAGS}\";" \
+  -e "s;%OCTAVE_CONF_LIBGLOB%;\"${LIBGLOB}\";" \
+  -e "s;%OCTAVE_CONF_LIBKPATHSEA%;\"${LIBKPATHSEA}\";" \
+  -e "s;%OCTAVE_CONF_LIBOCTAVE%;\"${LIBOCTAVE}\";" \
+  -e "s;%OCTAVE_CONF_LIBOCTINTERP%;\"${LIBOCTINTERP}\";" \
+  -e "s;%OCTAVE_CONF_LIBPLPLOT%;\"${LIBPLPLOT}\";" \
+  -e "s;%OCTAVE_CONF_LIBREADLINE%;\"${LIBREADLINE}\";" \
+  -e "s;%OCTAVE_CONF_LIBS%;\"${LIBS}\";" \
+  -e "s;%OCTAVE_CONF_LN_S%;\"${LN_S}\";" \
+  -e "s;%OCTAVE_CONF_OCTAVE_LITE%;\"${OCTAVE_LITE}\";" \
+  -e "s;%OCTAVE_CONF_RANLIB%;\"${RANLIB}\";" \
+  -e "s;%OCTAVE_CONF_RDYNAMIC_FLAG%;\"${RDYNAMIC_FLAG}\";" \
+  -e "s;%OCTAVE_CONF_RLD_FLAG%;\"${RLD_FLAG}\";" \
+  -e "s;%OCTAVE_CONF_RUNTEST%;\"${RUNTEST}\";" \
+  -e "s;%OCTAVE_CONF_SHARED_LIBS%;\"${SHARED_LIBS}\";" \
+  -e "s;%OCTAVE_CONF_SHLEXT%;\"${SHLEXT}\";" \
+  -e "s;%OCTAVE_CONF_SHLEXT_VER%;\"${SHLEXT_VER}\";" \
+  -e "s;%OCTAVE_CONF_SH_LD%;\"${SH_LD}\";" \
+  -e "s;%OCTAVE_CONF_SH_LDFLAGS%;\"${SH_LDFLAGS}\";" \
+  -e "s;%OCTAVE_CONF_SONAME_FLAGS%;\"${SONAME_FLAGS}\";" \
+  -e "s;%OCTAVE_CONF_SPECIAL_MATH_LIB%;\"${SPECIAL_MATH_LIB}\";" \
+  -e "s;%OCTAVE_CONF_STATIC_LIBS%;\"${STATIC_LIBS}\";" \
+  -e "s;%OCTAVE_CONF_TERMLIBS%;\"${TERMLIBS}\";" \
+  -e "s;%OCTAVE_CONF_UGLY_DEFS%;\"${UGLY_DEFS}\";" \
+  -e "s;%OCTAVE_CONF_VERSION%;\"${version}\";" \
+  -e "s;%OCTAVE_CONF_WITH_DL%;\"${WITH_DL}\";" \
+  -e "s;%OCTAVE_CONF_WITH_DYNAMIC_LINKING%;\"${WITH_DYNAMIC_LINKING}\";" \
+  -e "s;%OCTAVE_CONF_WITH_SHL%;\"${WITH_SHL}\";" \
+  -e "s;%OCTAVE_CONF_XTRA_CFLAGS%;\"${XTRA_CFLAGS}\";" \
+  -e "s;%OCTAVE_CONF_XTRA_CXXFLAGS%;\"${XTRA_CXXFLAGS}\";" \
+  -e "s;%OCTAVE_CONF_YACC%;\"${YACC}\";" \
+  -e "s;%OCTAVE_CONF_YFLAGS%;\"${YFLAGS}\";" \
+  -e "s;%OCTAVE_CONF_config_opts%;\"${config_opts}\";" | \
+  sed  -e "s;%OCTAVE_CONF_DEFS%;\"${UGLY_DEFS}\";" > $@.tmp
 $(top_srcdir)/move-if-change $@.tmp $@
 endef
 
 define do-subst-default-vals
 echo "making $@ from $<"
 sed < $< > $@.tmp \
-  -e "s;%DEFAULT_PAGER%;\"${DEFAULT_PAGER}\";" \
   -e "s;%OCTAVE_ARCHLIBDIR%;\"${archlibdir}\";" \
   -e "s;%OCTAVE_BINDIR%;\"${bindir}\";" \
+  -e "s;%OCTAVE_CANONICAL_HOST_TYPE%;\"${canonical_host_type}\";" \
   -e "s;%OCTAVE_DATADIR%;\"${datadir}\";" \
-  -e "s;%OCTAVE_LIBEXECDIR%;\"${libexecdir}\";" \
+  -e "s;%OCTAVE_DEFAULT_PAGER%;\"${DEFAULT_PAGER}\";" \
   -e "s;%OCTAVE_EXEC_PREFIX%;\"${exec_prefix}\";" \
   -e "s;%OCTAVE_FCNFILEDIR%;\"${fcnfiledir}\";" \
   -e "s;%OCTAVE_FCNFILEPATH%;\"${fcnfilepath}\";" \
+  -e "s;%OCTAVE_IMAGEDIR%;\"${imagedir}\";" \
   -e "s;%OCTAVE_IMAGEPATH%;\"${imagepath}\";" \
+  -e "s;%OCTAVE_INCLUDEDIR%;\"${includedir}\";" \
   -e "s;%OCTAVE_INFODIR%;\"${infodir}\";" \
   -e "s;%OCTAVE_INFOFILE%;\"${infofile}\";" \
   -e "s;%OCTAVE_LIBDIR%;\"${libdir}\";" \
-  -e "s;%OCTAVE_OCTLIBDIR%;\"${octlibdir}\";" \
+  -e "s;%OCTAVE_LIBEXECDIR%;\"${libexecdir}\";" \
   -e "s;%OCTAVE_LOCALARCHLIBDIR%;\"${localarchlibdir}\";" \
   -e "s;%OCTAVE_LOCALFCNFILEDIR%;\"${localfcnfiledir}\";" \
   -e "s;%OCTAVE_LOCALFCNFILEPATH%;\"${localfcnfilepath}\";" \
+  -e "s;%OCTAVE_LOCALOCTFILEDIR%;\"${localoctfiledir}\";" \
   -e "s;%OCTAVE_LOCALOCTFILEPATH%;\"${localoctfilepath}\";" \
+  -e "s;%OCTAVE_MAN1DIR%;\"${man1dir}\";" \
+  -e "s;%OCTAVE_MAN1EXT%;\"${man1ext}\";" \
+  -e "s;%OCTAVE_MANDIR%;\"${mandir}\";" \
   -e "s;%OCTAVE_OCTFILEDIR%;\"${octfiledir}\";" \
-  -e "s;%OCTAVE_PREFIX%;\"${prefix}\";" \
-  -e "s;%CANONICAL_HOST_TYPE%;\"${canonical_host_type}\";"
+  -e "s;%OCTAVE_OCTINCLUDEDIR%;\"${octincludedir}\";" \
+  -e "s;%OCTAVE_OCTLIBDIR%;\"${octlibdir}\";" \
+  -e "s;%OCTAVE_PREFIX%;\"${prefix}\";"
 $(top_srcdir)/move-if-change $@.tmp $@
 endef
 
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,17 @@
+2000-02-07  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* pt-except.cc (tree_try_catch_command::eval): Only restore
+	buffer_error_message value (by running the unwind_protect element
+	for it) if it has been saved.
+
+	* help.cc (Ftype): Return value if nargout is NOT equal to zero.
+	Delete unnecessary unwind_protect::begin_frame().
+
+	* toplev.cc (octave_config_info): Stuff lots of new config info in
+	the struct.
+
+	* oct-conf.h.in: Delete TARGET_HOST_TYPE.
+
 2000-02-04  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* siglist.c: Include <signal.h>.
--- a/src/defaults.h.in
+++ b/src/defaults.h.in
@@ -28,36 +28,48 @@
 
 #include "pathsearch.h"
 
-#ifndef DEFAULT_PAGER
-#define DEFAULT_PAGER %DEFAULT_PAGER%
+#ifndef OCTAVE_CANONICAL_HOST_TYPE
+#define OCTAVE_CANONICAL_HOST_TYPE %OCTAVE_CANONICAL_HOST_TYPE%
+#endif
+
+#ifndef OCTAVE_DEFAULT_PAGER
+#define OCTAVE_DEFAULT_PAGER %OCTAVE_DEFAULT_PAGER%
 #endif
 
-#ifndef OCTAVE_PREFIX
-#define OCTAVE_PREFIX %OCTAVE_PREFIX%
+#ifndef OCTAVE_ARCHLIBDIR
+#define OCTAVE_ARCHLIBDIR %OCTAVE_ARCHLIBDIR%
+#endif
+
+#ifndef OCTAVE_BINDIR
+#define OCTAVE_BINDIR %OCTAVE_BINDIR%
+#endif
+
+#ifndef OCTAVE_DATADIR
+#define OCTAVE_DATADIR %OCTAVE_DATADIR%
 #endif
 
 #ifndef OCTAVE_EXEC_PREFIX
 #define OCTAVE_EXEC_PREFIX %OCTAVE_EXEC_PREFIX%
 #endif
 
-#ifndef OCTAVE_DATADIR
-#define OCTAVE_DATADIR %OCTAVE_DATADIR%
+#ifndef OCTAVE_FCNFILEDIR
+#define OCTAVE_FCNFILEDIR %OCTAVE_FCNFILEDIR%
 #endif
 
-#ifndef OCTAVE_LIBEXECDIR
-#define OCTAVE_LIBEXECDIR %OCTAVE_LIBEXECDIR%
+#ifndef OCTAVE_FCNFILEPATH
+#define OCTAVE_FCNFILEPATH %OCTAVE_FCNFILEPATH%
 #endif
 
-#ifndef OCTAVE_LIBDIR
-#define OCTAVE_LIBDIR %OCTAVE_LIBDIR%
+#ifndef OCTAVE_IMAGEDIR
+#define OCTAVE_IMAGEDIR %OCTAVE_IMAGEDIR%
 #endif
 
-#ifndef OCTAVE_OCTLIBDIR
-#define OCTAVE_OCTLIBDIR %OCTAVE_OCTLIBDIR%
+#ifndef OCTAVE_IMAGEPATH
+#define OCTAVE_IMAGEPATH %OCTAVE_IMAGEPATH%
 #endif
 
-#ifndef OCTAVE_BINDIR
-#define OCTAVE_BINDIR %OCTAVE_BINDIR%
+#ifndef OCTAVE_INCLUDEDIR
+#define OCTAVE_INCLUDEDIR %OCTAVE_INCLUDEDIR%
 #endif
 
 #ifndef OCTAVE_INFODIR
@@ -68,52 +80,72 @@
 #define OCTAVE_INFOFILE %OCTAVE_INFOFILE%
 #endif
 
-#ifndef OCTAVE_FCNFILEDIR
-#define OCTAVE_FCNFILEDIR %OCTAVE_FCNFILEDIR%
+#ifndef OCTAVE_LIBDIR
+#define OCTAVE_LIBDIR %OCTAVE_LIBDIR%
+#endif
+
+#ifndef OCTAVE_LIBEXECDIR
+#define OCTAVE_LIBEXECDIR %OCTAVE_LIBEXECDIR%
+#endif
+
+#ifndef OCTAVE_LIBEXECDIR
+#define OCTAVE_LIBEXECDIR %OCTAVE_LIBEXECDIR%
+#endif
+
+#ifndef OCTAVE_LOCALARCHLIBDIR
+#define OCTAVE_LOCALARCHLIBDIR %OCTAVE_LOCALARCHLIBDIR%
 #endif
 
 #ifndef OCTAVE_LOCALFCNFILEDIR
 #define OCTAVE_LOCALFCNFILEDIR %OCTAVE_LOCALFCNFILEDIR%
 #endif
 
-#ifndef OCTAVE_LOCALSTARTUPFILEDIR
-#define OCTAVE_LOCALSTARTUPFILEDIR OCTAVE_LOCALFCNFILEDIR "/startup"
-#endif
-
-#ifndef OCTAVE_STARTUPFILEDIR
-#define OCTAVE_STARTUPFILEDIR OCTAVE_FCNFILEDIR "/startup"
-#endif
-
 #ifndef OCTAVE_LOCALFCNFILEPATH
 #define OCTAVE_LOCALFCNFILEPATH %OCTAVE_LOCALFCNFILEPATH%
 #endif
 
-#ifndef OCTAVE_ARCHLIBDIR
-#define OCTAVE_ARCHLIBDIR %OCTAVE_ARCHLIBDIR%
+#ifndef OCTAVE_LOCALOCTFILEDIR
+#define OCTAVE_LOCALOCTFILEDIR %OCTAVE_LOCALOCTFILEDIR%
+#endif
+
+#ifndef OCTAVE_LOCALOCTFILEPATH
+#define OCTAVE_LOCALOCTFILEPATH %OCTAVE_LOCALOCTFILEPATH%
 #endif
 
-#ifndef OCTAVE_LOCALARCHLIBDIR
-#define OCTAVE_LOCALARCHLIBDIR %OCTAVE_LOCALARCHLIBDIR%
+#ifndef OCTAVE_LOCALSTARTUPFILEDIR
+#define OCTAVE_LOCALSTARTUPFILEDIR OCTAVE_LOCALFCNFILEDIR "/startup"
+#endif
+
+#ifndef OCTAVE_MAN1DIR
+#define OCTAVE_MAN1DIR %OCTAVE_MAN1DIR%
+#endif
+
+#ifndef OCTAVE_MAN1EXT
+#define OCTAVE_MAN1EXT %OCTAVE_MAN1EXT%
+#endif
+
+#ifndef OCTAVE_MANDIR
+#define OCTAVE_MANDIR %OCTAVE_MANDIR%
 #endif
 
 #ifndef OCTAVE_OCTFILEDIR
 #define OCTAVE_OCTFILEDIR %OCTAVE_OCTFILEDIR%
 #endif
 
-#ifndef OCTAVE_LOCALOCTFILEPATH
-#define OCTAVE_LOCALOCTFILEPATH %OCTAVE_LOCALOCTFILEPATH%
+#ifndef OCTAVE_OCTINCLUDEDIR
+#define OCTAVE_OCTINCLUDEDIR %OCTAVE_OCTINCLUDEDIR%
 #endif
 
-#ifndef OCTAVE_FCNFILEPATH
-#define OCTAVE_FCNFILEPATH %OCTAVE_FCNFILEPATH%
+#ifndef OCTAVE_OCTLIBDIR
+#define OCTAVE_OCTLIBDIR %OCTAVE_OCTLIBDIR%
 #endif
 
-#ifndef OCTAVE_IMAGEPATH
-#define OCTAVE_IMAGEPATH %OCTAVE_IMAGEPATH%
+#ifndef OCTAVE_PREFIX
+#define OCTAVE_PREFIX %OCTAVE_PREFIX%
 #endif
 
-#ifndef CANONICAL_HOST_TYPE
-#define CANONICAL_HOST_TYPE %CANONICAL_HOST_TYPE%
+#ifndef OCTAVE_STARTUPFILEDIR
+#define OCTAVE_STARTUPFILEDIR OCTAVE_FCNFILEDIR "/startup"
 #endif
 
 extern std::string Voctave_home;
--- a/src/help.cc
+++ b/src/help.cc
@@ -62,7 +62,6 @@
 #include "symtab.h"
 #include "syswait.h"
 #include "toplev.h"
-#include "unwind-prot.h"
 #include "utils.h"
 #include "variables.h"
 #include "version.h"
@@ -612,7 +611,7 @@
       buf << "sed -e 's/^[#%]+ *//' -e 's/^ *@/@/' | makeinfo"
 	  << " -D \"VERSION " << OCTAVE_VERSION << "\""
 	  << " -D \"OCTAVEHOME " << OCTAVE_PREFIX << "\""
-	  << " -D \"TARGETHOSTTYPE " << CANONICAL_HOST_TYPE << "\""
+	  << " -D \"TARGETHOSTTYPE " << OCTAVE_CANONICAL_HOST_TYPE << "\""
 	  << " --fill-column " << cols
 	  << " --no-warn"
 	  << " --no-validate"
@@ -850,9 +849,7 @@
 representation.  This problem may be fixed in a future release.\n\
 @end deffn")
 {
-  octave_value_list retval;
-
-  unwind_protect::begin_frame ("Ftype");
+  octave_value retval;
 
   int argc = args.length () + 1;
 
@@ -896,7 +893,7 @@
 		    goto abort;
 		}
 
-	      if (nargout == 0)
+	      if (nargout != 0)
 		{
 		  output_buf << std::ends;
 
--- a/src/oct-conf.h.in
+++ b/src/oct-conf.h.in
@@ -24,112 +24,284 @@
 #if !defined (octave_conf_h)
 #define octave_conf_h 1
 
-#ifndef config_opts
-#define config_opts %config_opts%
+#ifndef OCTAVE_CONF_ALL_CFLAGS
+#define OCTAVE_CONF_ALL_CFLAGS %OCTAVE_CONF_ALL_CFLAGS%
+#endif
+
+#ifndef OCTAVE_CONF_ALL_CXXFLAGS
+#define OCTAVE_CONF_ALL_CXXFLAGS %OCTAVE_CONF_ALL_CXXFLAGS%
+#endif
+
+#ifndef OCTAVE_CONF_ALL_FFLAGS
+#define OCTAVE_CONF_ALL_FFLAGS %OCTAVE_CONF_ALL_FFLAGS%
 #endif
 
-#ifndef TARGET_HOST_TYPE
-#define TARGET_HOST_TYPE %TARGET_HOST_TYPE%
+#ifndef OCTAVE_CONF_ALL_LDFLAGS
+#define OCTAVE_CONF_ALL_LDFLAGS %OCTAVE_CONF_ALL_LDFLAGS%
+#endif
+
+#ifndef OCTAVE_CONF_ARFLAGS
+#define OCTAVE_CONF_ARFLAGS %OCTAVE_CONF_ARFLAGS%
+#endif
+
+#ifndef OCTAVE_CONF_AR
+#define OCTAVE_CONF_AR %OCTAVE_CONF_AR%
+#endif
+
+#ifndef OCTAVE_CONF_CC
+#define OCTAVE_CONF_CC %OCTAVE_CONF_CC%
 #endif
 
-#ifndef F77
-#define F77 %F77%
+#ifndef OCTAVE_CONF_CC_VERSION
+#define OCTAVE_CONF_CC_VERSION %OCTAVE_CONF_CC_VERSION%
+#endif
+
+#ifndef OCTAVE_CONF_CFLAGS
+#define OCTAVE_CONF_CFLAGS %OCTAVE_CONF_CFLAGS%
+#endif
+
+#ifndef OCTAVE_CONF_CPICFLAG
+#define OCTAVE_CONF_CPICFLAG %OCTAVE_CONF_CPICFLAG%
+#endif
+
+#ifndef OCTAVE_CONF_CPPFLAGS
+#define OCTAVE_CONF_CPPFLAGS %OCTAVE_CONF_CPPFLAGS%
 #endif
 
-#ifndef FFLAGS
-#define FFLAGS %FFLAGS%
+#ifndef OCTAVE_CONF_CXXCPP
+#define OCTAVE_CONF_CXXCPP %OCTAVE_CONF_CXXCPP%
+#endif
+
+#ifndef OCTAVE_CONF_CXXFLAGS
+#define OCTAVE_CONF_CXXFLAGS %OCTAVE_CONF_CXXFLAGS%
 #endif
 
-#ifndef FPICFLAG
-#define FPICFLAG %FPICFLAG%
+#ifndef OCTAVE_CONF_CXXPICFLAG
+#define OCTAVE_CONF_CXXPICFLAG %OCTAVE_CONF_CXXPICFLAG%
 #endif
 
-#ifndef F2C
-#define F2C %F2C%
+#ifndef OCTAVE_CONF_CXX
+#define OCTAVE_CONF_CXX %OCTAVE_CONF_CXX%
+#endif
+
+#ifndef OCTAVE_CONF_CXX_VERSION
+#define OCTAVE_CONF_CXX_VERSION %OCTAVE_CONF_CXX_VERSION%
 #endif
 
-#ifndef F2CFLAGS
-#define F2CFLAGS %F2CFLAGS%
+#ifndef OCTAVE_CONF_DEFAULT_PAGER
+#define OCTAVE_CONF_DEFAULT_PAGER %OCTAVE_CONF_DEFAULT_PAGER%
+#endif
+
+#ifndef OCTAVE_CONF_DEFS
+#define OCTAVE_CONF_DEFS %OCTAVE_CONF_DEFS%
+#endif
+
+#ifndef OCTAVE_CONF_DLFCN_INCFLAGS
+#define OCTAVE_CONF_DLFCN_INCFLAGS %OCTAVE_CONF_DLFCN_INCFLAGS%
 #endif
 
-#ifndef FLIBS
-#define FLIBS %FLIBS%
+#ifndef OCTAVE_CONF_EXE
+#define OCTAVE_CONF_EXE %OCTAVE_CONF_EXE%
+#endif
+
+#ifndef OCTAVE_CONF_F2CFLAGS
+#define OCTAVE_CONF_F2CFLAGS %OCTAVE_CONF_F2CFLAGS%
 #endif
 
-#ifndef CPPFLAGS
-#define CPPFLAGS %CPPFLAGS%
+#ifndef OCTAVE_CONF_F2C
+#define OCTAVE_CONF_F2C %OCTAVE_CONF_F2C%
+#endif
+
+#ifndef OCTAVE_CONF_F77
+#define OCTAVE_CONF_F77 %OCTAVE_CONF_F77%
+#endif
+
+#ifndef OCTAVE_CONF_FC
+#define OCTAVE_CONF_FC %OCTAVE_CONF_FC%
 #endif
 
-#ifndef INCFLAGS
-#define INCFLAGS %INCFLAGS%
+#ifndef OCTAVE_CONF_FFLAGS
+#define OCTAVE_CONF_FFLAGS %OCTAVE_CONF_FFLAGS%
+#endif
+
+#ifndef OCTAVE_CONF_FLIBS
+#define OCTAVE_CONF_FLIBS %OCTAVE_CONF_FLIBS%
+#endif
+
+#ifndef OCTAVE_CONF_FORTRAN_MAIN_FLAG
+#define OCTAVE_CONF_FORTRAN_MAIN_FLAG %OCTAVE_CONF_FORTRAN_MAIN_FLAG%
+#endif
+
+#ifndef OCTAVE_CONF_FPICFLAG
+#define OCTAVE_CONF_FPICFLAG %OCTAVE_CONF_FPICFLAG%
 #endif
 
-#ifndef CC
-#define CC %CC%
+#ifndef OCTAVE_CONF_GLOB_INCFLAGS
+#define OCTAVE_CONF_GLOB_INCFLAGS %OCTAVE_CONF_GLOB_INCFLAGS%
+#endif
+
+#ifndef OCTAVE_CONF_INCFLAGS
+#define OCTAVE_CONF_INCFLAGS %OCTAVE_CONF_INCFLAGS%
 #endif
 
-#ifndef CC_VERSION
-#define CC_VERSION %CC_VERSION%
+#ifndef OCTAVE_CONF_LDFLAGS
+#define OCTAVE_CONF_LDFLAGS %OCTAVE_CONF_LDFLAGS%
 #endif
 
-#ifndef CFLAGS
-#define CFLAGS %CFLAGS%
+#ifndef OCTAVE_CONF_LD_STATIC_FLAG
+#define OCTAVE_CONF_LD_STATIC_FLAG %OCTAVE_CONF_LD_STATIC_FLAG%
+#endif
+
+#ifndef OCTAVE_CONF_LEXLIB
+#define OCTAVE_CONF_LEXLIB %OCTAVE_CONF_LEXLIB%
+#endif
+
+#ifndef OCTAVE_CONF_LEX
+#define OCTAVE_CONF_LEX %OCTAVE_CONF_LEX%
 #endif
 
-#ifndef CPICFLAG
-#define CPICFLAG %CPICFLAG%
+#ifndef OCTAVE_CONF_LFLAGS
+#define OCTAVE_CONF_LFLAGS %OCTAVE_CONF_LFLAGS%
+#endif
+
+#ifndef OCTAVE_CONF_LIBCRUFT
+#define OCTAVE_CONF_LIBCRUFT %OCTAVE_CONF_LIBCRUFT%
+#endif
+
+#ifndef OCTAVE_CONF_LIBDLFCN
+#define OCTAVE_CONF_LIBDLFCN %OCTAVE_CONF_LIBDLFCN%
 #endif
 
-#ifndef CXX
-#define CXX %CXX%
+#ifndef OCTAVE_CONF_LIBEXT
+#define OCTAVE_CONF_LIBEXT %OCTAVE_CONF_LIBEXT%
+#endif
+
+#ifndef OCTAVE_CONF_LIBFLAGS
+#define OCTAVE_CONF_LIBFLAGS %OCTAVE_CONF_LIBFLAGS%
+#endif
+
+#ifndef OCTAVE_CONF_LIBGLOB
+#define OCTAVE_CONF_LIBGLOB %OCTAVE_CONF_LIBGLOB%
+#endif
+
+#ifndef OCTAVE_CONF_LIBKPATHSEA
+#define OCTAVE_CONF_LIBKPATHSEA %OCTAVE_CONF_LIBKPATHSEA%
+#endif
+
+#ifndef OCTAVE_CONF_LIBOCTAVE
+#define OCTAVE_CONF_LIBOCTAVE %OCTAVE_CONF_LIBOCTAVE%
 #endif
 
-#ifndef CXX_VERSION
-#define CXX_VERSION %CXX_VERSION%
+#ifndef OCTAVE_CONF_LIBOCTINTERP
+#define OCTAVE_CONF_LIBOCTINTERP %OCTAVE_CONF_LIBOCTINTERP%
+#endif
+
+#ifndef OCTAVE_CONF_LIBPLPLOT
+#define OCTAVE_CONF_LIBPLPLOT %OCTAVE_CONF_LIBPLPLOT%
+#endif
+
+#ifndef OCTAVE_CONF_LIBREADLINE
+#define OCTAVE_CONF_LIBREADLINE %OCTAVE_CONF_LIBREADLINE%
+#endif
+
+#ifndef OCTAVE_CONF_LIBS
+#define OCTAVE_CONF_LIBS %OCTAVE_CONF_LIBS%
 #endif
 
-#ifndef CXXFLAGS
-#define CXXFLAGS %BUG_CXXFLAGS%
+#ifndef OCTAVE_CONF_LN_S
+#define OCTAVE_CONF_LN_S %OCTAVE_CONF_LN_S%
+#endif
+
+#ifndef OCTAVE_CONF_OCTAVE_LITE
+#define OCTAVE_CONF_OCTAVE_LITE %OCTAVE_CONF_OCTAVE_LITE%
 #endif
 
-#ifndef CXXPICFLAG
-#define CXXPICFLAG %CXXPICFLAG%
+#ifndef OCTAVE_CONF_RANLIB
+#define OCTAVE_CONF_RANLIB %OCTAVE_CONF_RANLIB%
 #endif
 
-#ifndef LDFLAGS
-#define LDFLAGS %LDFLAGS%
+#ifndef OCTAVE_CONF_RDYNAMIC_FLAG
+#define OCTAVE_CONF_RDYNAMIC_FLAG %OCTAVE_CONF_RDYNAMIC_FLAG%
+#endif
+
+#ifndef OCTAVE_CONF_RLD_FLAG
+#define OCTAVE_CONF_RLD_FLAG %OCTAVE_CONF_RLD_FLAG%
 #endif
 
-#ifndef LIBFLAGS
-#define LIBFLAGS %LIBFLAGS%
+#ifndef OCTAVE_CONF_RUNTEST
+#define OCTAVE_CONF_RUNTEST %OCTAVE_CONF_RUNTEST%
+#endif
+
+#ifndef OCTAVE_CONF_SHARED_LIBS
+#define OCTAVE_CONF_SHARED_LIBS %OCTAVE_CONF_SHARED_LIBS%
+#endif
+
+#ifndef OCTAVE_CONF_SHLEXT
+#define OCTAVE_CONF_SHLEXT %OCTAVE_CONF_SHLEXT%
+#endif
+
+#ifndef OCTAVE_CONF_SHLEXT_VER
+#define OCTAVE_CONF_SHLEXT_VER %OCTAVE_CONF_SHLEXT_VER%
 #endif
 
-#ifndef RLD_FLAG
-#define RLD_FLAG %RLD_FLAG%
+#ifndef OCTAVE_CONF_SH_LDFLAGS
+#define OCTAVE_CONF_SH_LDFLAGS %OCTAVE_CONF_SH_LDFLAGS%
+#endif
+
+#ifndef OCTAVE_CONF_SH_LD
+#define OCTAVE_CONF_SH_LD %OCTAVE_CONF_SH_LD%
 #endif
 
-#ifndef TERMLIBS
-#define TERMLIBS %TERMLIBS%
+#ifndef OCTAVE_CONF_SONAME_FLAGS
+#define OCTAVE_CONF_SONAME_FLAGS %OCTAVE_CONF_SONAME_FLAGS%
+#endif
+
+#ifndef OCTAVE_CONF_SPECIAL_MATH_LIB
+#define OCTAVE_CONF_SPECIAL_MATH_LIB %OCTAVE_CONF_SPECIAL_MATH_LIB%
+#endif
+
+#ifndef OCTAVE_CONF_STATIC_LIBS
+#define OCTAVE_CONF_STATIC_LIBS %OCTAVE_CONF_STATIC_LIBS%
 #endif
 
-#ifndef LIBS
-#define LIBS %LIBS%
+#ifndef OCTAVE_CONF_TERMLIBS
+#define OCTAVE_CONF_TERMLIBS %OCTAVE_CONF_TERMLIBS%
 #endif
 
-#ifndef LEXLIB
-#define LEXLIB %LEXLIB%
+#ifndef OCTAVE_CONF_UGLY_DEFS
+#define OCTAVE_CONF_UGLY_DEFS %OCTAVE_CONF_UGLY_DEFS%
+#endif
+
+#ifndef OCTAVE_CONF_WITH_DL
+#define OCTAVE_CONF_WITH_DL %OCTAVE_CONF_WITH_DL%
+#endif
+
+#ifndef OCTAVE_CONF_WITH_DYNAMIC_LINKING
+#define OCTAVE_CONF_WITH_DYNAMIC_LINKING %OCTAVE_CONF_WITH_DYNAMIC_LINKING%
 #endif
 
-#ifndef LIBPLPLOT
-#define LIBPLPLOT %LIBPLPLOT%
+#ifndef OCTAVE_CONF_WITH_SHL
+#define OCTAVE_CONF_WITH_SHL %OCTAVE_CONF_WITH_SHL%
+#endif
+
+#ifndef OCTAVE_CONF_XTRA_CFLAGS
+#define OCTAVE_CONF_XTRA_CFLAGS %OCTAVE_CONF_XTRA_CFLAGS%
 #endif
 
-#ifndef LIBDLFCN
-#define LIBDLFCN %LIBDLFCN%
+#ifndef OCTAVE_CONF_XTRA_CXXFLAGS
+#define OCTAVE_CONF_XTRA_CXXFLAGS %OCTAVE_CONF_XTRA_CXXFLAGS%
 #endif
 
-#ifndef DEFS
-#define DEFS %DEFS%
+#ifndef OCTAVE_CONF_YACC
+#define OCTAVE_CONF_YACC %OCTAVE_CONF_YACC%
+#endif
+
+#ifndef OCTAVE_CONF_YFLAGS
+#define OCTAVE_CONF_YFLAGS %OCTAVE_CONF_YFLAGS%
+#endif
+
+#ifndef OCTAVE_CONF_config_opts
+#define OCTAVE_CONF_config_opts %OCTAVE_CONF_config_opts%
 #endif
 
 #endif
--- a/src/pager.cc
+++ b/src/pager.cc
@@ -496,10 +496,10 @@
 {
   std::string pager_binary = octave_env::getenv ("PAGER");
 
-#ifdef DEFAULT_PAGER
+#ifdef OCTAVE_DEFAULT_PAGER
   if (pager_binary.empty ())
     {
-      pager_binary = std::string (DEFAULT_PAGER);
+      pager_binary = std::string (OCTAVE_DEFAULT_PAGER);
 
       if (pager_binary == "less")
 	{
--- a/src/pt-except.cc
+++ b/src/pt-except.cc
@@ -100,7 +100,8 @@
       unwind_protect::discard ();
 
       // For restoring buffer_error_messages.
-      unwind_protect::run ();
+      if (catch_code)
+	unwind_protect::run ();
     }
 }
 
--- a/src/toplev.cc
+++ b/src/toplev.cc
@@ -227,10 +227,10 @@
 
   std::string msg;
 
-  if (strcmp (CANONICAL_HOST_TYPE, "unknown") == 0)
+  if (strcmp (OCTAVE_CANONICAL_HOST_TYPE, "unknown") == 0)
     msg = "Hi Dave, I'm a HAL-9000";
   else
-    msg = CANONICAL_HOST_TYPE;
+    msg = OCTAVE_CANONICAL_HOST_TYPE;
 
   if (nargout == 0)
     octave_stdout << msg << "\n";
@@ -606,52 +606,106 @@
 
   Octave_map m;
 
-  // XXX FIXME XXX -- should we perform OCTAVE_HOME substitution on these?
-
-  m ["default_pager"] = DEFAULT_PAGER;
-  m ["prefix"] = OCTAVE_PREFIX;
-  m ["exec_prefix"] = OCTAVE_EXEC_PREFIX;
+  m ["ALL_CFLAGS"] = OCTAVE_CONF_ALL_CFLAGS;
+  m ["ALL_CXXFLAGS"] = OCTAVE_CONF_ALL_CXXFLAGS;
+  m ["ALL_FFLAGS"] = OCTAVE_CONF_ALL_FFLAGS;
+  m ["ALL_LDFLAGS"] = OCTAVE_CONF_ALL_LDFLAGS;
+  m ["AR"] = OCTAVE_CONF_AR;
+  m ["ARFLAGS"] = OCTAVE_CONF_ARFLAGS;
+  m ["CC"] = OCTAVE_CONF_CC;
+  m ["CC_VERSION"] = OCTAVE_CONF_CC_VERSION;
+  m ["CFLAGS"] = OCTAVE_CONF_CFLAGS;
+  m ["CPICFLAG"] = OCTAVE_CONF_CPICFLAG;
+  m ["CPPFLAGS"] = OCTAVE_CONF_CPPFLAGS;
+  m ["CXX"] = OCTAVE_CONF_CXX;
+  m ["CXXCPP"] = OCTAVE_CONF_CXXCPP;
+  m ["CXXFLAGS"] = OCTAVE_CONF_CXXFLAGS;
+  m ["CXXPICFLAG"] = OCTAVE_CONF_CXXPICFLAG;
+  m ["CXX_VERSION"] = OCTAVE_CONF_CXX_VERSION;
+  m ["DEFAULT_PAGER"] = OCTAVE_DEFAULT_PAGER;
+  m ["DLFCN_INCFLAGS"] = OCTAVE_CONF_DLFCN_INCFLAGS;
+  m ["EXE"] = OCTAVE_CONF_EXE;
+  m ["F2C"] = OCTAVE_CONF_F2C;
+  m ["F2CFLAGS"] = OCTAVE_CONF_F2CFLAGS;
+  m ["F77"] = OCTAVE_CONF_F77;
+  m ["FC"] = OCTAVE_CONF_FC;
+  m ["FFLAGS"] = OCTAVE_CONF_FFLAGS;
+  m ["FLIBS"] = OCTAVE_CONF_FLIBS;
+  m ["FORTRAN_MAIN_FLAG"] = OCTAVE_CONF_FORTRAN_MAIN_FLAG;
+  m ["FPICFLAG"] = OCTAVE_CONF_FPICFLAG;
+  m ["GLOB_INCFLAGS"] = OCTAVE_CONF_GLOB_INCFLAGS;
+  m ["INCFLAGS"] = OCTAVE_CONF_INCFLAGS;
+  m ["LDFLAGS"] = OCTAVE_CONF_LDFLAGS;
+  m ["LD_STATIC_FLAG"] = OCTAVE_CONF_LD_STATIC_FLAG;
+  m ["LEX"] = OCTAVE_CONF_LEX;
+  m ["LEXLIB"] = OCTAVE_CONF_LEXLIB;
+  m ["LFLAGS"] = OCTAVE_CONF_LFLAGS;
+  m ["LIBCRUFT"] = OCTAVE_CONF_LIBCRUFT;
+  m ["LIBDLFCN"] = OCTAVE_CONF_LIBDLFCN;
+  m ["LIBEXT"] = OCTAVE_CONF_LIBEXT;
+  m ["LIBFLAGS"] = OCTAVE_CONF_LIBFLAGS;
+  m ["LIBGLOB"] = OCTAVE_CONF_LIBGLOB;
+  m ["LIBKPATHSEA"] = OCTAVE_CONF_LIBKPATHSEA;
+  m ["LIBOCTAVE"] = OCTAVE_CONF_LIBOCTAVE;
+  m ["LIBOCTINTERP"] = OCTAVE_CONF_LIBOCTINTERP;
+  m ["LIBPLPLOT"] = OCTAVE_CONF_LIBPLPLOT;
+  m ["LIBREADLINE"] = OCTAVE_CONF_LIBREADLINE;
+  m ["LIBS"] = OCTAVE_CONF_LIBS;
+  m ["LN_S"] = OCTAVE_CONF_LN_S;
+  m ["OCTAVE_LITE"] = OCTAVE_CONF_OCTAVE_LITE;
+  m ["RANLIB"] = OCTAVE_CONF_RANLIB;
+  m ["RDYNAMIC_FLAG"] = OCTAVE_CONF_RDYNAMIC_FLAG;
+  m ["RLD_FLAG"] = OCTAVE_CONF_RLD_FLAG;
+  m ["RUNTEST"] = OCTAVE_CONF_RUNTEST;
+  m ["SHARED_LIBS"] = OCTAVE_CONF_SHARED_LIBS;
+  m ["SHLEXT"] = OCTAVE_CONF_SHLEXT;
+  m ["SHLEXT_VER"] = OCTAVE_CONF_SHLEXT_VER;
+  m ["SH_LD"] = OCTAVE_CONF_SH_LD;
+  m ["SH_LDFLAGS"] = OCTAVE_CONF_SH_LDFLAGS;
+  m ["SONAME_FLAGS"] = OCTAVE_CONF_SONAME_FLAGS;
+  m ["SPECIAL_MATH_LIB"] = OCTAVE_CONF_SPECIAL_MATH_LIB;
+  m ["STATIC_LIBS"] = OCTAVE_CONF_STATIC_LIBS;
+  m ["TERMLIBS"] = OCTAVE_CONF_TERMLIBS;
+  m ["UGLY_DEFS"] = OCTAVE_CONF_DEFS;
+  m ["UGLY_DEFS"] = OCTAVE_CONF_UGLY_DEFS;
+  m ["WITH_DL"] = OCTAVE_CONF_WITH_DL;
+  m ["WITH_DYNAMIC_LINKING"] = OCTAVE_CONF_WITH_DYNAMIC_LINKING;
+  m ["WITH_SHL"] = OCTAVE_CONF_WITH_SHL;
+  m ["XTRA_CFLAGS"] = OCTAVE_CONF_XTRA_CFLAGS;
+  m ["XTRA_CXXFLAGS"] = OCTAVE_CONF_XTRA_CXXFLAGS;
+  m ["YACC"] = OCTAVE_CONF_YACC;
+  m ["YFLAGS"] = OCTAVE_CONF_YFLAGS;
+  m ["archlibdir"] = OCTAVE_ARCHLIBDIR;
+  m ["bindir"] = OCTAVE_BINDIR;
+  m ["canonical_host_type"] = OCTAVE_CANONICAL_HOST_TYPE;
+  m ["config_opts"] = OCTAVE_CONF_config_opts;
   m ["datadir"] = OCTAVE_DATADIR;
   m ["dld"] = static_cast<double> (octave_supports_dynamic_linking);
-  m ["libdir"] = OCTAVE_LIBDIR;
-  m ["bindir"] = OCTAVE_BINDIR;
-  m ["infodir"] = OCTAVE_INFODIR;
+  m ["exec_prefix"] = OCTAVE_EXEC_PREFIX;
   m ["fcnfiledir"] = OCTAVE_FCNFILEDIR;
-  m ["localfcnfiledir"] = OCTAVE_LOCALFCNFILEDIR;
-  m ["localstartupfiledir"] = OCTAVE_LOCALSTARTUPFILEDIR;
-  m ["startupfiledir"] = OCTAVE_STARTUPFILEDIR;
-  m ["localfcnfilepath"] = OCTAVE_LOCALFCNFILEPATH;
-  m ["archlibdir"] = OCTAVE_ARCHLIBDIR;
-  m ["localarchlibdir"] = OCTAVE_LOCALARCHLIBDIR;
-  m ["octfiledir"] = OCTAVE_OCTFILEDIR;
-  m ["localoctfilepath"] = OCTAVE_LOCALOCTFILEPATH;
   m ["fcnfilepath"] = OCTAVE_FCNFILEPATH;
+  m ["imagedir"] = OCTAVE_IMAGEDIR;
   m ["imagepath"] = OCTAVE_IMAGEPATH;
-  m ["canonical_host_type"] = CANONICAL_HOST_TYPE;
-  m ["configure_options"] = config_opts;
-  m ["F77"] = F77;
-  m ["FFLAGS"] = FFLAGS;
-  m ["FPICFLAG"] = FPICFLAG;
-  m ["F2C"] = F2C;
-  m ["F2CFLAGS"] = F2CFLAGS;
-  m ["FLIBS"] = FLIBS;
-  m ["CPPFLAGS"] = CPPFLAGS;
-  m ["INCFLAGS"] = INCFLAGS;
-  m ["CC"] = CC " " CC_VERSION;
-  m ["CFLAGS"] = CFLAGS;
-  m ["CPICFLAG"] = CPICFLAG;
-  m ["CXX"] = CXX " " CXX_VERSION;
-  m ["CXXFLAGS"] = CXXFLAGS;
-  m ["CXXPICFLAG"] = CXXPICFLAG;
-  m ["LDFLAGS"] = LDFLAGS;
-  m ["LIBFLAGS"] = LIBFLAGS;
-  m ["RLD_FLAG"] = RLD_FLAG;
-  m ["TERMLIBS"] = TERMLIBS;
-  m ["LIBS"] = LIBS;
-  m ["LEXLIB"] = LEXLIB;
-  m ["LIBPLPLOT"] = LIBPLPLOT;
-  m ["LIBDLFCN"] = LIBDLFCN;
-  m ["DEFS"] = DEFS;
+  m ["includedir"] = OCTAVE_INCLUDEDIR;
+  m ["infodir"] = OCTAVE_INFODIR;
+  m ["infofile"] = OCTAVE_INFOFILE;
+  m ["libdir"] = OCTAVE_LIBDIR;
+  m ["libexecdir"] = OCTAVE_LIBEXECDIR;
+  m ["localarchlibdir"] = OCTAVE_LOCALARCHLIBDIR;
+  m ["localfcnfiledir"] = OCTAVE_LOCALFCNFILEDIR;
+  m ["localfcnfilepath"] = OCTAVE_LOCALFCNFILEPATH;
+  m ["localoctfiledir"] = OCTAVE_LOCALOCTFILEDIR;
+  m ["localoctfilepath"] = OCTAVE_LOCALOCTFILEPATH;
+  m ["localstartupfiledir"] = OCTAVE_LOCALSTARTUPFILEDIR;
+  m ["man1dir"] = OCTAVE_MAN1DIR;
+  m ["man1ext"] = OCTAVE_MAN1EXT;
+  m ["mandir"] = OCTAVE_MANDIR;
+  m ["octfiledir"] = OCTAVE_OCTFILEDIR;
+  m ["octincludedir"] = OCTAVE_OCTINCLUDEDIR;
+  m ["octlibdir"] = OCTAVE_OCTLIBDIR;
+  m ["prefix"] = OCTAVE_PREFIX;
+  m ["startupfiledir"] = OCTAVE_STARTUPFILEDIR;
+  m ["version"] = OCTAVE_VERSION;
 
   int nargin = args.length ();
 
--- a/src/version.h
+++ b/src/version.h
@@ -29,7 +29,7 @@
   "Copyright (C) 1996, 1997, 1998, 1999, 2000 John W. Eaton."
 
 #define OCTAVE_NAME_AND_VERSION \
-  "GNU Octave, version " OCTAVE_VERSION " (" CANONICAL_HOST_TYPE ")"
+  "GNU Octave, version " OCTAVE_VERSION " (" OCTAVE_CANONICAL_HOST_TYPE ")"
 
 #define OCTAVE_NAME_VERSION_AND_COPYRIGHT \
   OCTAVE_NAME_AND_VERSION ".\n" OCTAVE_COPYRIGHT "\n\