Mercurial > hg > octave-thorsten

changeset 7253:c5a024013d2d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2007-12-04 20:51:24 by jwe]
author jwe
date Tue, 04 Dec 2007 20:51:26 +0000
parents d35fa45980c6
children 4d716690b084
files ChangeLog Makeconf.in configure.in liboctave/ChangeLog liboctave/Sparse.cc octMakefile.in octave-bug.in src/ChangeLog src/Makefile.in src/oct-conf.h.in src/toplev.cc
diffstat 11 files changed, 63 insertions(+), 53 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-12-04  John W. Eaton  <jwe@octave.org>
+
+	* octave-bug.in (LIBDLFCN): Delete variable and all uses.
+	* Makeconf.in (LIBDLFCN, DLFCN_INCFLAGS): Likewise.
+	* configure.in (DLFCN_DIR, LIBDLFCN, DLFCN_INCFLAGS): Likewise.
+	Don't generate dlfcn/Makefile.
+	* octMakefile.in (DISTSUBDIRS): Delete dlfcn from the list.
+	(SUBDIRS): Don't substitute DLFCN_DIR here.
+
 2007-12-03  Moritz Borgmann  <octave@moriborg.de>
 
 	* Makeconf.in, aclocal.m4, configure.in: Check for find program,
--- a/Makeconf.in
+++ b/Makeconf.in
@@ -118,8 +118,6 @@
 
 # cc and associated flags.
 
-DLFCN_INCFLAGS = @DLFCN_INCFLAGS@
-
 # Clean up INCFLAGS a bit if we are not compiling in a separate
 # directory.
 ifeq ($(srcdir),.)
@@ -144,7 +142,7 @@
     -I$(top_srcdir)/src \
     -I$(top_srcdir)/libcruft/misc
 endif
-INCFLAGS = $(TMP_IF_1) $(TMP_IF_2) $(DLFCN_INCFLAGS)
+INCFLAGS = $(TMP_IF_1) $(TMP_IF_2)
 
 LIBFLAGS = -L$(TOPDIR)
 
@@ -208,7 +206,6 @@
 
 FLIBS = @FLIBS@
 
-LIBDLFCN = @LIBDLFCN@
 LIBGLOB = @LIBGLOB@
 LIBOCTINTERP = @LIBOCTINTERP@
 LIBOCTAVE = @LIBOCTAVE@
@@ -468,7 +465,6 @@
   -e "s|%OCTAVE_CONF_DEFAULT_PAGER%|\"${DEFAULT_PAGER}\"|" \
   -e "s|%OCTAVE_CONF_DEPEND_FLAGS%|\"${DEPEND_FLAGS}\"|" \
   -e "s|%OCTAVE_CONF_DEPEND_EXTRA_SED_PATTERN%|\"${DEPEND_EXTRA_SED_PATTERN}\"|" \
-  -e "s|%OCTAVE_CONF_DLFCN_INCFLAGS%|\"${DLFCN_INCFLAGS}\"|" \
   -e "s|%OCTAVE_CONF_DL_LD%|\"${DL_LD}\"|" \
   -e "s|%OCTAVE_CONF_DL_LDFLAGS%|\"${DL_LDFLAGS}\"|" \
   -e "s|%OCTAVE_CONF_EXEEXT%|\"${EXEEXT}\"|" \
@@ -492,7 +488,6 @@
   -e "s|%OCTAVE_CONF_LFLAGS%|\"${LFLAGS}\"|" \
   -e "s|%OCTAVE_CONF_LIBCRUFT%|\"${LIBCRUFT}\"|" \
   -e "s|%OCTAVE_CONF_LIBDIR%|\"${libdir}\"|" \
-  -e "s|%OCTAVE_CONF_LIBDLFCN%|\"${LIBDLFCN}\"|" \
   -e "s|%OCTAVE_CONF_LIBEXT%|\"${LIBEXT}\"|" \
   -e "s|%OCTAVE_CONF_LIBFLAGS%|\"${LIBFLAGS}\"|" \
   -e "s|%OCTAVE_CONF_LIBGLOB%|\"${LIBGLOB}\"|" \
--- a/configure.in
+++ b/configure.in
@@ -29,7 +29,7 @@
 EXTERN_CXXFLAGS="$CXXFLAGS"
 
 AC_INIT
-AC_REVISION($Revision: 1.599 $)
+AC_REVISION($Revision: 1.600 $)
 AC_PREREQ(2.57)
 AC_CONFIG_SRCDIR([src/octave.cc])
 AC_CONFIG_HEADER(config.h)
