--- a/src/toplev.cc	Thu Oct 17 03:11:30 2002 +0000
+++ b/src/toplev.cc	Thu Oct 17 16:14:45 2002 +0000
@@ -642,7 +642,7 @@
 {
   octave_value retval;
 
-#if defined (WITH_DYNAMIC_LINKING) && (defined (WITH_DL) || defined (WITH_SHL))
+#if defined (WITH_DYNAMIC_LINKING)
   bool octave_supports_dynamic_linking = true;
 #else
   bool octave_supports_dynamic_linking = false;
@@ -679,6 +679,9 @@
   m ["FLIBS"] = OCTAVE_CONF_FLIBS;
   m ["FPICFLAG"] = OCTAVE_CONF_FPICFLAG;
   m ["GLOB_INCFLAGS"] = OCTAVE_CONF_GLOB_INCFLAGS;
+  m ["HAVE_DLOPEN_API"] = OCTAVE_CONF_HAVE_DLOPEN_API;
+  m ["HAVE_LOAD_LIBRARY_API"] = OCTAVE_CONF_HAVE_LOAD_LIBRARY_API;
+  m ["HAVE_SHL_LOAD_API"] = OCTAVE_CONF_HAVE_SHL_LOAD_API;
   m ["INCFLAGS"] = OCTAVE_CONF_INCFLAGS;
   m ["LDFLAGS"] = OCTAVE_CONF_LDFLAGS;
   m ["LD_CXX"] = OCTAVE_CONF_LD_CXX;
@@ -700,7 +703,6 @@
   m ["LN_S"] = OCTAVE_CONF_LN_S;
   m ["MKOCTFILE_INCFLAGS"] = OCTAVE_CONF_MKOCTFILE_INCFLAGS;
   m ["MKOCTFILE_LFLAGS"] = OCTAVE_CONF_MKOCTFILE_LFLAGS;
-  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;
@@ -715,9 +717,7 @@
   m ["STATIC_LIBS"] = OCTAVE_CONF_STATIC_LIBS;
   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;