Mercurial > hg > octave-max

changeset 5398:1b6a837fe24d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2005-06-17 15:58:12 by jwe]
author jwe
date Fri, 17 Jun 2005 15:58:12 +0000
parents b12c0f920da0
children db34dff19947
files src/ChangeLog src/toplev.cc
diffstat 2 files changed, 9 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2005-06-17  John W. Eaton  <jwe@octave.org>
 
+	* toplev.cc (octave_config_info): Include localapifcnfiledir and
+	localapioctfiledir in the list.
+
 	* symtab.h (symbol_record::alias): New arg, mark_to_clear.
 	(symbol_record::aliases_to_clear): New data member.
 	(symbol_record::push_alias_to_clear): New function.
--- a/src/toplev.cc
+++ b/src/toplev.cc
@@ -646,9 +646,11 @@
       "CXXPICFLAG", OCTAVE_CONF_CXXPICFLAG,
       "CXX_VERSION", OCTAVE_CONF_CXX_VERSION,
       "DEFAULT_PAGER", OCTAVE_DEFAULT_PAGER,
+      "DEFS", OCTAVE_CONF_DEFS,
+      "DLFCN_INCFLAGS", OCTAVE_CONF_DLFCN_INCFLAGS,
       "DL_LD", OCTAVE_CONF_DL_LD,
       "DL_LDFLAGS", OCTAVE_CONF_DL_LDFLAGS,
-      "DLFCN_INCFLAGS", OCTAVE_CONF_DLFCN_INCFLAGS,
+      "ENABLE_DYNAMIC_LINKING", OCTAVE_CONF_ENABLE_DYNAMIC_LINKING,
       "EXEEXT", OCTAVE_CONF_EXEEXT,
       "F2C", OCTAVE_CONF_F2C,
       "F2CFLAGS", OCTAVE_CONF_F2CFLAGS,
@@ -676,9 +678,9 @@
       "LIBREADLINE", OCTAVE_CONF_LIBREADLINE,
       "LIBS", OCTAVE_CONF_LIBS,
       "LN_S", OCTAVE_CONF_LN_S,
+      "MKOCTFILE_DL_LDFLAGS", OCTAVE_CONF_MKOCTFILE_DL_LDFLAGS,
       "MKOCTFILE_INCFLAGS", OCTAVE_CONF_MKOCTFILE_INCFLAGS,
       "MKOCTFILE_LFLAGS", OCTAVE_CONF_MKOCTFILE_LFLAGS,
-      "MKOCTFILE_DL_LDFLAGS", OCTAVE_CONF_MKOCTFILE_DL_LDFLAGS,
       "RANLIB", OCTAVE_CONF_RANLIB,
       "RDYNAMIC_FLAG", OCTAVE_CONF_RDYNAMIC_FLAG,
       "RLD_FLAG", OCTAVE_CONF_RLD_FLAG,
@@ -691,10 +693,8 @@
       "SH_LDFLAGS", OCTAVE_CONF_SH_LDFLAGS,
       "SONAME_FLAGS", OCTAVE_CONF_SONAME_FLAGS,
       "STATIC_LIBS", OCTAVE_CONF_STATIC_LIBS,
-      "DEFS", OCTAVE_CONF_DEFS,
       "UGLY_DEFS", OCTAVE_CONF_UGLY_DEFS,
       "USE_64_BIT_IDX_T", OCTAVE_CONF_USE_64_BIT_IDX_T,
-      "ENABLE_DYNAMIC_LINKING", OCTAVE_CONF_ENABLE_DYNAMIC_LINKING,
       "XTRA_CFLAGS", OCTAVE_CONF_XTRA_CFLAGS,
       "XTRA_CXXFLAGS", OCTAVE_CONF_XTRA_CXXFLAGS,
       "YACC", OCTAVE_CONF_YACC,
@@ -714,6 +714,8 @@
       "infofile", OCTAVE_INFOFILE,
       "libdir", OCTAVE_LIBDIR,
       "libexecdir", OCTAVE_LIBEXECDIR,
+      "localapifcnfiledir", OCTAVE_LOCALAPIFCNFILEDIR,
+      "localapioctfiledir", OCTAVE_LOCALAPIOCTFILEDIR,
       "localarchlibdir", OCTAVE_LOCALARCHLIBDIR,
       "localfcnfiledir", OCTAVE_LOCALFCNFILEDIR,
       "localfcnfilepath", OCTAVE_LOCALFCNFILEPATH,