@@ -939,7 +939,6 @@
       else enable_rpath_arg="$enableval"; fi
     fi], [use_rpath=true])
 
-DLFCN_DIR=
 CPICFLAG=-fPIC
 CXXPICFLAG=-fPIC
 FPICFLAG=-fPIC
@@ -1050,7 +1049,6 @@
     CPICFLAG=
     CXXPICFLAG=
     FPICFLAG=
-    DLFCN_DIR=dlfcn
   ;;
   hppa*-hp-hpux*)
     if test "$ac_cv_f77_compiler_gnu" = yes; then
@@ -1126,7 +1124,6 @@
 AC_MSG_NOTICE([defining SHLBIN_VER to be $SHLBIN_VER])
 AC_MSG_NOTICE([defining SHLLINKEXT to be $SHLLINKEXT])
 AC_MSG_NOTICE([defining LIBPRE to be $LIBPRE])
-AC_MSG_NOTICE([defining DLFCN_DIR to be $DLFCN_DIR])
 AC_MSG_NOTICE([defining SH_LD to be $SH_LD])
 AC_MSG_NOTICE([defining SH_LDFLAGS to be $SH_LDFLAGS])
 AC_MSG_NOTICE([defining DL_LD to be $DL_LD])
@@ -1152,7 +1149,6 @@
 AC_SUBST(SHLBIN_VER)
 AC_SUBST(SHLLINKEXT)
 AC_SUBST(LIBPRE)
-AC_SUBST(DLFCN_DIR)
 AC_SUBST(SH_LD)
 AC_SUBST(SH_LDFLAGS)
 AC_SUBST(DL_LD)
@@ -1344,8 +1340,6 @@
 ### libs and some API for dynamic linking is detected.
 
 LD_CXX='$(CXX)'
-LIBDLFCN=
-DLFCN_INCFLAGS=
 RDYNAMIC_FLAG=
 DL_API_MSG=""
 dlopen_api=false
@@ -1381,11 +1375,6 @@
           dlopen_api=true
         else
 	  case "$canonical_host_type" in
-	    rs6000-ibm-aix* | powerpc-ibm-aix*)
-	      LIBDLFCN="-ldlfcn -ll -lld"
-	      DLFCN_INCFLAGS='-I$(top_srcdir)/dlfcn -I$(TOPDIR)/dlfcn'
-	      dlopen_api=true
-	    ;;
 	    i[[3456]]86-*-sco3.2v5*)
 	      LD_CXX='LD_RUN_PATH=$LD_RUN_PATH:$(octlibdir) $(CXX)'
 	      dlopen_api=true
@@ -1439,8 +1428,6 @@
 fi
 
 AC_SUBST(LD_CXX)
-AC_SUBST(LIBDLFCN)
-AC_SUBST(DLFCN_INCFLAGS)
 AC_SUBST(RDYNAMIC_FLAG)
 AC_SUBST(ENABLE_DYNAMIC_LINKING)
 AC_SUBST(LIBOCTINTERP)
@@ -1832,19 +1819,19 @@
 
 ### Do the substitutions in all the Makefiles.
 
