# HG changeset patch
# User jwe
# Date 1035473040 0
# Node ID da4c69a811378a41241128607a482948c5819dd5
# Parent  19a1626b8d578cd88e23b00de578402865eaac42
[project @ 2002-10-24 15:23:59 by jwe]

diff -r 19a1626b8d57 -r da4c69a81137 liboctave/ChangeLog
--- a/liboctave/ChangeLog	Wed Oct 23 22:10:54 2002 +0000
+++ b/liboctave/ChangeLog	Thu Oct 24 15:24:00 2002 +0000
@@ -1,3 +1,8 @@
+2002-10-24  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* Makefile.in (LINK_DEPS): Include $(LIBKPATHSEA) here.
+	(liboctave.$(SHLEXT)): Not here.
+
 2002-10-17  Paul Kienzle <pkienzle@users.sf.net>
 
 	* oct-shlib.cc (octave_w32_shlib): New class to support Windows.
diff -r 19a1626b8d57 -r da4c69a81137 liboctave/Makefile.in
--- a/liboctave/Makefile.in	Wed Oct 23 22:10:54 2002 +0000
+++ b/liboctave/Makefile.in	Thu Oct 24 15:24:00 2002 +0000
@@ -21,7 +21,8 @@
 ifeq ($(INCLUDE_LINK_DEPS), true)
   LINK_DEPS = \
     -L../libcruft -L../kpathsea -L../glob -L. $(RLD_FLAG) \
-    $(LIBCRUFT) $(BLAS_LIBS) $(FFTW_LIBS) $(LIBREADLINE) -lglob $(LIBS)
+    $(LIBCRUFT) $(BLAS_LIBS) $(FFTW_LIBS) $(LIBREADLINE) \
+    -lglob $(LIBS) $(LIBKPATHSEA)
 endif
 
 MATRIX_INC := Array.h Array2.h Array3.h ArrayN.h DiagArray2.h Array-flags.h \
@@ -220,7 +221,7 @@
 
 liboctave.$(SHLEXT): $(LIBOCTAVE_PICOBJ)
 	rm -f $@
-	$(SH_LD) $(SH_LDFLAGS) $(SONAME_FLAGS) -o $@ $^ $(LINK_DEPS) $(LIBKPATHSEA)
+	$(SH_LD) $(SH_LDFLAGS) $(SONAME_FLAGS) -o $@ $^ $(LINK_DEPS)
 
 $(LIBOCTAVE_PICOBJ): stmp-pic
 
diff -r 19a1626b8d57 -r da4c69a81137 src/ChangeLog
--- a/src/ChangeLog	Wed Oct 23 22:10:54 2002 +0000
+++ b/src/ChangeLog	Thu Oct 24 15:24:00 2002 +0000
@@ -1,3 +1,11 @@
+2002-10-24  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* ov-mapper.cc (octave_mapper::apply): Don't try real_type case if
+	arg is a string and we have a ch_map_fcn.
+
+	* Makefile.in: Add $(LIBKPATHSEA) to $(OCTAVE_LIBS) if
+	$(INCLUDE_LINK_DEPS) is false, not if $(SHARED_LIBS) is false.
+
 2002-10-23  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* DLD-FUNCTIONS/daspk.cc (daspk): Use set_options, not copy. 
diff -r 19a1626b8d57 -r da4c69a81137 src/Makefile.in
--- a/src/Makefile.in	Wed Oct 23 22:10:54 2002 +0000
+++ b/src/Makefile.in	Thu Oct 24 15:24:00 2002 +0000
@@ -196,7 +196,7 @@
   $(SPECIAL_MATH_LIB) $(LIBCRUFT) \
   $(LIBPLPLOT) $(LIBGLOB) $(LIBDLFCN)
 
-ifneq ($SHARED_LIBS), true)
+ifneq ($INCLUDE_LINK_DEPS), true)
 OCTAVE_LIBS += $(LIBKPATHSEA)
 endif
 
diff -r 19a1626b8d57 -r da4c69a81137 src/ov-mapper.cc
--- a/src/ov-mapper.cc	Wed Oct 23 22:10:54 2002 +0000
+++ b/src/ov-mapper.cc	Thu Oct 24 15:24:00 2002 +0000
@@ -105,7 +105,11 @@
 {
   octave_value retval;
 
-  if (arg.is_real_type ())
+  // XXX FIXME XXX -- is_real_type can return true for strings if
+  // implicit_str_to_num_ok is nonzero.  Should it really work that
+  // way?
+
+  if (arg.is_real_type () && ! (arg.is_string () && ch_map_fcn))
     {
       if (arg.is_scalar_type ())
 	{