# HG changeset patch
# User jwe
# Date 1035576324 0
# Node ID b10790694d485be973fdad3a552670d010126a2b
# Parent  040314da2fece6486080e76111361147476fdcd4
[project @ 2002-10-25 20:05:23 by jwe]

diff -r 040314da2fec -r b10790694d48 ChangeLog
--- a/ChangeLog	Fri Oct 25 12:55:47 2002 +0000
+++ b/ChangeLog	Fri Oct 25 20:05:24 2002 +0000
@@ -1,3 +1,9 @@
+2002-10-25  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* configure.in: Also set SHLEXT_VER, SHLLIB_VER, SHLBIN_VER.
+	* Makeconf.in: Substitute them here.
+	Also substitute SHLLINKEXT.
+
 2002-10-25  Per Persson <persquare@mac.com>
 
 	* aclocal.m4 (OCTAVE_CXX_PRAGMA_INTERFACE_IMPLEMENTATION): Fix
diff -r 040314da2fec -r b10790694d48 Makeconf.in
--- a/Makeconf.in	Fri Oct 25 12:55:47 2002 +0000
+++ b/Makeconf.in	Fri Oct 25 20:05:24 2002 +0000
@@ -60,11 +60,12 @@
 
 SHARED_LIBS = @SHARED_LIBS@
 SHLEXT = @SHLEXT@
-SHLEXT_VER = $(SHLEXT).$(version)
+SHLEXT_VER = @SHLEXT_VER@
 SHLLIB = @SHLLIB@
-SHLLIB_VER = $(SHLLIB).$(version)
+SHLLIB_VER = @SHLLIB_VER@
 SHLBIN = @SHLBIN@
-SHLBIN_VER = $(SHLBIN).$(version)
+SHLBIN_VER = @SHLBIN_VER@
+SHLLINKEXT=
 
 INCLUDE_LINK_DEPS = @INCLUDE_LINK_DEPS@
 
diff -r 040314da2fec -r b10790694d48 configure.in
--- a/configure.in	Fri Oct 25 12:55:47 2002 +0000
+++ b/configure.in	Fri Oct 25 20:05:24 2002 +0000
@@ -22,7 +22,7 @@
 ### 02111-1307, USA. 
 
 AC_INIT
-AC_REVISION($Revision: 1.381 $)
+AC_REVISION($Revision: 1.382 $)
 AC_PREREQ(2.52)
 AC_CONFIG_SRCDIR([src/octave.cc])
 AC_CONFIG_HEADER(config.h)
@@ -612,9 +612,12 @@
 CXXPICFLAG=-fPIC
 FPICFLAG=-fPIC
 SHLEXT=so
-SHLLINKEXT=
+SHLLIB=$SHLEXT
 SHLBIN=
-SHLLIB=$SHLEXT
+SHLEXT_VER='$(SHLEXT).$(VERSION)'
+SHLLIB_VER='$(SHLLIB).$(VERSION)'
+SHLBIN_VER='$(SHLBIN).$(VERSION)'
+SHLLINKEXT=
 SH_LD="$CXX"
 SH_LDFLAGS=-shared
 SONAME_FLAGS=
@@ -732,6 +735,12 @@
 AC_MSG_RESULT([defining CPICFLAG to be $CPICFLAG])
 AC_MSG_RESULT([defining CXXPICFLAG to be $CXXPICFLAG])
 AC_MSG_RESULT([defining SHLEXT to be $SHLEXT])
+AC_MSG_RESULT([defining SHLLIB to be $SHLLIB])
+AC_MSG_RESULT([defining SHLBIN to be $SHLBIN])
+AC_MSG_RESULT([defining SHLEXT_VER to be $SHLEXT_VER])
+AC_MSG_RESULT([defining SHLLIB_VER to be $SHLLIB_VER])
+AC_MSG_RESULT([defining SHLBIN_VER to be $SHLBIN_VER])
+AC_MSG_RESULT([defining SHLLINKEXT to be $SHLLINKEXT])
 AC_MSG_RESULT([defining DLFCN_DIR to be $DLFCN_DIR])
 AC_MSG_RESULT([defining SH_LD to be $SH_LD])
 AC_MSG_RESULT([defining SH_LDFLAGS to be $SH_LDFLAGS])
@@ -747,6 +756,10 @@
 AC_SUBST(SHLEXT)
 AC_SUBST(SHLLIB)
 AC_SUBST(SHLBIN)
+AC_SUBST(SHLEXT_VER)
+AC_SUBST(SHLLIB_VER)
+AC_SUBST(SHLBIN_VER)
+AC_SUBST(SHLLINKEXT)
 AC_SUBST(DLFCN_DIR)
 AC_SUBST(SH_LD)
 AC_SUBST(SH_LDFLAGS)
diff -r 040314da2fec -r b10790694d48 liboctave/ChangeLog
--- a/liboctave/ChangeLog	Fri Oct 25 12:55:47 2002 +0000
+++ b/liboctave/ChangeLog	Fri Oct 25 20:05:24 2002 +0000
@@ -1,3 +1,10 @@
+2002-10-25  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* oct-kpse.c (octave_kpse_clear_dir_cache): Delete.
+	* oct-kpse.h: Delete decl.
+	* pathsearch.cc (dir_path::init): Delete unnecessary call to
+	::octave_kpse_clear_dir_cache.
+
 2002-10-24  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* lo-sstream.h: Undef HAVE_SSTREAM if using a version of g++
diff -r 040314da2fec -r b10790694d48 liboctave/oct-kpse.c
--- a/liboctave/oct-kpse.c	Fri Oct 25 12:55:47 2002 +0000
+++ b/liboctave/oct-kpse.c	Fri Oct 25 20:05:24 2002 +0000
@@ -57,12 +57,6 @@
   kpse_set_progname (name);
 }
 
-void
-octave_kpse_clear_dir_cache (void)
-{
-  kpse_clear_dir_cache ();
-}
-
 char *
 octave_kpse_expand_default (const char *path, const char *dflt)
 {
diff -r 040314da2fec -r b10790694d48 liboctave/oct-kpse.h
--- a/liboctave/oct-kpse.h	Fri Oct 25 12:55:47 2002 +0000
+++ b/liboctave/oct-kpse.h	Fri Oct 25 20:05:24 2002 +0000
@@ -53,8 +53,6 @@
 
 extern void octave_kpse_set_progname (const char *);
 
-extern void octave_kpse_clear_dir_cache (void);
-
 extern char *octave_kpse_expand_default (const char *, const char *);
 
 extern char *octave_kpse_path_expand (const char *);
diff -r 040314da2fec -r b10790694d48 liboctave/pathsearch.cc
--- a/liboctave/pathsearch.cc	Fri Oct 25 12:55:47 2002 +0000
+++ b/liboctave/pathsearch.cc	Fri Oct 25 20:05:24 2002 +0000
@@ -174,8 +174,6 @@
       octave_kpathsea_initialized = true;
     }
 
-  ::octave_kpse_clear_dir_cache ();
-
   char *t1 = 0;
 
   if (p_default.empty ())