-AC_CONFIG_FILES([Makefile octMakefile Makeconf test/Makefile \
-  dlfcn/Makefile doc/Makefile doc/faq/Makefile doc/interpreter/Makefile 
-  doc/liboctave/Makefile doc/refcard/Makefile emacs/Makefile \
-  examples/Makefile liboctave/Makefile liboctave/oct-types.h \
-  src/Makefile src/mxarray.h libcruft/Makefile libcruft/Makerules \
-  libcruft/amos/Makefile libcruft/blas/Makefile \
-  libcruft/daspk/Makefile libcruft/dasrt/Makefile 
-  libcruft/dassl/Makefile libcruft/fftpack/Makefile \
-  libcruft/lapack/Makefile libcruft/minpack/Makefile \
-  libcruft/misc/Makefile libcruft/odepack/Makefile \
-  libcruft/ordered-qz/Makefile libcruft/quadpack/Makefile \
-  libcruft/ranlib/Makefile libcruft/slatec-fn/Makefile \
-  libcruft/slatec-err/Makefile libcruft/villad/Makefile \
+AC_CONFIG_FILES([Makefile octMakefile Makeconf test/Makefile
+  doc/Makefile doc/faq/Makefile doc/interpreter/Makefile
+  doc/liboctave/Makefile doc/refcard/Makefile emacs/Makefile
+  examples/Makefile liboctave/Makefile liboctave/oct-types.h
+  src/Makefile src/mxarray.h libcruft/Makefile libcruft/Makerules
+  libcruft/amos/Makefile libcruft/blas/Makefile
+  libcruft/daspk/Makefile libcruft/dasrt/Makefile
+  libcruft/dassl/Makefile libcruft/fftpack/Makefile
+  libcruft/lapack/Makefile libcruft/minpack/Makefile
+  libcruft/misc/Makefile libcruft/odepack/Makefile
+  libcruft/ordered-qz/Makefile libcruft/quadpack/Makefile
+  libcruft/ranlib/Makefile libcruft/slatec-fn/Makefile
+  libcruft/slatec-err/Makefile libcruft/villad/Makefile
   libcruft/blas-xtra/Makefile libcruft/lapack-xtra/Makefile])
 AC_OUTPUT
 
--- a/liboctave/ChangeLog
+++ b/liboctave/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-04  John W. Eaton  <jwe@octave.org>
+
+	* Sparse.cc (assign (Sparse<LT>&,  const Sparse<RT>&)):
+	Do nothing if one index is empty.
+
 2007-12-04  David Bateman  <dbateman@free.fr>
 
 	* Sparse.cc (assign (Sparse<LT>&,  const Sparse<RT>&)):
--- a/liboctave/Sparse.cc
+++ b/liboctave/Sparse.cc
@@ -2596,8 +2596,26 @@
 		    }
 		  else
 		    {
-		      // No need to do anything if either of the indices
-		      // are empty.
+#if 0
+		      // FIXME -- the following code will make this
+		      // function behave the same as the full matrix
+		      // case for things like
+		      //
+		      // x = sparse (ones (2));
+		      // x([],3) = 2;
+		      //
+		      // x =
+		      //
+		      // Compressed Column Sparse (rows = 2, cols = 3, nnz = 4)
+		      //
+		      // (1, 1) ->  1
+		      // (2, 1) ->  1
+		      // (1, 2) ->  1
+		      // (2, 2) ->  1
+		      //
+		      // However, Matlab doesn't resize in this case
+		      // even though it does in the full matrix case.
+
 		      if (n > 0)
 			{
 			  octave_idx_type max_row_idx = idx_i_is_colon ? 
@@ -2606,7 +2624,7 @@
 			    max_row_idx : lhs_nr;
 			  octave_idx_type new_nc = lhs_nc;
 
-			  lhs = Sparse<LT> (new_nr, new_nc);
+			  lhs.resize (new_nr, new_nc);
 			}
 		      else if (m > 0)
 			{
@@ -2616,8 +2634,9 @@
 			  octave_idx_type new_nc = max_col_idx > lhs_nc ? 
 			    max_col_idx : lhs_nc;
 
-			  lhs = Sparse<LT> (new_nr, new_nc);
+			  lhs.resize  (new_nr, new_nc);
 			}
+#endif
 		    }
 		}
 	      else if (n == rhs_nr && m == rhs_nc)
--- a/octMakefile.in
+++ b/octMakefile.in
@@ -50,7 +50,7 @@
 	mkoctfile.in run-octave.in ChangeLog ChangeLog.[0-9]
 
 # Subdirectories in which to run `make all'.
-SUBDIRS = @DLFCN_DIR@ libcruft liboctave src scripts doc examples
+SUBDIRS = libcruft liboctave src scripts doc examples
 
 # Subdirectories in which to run `make all'.
 INSTALL_SUBDIRS = libcruft liboctave src scripts doc examples
@@ -59,7 +59,7 @@
 CONF_DISTSUBDIRS = src
 
 # Subdirectories in which to run `make dist'.
-DISTSUBDIRS = $(sort $(SUBDIRS) dlfcn test emacs)
+DISTSUBDIRS = $(sort $(SUBDIRS) test emacs)
 
 # Subdirectories in which to run clean targets.
 CLEANSUBDIRS = $(DISTSUBDIRS)
--- a/octave-bug.in
+++ b/octave-bug.in
@@ -56,7 +56,6 @@
 FFTW_LIBS=%OCTAVE_CONF_FFTW_LIBS%
 LEXLIB=%OCTAVE_CONF_LEXLIB%
 LIBGLOB=%OCTAVE_CONF_LIBGLOB%
-LIBDLFCN=%OCTAVE_CONF_LIBDLFCN%
 DEFS=%OCTAVE_CONF_DEFS%
 
 : ${USER=$LOGNAME}
@@ -251,7 +250,6 @@
 FFTW_LIBS:        $FFTW_LIBS
 LIBS:             $LIBS
 LEXLIB:           $LEXLIB
-LIBDLFCN:         $LIBDLFCN
 LIBGLOB:          $LIBGLOB
 SED:              $SED
 DEFS:
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,12 @@
 2007-12-04  John W. Eaton  <jwe@octave.org>
 
+	* Makefile.in (LIBDLFCN): Delete all uses.
+
+	* toplev.cc (octave_config_info): Remove LIBDLFCN and
+	DLFCN_INCFLAGS from the list.
+	* oct-conf.h.in (OCTAVE_CONF_DLFCN_INCFLAGS, OCTAVE_CONF_LIBDLFCN):
+	Delete. 
+
 	* error.cc (Ferror): Handle error id.
 
 	* load-save.cc (Fsave, Fload): Doc fixes.
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -254,11 +254,11 @@
 ifeq ($(ENABLE_DYNAMIC_LINKING), true)
   OCTAVE_LIBS = $(LIBOCTINTERP) $(LIBOCTAVE) \
     $(SPECIAL_MATH_LIB) $(LIBCRUFT) \
-    $(LIBPLPLOT) $(LIBGLOB) $(LIBDLFCN)
+    $(LIBPLPLOT) $(LIBGLOB)
 else
   OCTAVE_LIBS = $(LIBOCTINTERP) $(LIBOCTAVE) $(QHULL_LIBS) \
     $(GLPK_LIBS) $(REGEX_LIBS) $(SPECIAL_MATH_LIB) $(LIBCRUFT) \
-    $(LIBPLPLOT) $(LIBGLOB) $(LIBDLFCN)
+    $(LIBPLPLOT) $(LIBGLOB)
 endif
 
 OCTINTERP_LINK_DEPS = \
--- a/src/oct-conf.h.in
+++ b/src/oct-conf.h.in
@@ -105,10 +105,6 @@
 #define OCTAVE_CONF_DEFS %OCTAVE_CONF_DEFS%
 #endif
 
-#ifndef OCTAVE_CONF_DLFCN_INCFLAGS
-#define OCTAVE_CONF_DLFCN_INCFLAGS %OCTAVE_CONF_DLFCN_INCFLAGS%
-#endif
-
 #ifndef OCTAVE_CONF_DL_LD
 #define OCTAVE_CONF_DL_LD %OCTAVE_CONF_DL_LD%
 #endif
@@ -197,10 +193,6 @@
 #define OCTAVE_CONF_LIBCRUFT %OCTAVE_CONF_LIBCRUFT%
 #endif
 
-#ifndef OCTAVE_CONF_LIBDLFCN
-#define OCTAVE_CONF_LIBDLFCN %OCTAVE_CONF_LIBDLFCN%
-#endif
-
 #ifndef OCTAVE_CONF_LIBEXT
 #define OCTAVE_CONF_LIBEXT %OCTAVE_CONF_LIBEXT%
 #endif
--- a/src/toplev.cc
+++ b/src/toplev.cc
@@ -805,7 +805,6 @@
       { false, "CXX_VERSION", OCTAVE_CONF_CXX_VERSION },
       { false, "DEFAULT_PAGER", OCTAVE_DEFAULT_PAGER },
       { false, "DEFS", OCTAVE_CONF_DEFS },
-      { false, "DLFCN_INCFLAGS", OCTAVE_CONF_DLFCN_INCFLAGS },
       { false, "DL_LD", OCTAVE_CONF_DL_LD },
       { false, "DL_LDFLAGS", OCTAVE_CONF_DL_LDFLAGS },
       { false, "ENABLE_DYNAMIC_LINKING", OCTAVE_CONF_ENABLE_DYNAMIC_LINKING },
@@ -828,7 +827,6 @@
       { false, "LEXLIB", OCTAVE_CONF_LEXLIB },
       { false, "LFLAGS", OCTAVE_CONF_LFLAGS },
       { false, "LIBCRUFT", OCTAVE_CONF_LIBCRUFT },
-      { false, "LIBDLFCN", OCTAVE_CONF_LIBDLFCN },
       { false, "LIBEXT", OCTAVE_CONF_LIBEXT },
       { false, "LIBFLAGS", OCTAVE_CONF_LIBFLAGS },
       { false, "LIBOCTAVE", OCTAVE_CONF_LIBOCTAVE },