[Pkg-octave-commit] [SCM] octave-symbolic branch, master, updated. a718b53403d9f164f8c2a3df521385a01d28a11b

adb014 adb014 at 416fae20-06d0-4450-9b69-c6c34d4b5f03
Mon Jan 3 03:40:46 UTC 2011


The following commit has been merged in the master branch:
commit 6c5d31d521128612ca16ee2f6331f05ab0b91ad4
Author: adb014 <adb014 at 416fae20-06d0-4450-9b69-c6c34d4b5f03>
Date:   Fri Aug 25 06:53:05 2006 +0000

    Further package manager updates. All but miscellaneous and audio should build in main/. Some broken symlinks in image and octcdf still
    
    
    git-svn-id: https://octave.svn.sourceforge.net/svnroot/octave/trunk/octave-forge/main/symbolic@2574 416fae20-06d0-4450-9b69-c6c34d4b5f03

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..3d835f3
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,5 @@
+sinclude ../../Makeconf
+sinclude ../../pkg.mk
+
+PKG_FILES = $(patsubst %,symbolic/%, COPYING DESCRIPTION INDEX PKG_ADD \
+	$(wildcard doc/*) $(wildcard inst/*) $(wildcard src/*))
diff --git a/INSTALL b/doc/INSTALL
similarity index 100%
rename from INSTALL
rename to doc/INSTALL
diff --git a/src/.cvsignore b/src/.cvsignore
index 521f76d..7e7fe0a 100644
--- a/src/.cvsignore
+++ b/src/.cvsignore
@@ -1,3 +1,2 @@
-PKG_ADD
-*.octlink
-*.oct
+configure
+autom4te.cache
diff --git a/src/Makeconf.add b/src/Makeconf.add
deleted file mode 100644
index cca8265..0000000
--- a/src/Makeconf.add
+++ /dev/null
@@ -1,4 +0,0 @@
-# Define HAVE_GINAC=1 if GINAC is available.  Other packages might 
-# need to define search paths for headers and libraries here, but GiNaC
-# defines the script ginac-config to report these.
- at DEFHAVE_GINAC@
diff --git a/src/Makeconf.base b/src/Makeconf.base
deleted file mode 100644
index 1417d05..0000000
--- a/src/Makeconf.base
+++ /dev/null
@@ -1,92 +0,0 @@
-
-## Makeconf is automatically generated from Makeconf.base and Makeconf.add
-## in the various subdirectories.  To regenerate, use ./autogen.sh to
-## create a new ./Makeconf.in, then use ./configure to generate a new
-## Makeconf.
-
-OCTAVE_FORGE = 1
-
-SHELL = @SHELL@
-
-canonical_host_type = @canonical_host_type@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-bindir = @bindir@
-mandir = @mandir@
-libdir = @libdir@
-datadir = @datadir@
-infodir = @infodir@
-includedir = @includedir@
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALLOCT=octinst.sh
-
-DESTDIR =
-
-RANLIB = @RANLIB@
-STRIP = @STRIP@
-LN_S = @LN_S@
-MKOCTLINK = @MKOCTLINK@
-OCTLINK= @OCTLINK@
-
-AWK = @AWK@
-
-# Most octave programs will be compiled with $(MKOCTFILE).  Those which
-# cannot use mkoctfile directly can request the flags that mkoctfile 
-# would use as follows:
-#    FLAG = $(shell $(MKOCTFILE) -p FLAG)
-# The following flags are for compiling programs that are independent
-# of Octave.  How confusing.
-CC = @CC@
-CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
-CPICFLAG = @CPICFLAG@
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
-CXXPICFLAG = @CXXPICFLAG@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FPICFLAG = @FPICFLAG@
-
-OCTAVE = @OCTAVE@
-OCTAVE_VERSION = @OCTAVE_VERSION@
-MKOCTFILE = @MKOCTFILE@ -DHAVE_OCTAVE_$(ver) -v
-SHLEXT = @SHLEXT@
-
- at DEFHAVE_X@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-
-ver = @ver@
-MPATH = @mpath@
-OPATH = @opath@
-XPATH = @xpath@
-ALTMPATH = @altmpath@
-ALTOPATH = @altopath@
-
-HAVE_DO_FORTRAN_INDEXING = @HAVE_DO_FORTRAN_INDEXING@
-HAVE_PROPAGATE_EMPTY_MATRICES = @HAVE_PROPAGATE_EMPTY_MATRICES@
-HAVE_OK_TO_LOSE_IMAGINARY_PART = @HAVE_OK_TO_LOSE_IMAGINARY_PART@
-HAVE_ND_ARRAYS = @HAVE_ND_ARRAYS@
-TYPEID_HAS_CLASS = @TYPEID_HAS_CLASS@
-CLASS_HAS_LOAD_SAVE = @CLASS_HAS_LOAD_SAVE@
-HAVE_OCTAVE_MAP_INDEX = @HAVE_OCTAVE_MAP_INDEX@
-HAVE_OCTAVE_CONCAT = @HAVE_OCTAVE_CONCAT@
-HAVE_SWAP_BYTES = @HAVE_SWAP_BYTES@
-HAVE_OCTAVE_UPLUS = @HAVE_OCTAVE_UPLUS@
-
-MAKEINFO = @MAKEINFO@
-TEXI2DVI = @TEXI2DVI@
-TEXI2HTML = @TEXI2HTML@
-DVIPDF = @DVIPDF@
-DVIPS = @DVIPS@
-
-MKDOC = @MKDOC@
-MKTEXI = @MKTEXI@
-
-%.o: %.c ; $(MKOCTFILE) -c $<
-%.o: %.f ; $(MKOCTFILE) -c $<
-%.o: %.cc ; $(MKOCTFILE) -c $<
-%.oct: %.cc ; $(MKOCTFILE) $<
diff --git a/src/Makeconf.in b/src/Makeconf.in
index 3e794fe..daa122e 100644
--- a/src/Makeconf.in
+++ b/src/Makeconf.in
@@ -28,8 +28,6 @@ DESTDIR =
 RANLIB = @RANLIB@
 STRIP = @STRIP@
 LN_S = @LN_S@
-MKOCTLINK = @MKOCTLINK@
-OCTLINK= @OCTLINK@
 
 AWK = @AWK@
 
@@ -55,10 +53,6 @@ OCTAVE_VERSION = @OCTAVE_VERSION@
 MKOCTFILE = @MKOCTFILE@ -DHAVE_OCTAVE_$(ver) -v
 SHLEXT = @SHLEXT@
 
- at DEFHAVE_X@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-
 ver = @ver@
 MPATH = @mpath@
 OPATH = @opath@
@@ -66,31 +60,9 @@ XPATH = @xpath@
 ALTMPATH = @altmpath@
 ALTOPATH = @altopath@
 
-HAVE_DO_FORTRAN_INDEXING = @HAVE_DO_FORTRAN_INDEXING@
-HAVE_PROPAGATE_EMPTY_MATRICES = @HAVE_PROPAGATE_EMPTY_MATRICES@
-HAVE_OK_TO_LOSE_IMAGINARY_PART = @HAVE_OK_TO_LOSE_IMAGINARY_PART@
-HAVE_ND_ARRAYS = @HAVE_ND_ARRAYS@
-TYPEID_HAS_CLASS = @TYPEID_HAS_CLASS@
-CLASS_HAS_LOAD_SAVE = @CLASS_HAS_LOAD_SAVE@
-HAVE_OCTAVE_MAP_INDEX = @HAVE_OCTAVE_MAP_INDEX@
-HAVE_OCTAVE_CONCAT = @HAVE_OCTAVE_CONCAT@
-HAVE_SWAP_BYTES = @HAVE_SWAP_BYTES@
-HAVE_OCTAVE_UPLUS = @HAVE_OCTAVE_UPLUS@
-
-MAKEINFO = @MAKEINFO@
-TEXI2DVI = @TEXI2DVI@
-TEXI2HTML = @TEXI2HTML@
-DVIPDF = @DVIPDF@
-DVIPS = @DVIPS@
-
-MKDOC = @MKDOC@
-MKTEXI = @MKTEXI@
+ at DEFHAVE_GINAC@ 
 
 %.o: %.c ; $(MKOCTFILE) -c $<
 %.o: %.f ; $(MKOCTFILE) -c $<
 %.o: %.cc ; $(MKOCTFILE) -c $<
 %.oct: %.cc ; $(MKOCTFILE) $<
-# Define HAVE_GINAC=1 if GINAC is available.  Other packages might 
-# need to define search paths for headers and libraries here, but GiNaC
-# defines the script ginac-config to report these.
- at DEFHAVE_GINAC@
diff --git a/src/Makefile b/src/Makefile
index 107de9a..f97861f 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -20,33 +20,22 @@ OBJ=$(SRC:.cc=.o)
 
 %.o: %.cc ; $(MKOCTFILE) -v $(GINAC_CPP_FLAGS) $(HAVE_ND_ARRAYS) $(TYPEID_HAS_CLASS) -c $<
 
-FUNCTIONS=vpa sym is_vpa is_sym is_ex to_double digits\
-          Cos Sin Tan aCos aSin aTan Cosh Sinh Tanh aCosh\
-          aSinh aTanh Exp Log Sqrt subs differentiate expand\
-          collect coeff lcoeff tcoeff degree ldegree quotient\
-          remainder premainder Pi ex_matrix probably_prime\
-	  findsymbols numden syminfo symlsolve sumterms
-	  
-SYMBOLS_LINKS=$(addsuffix $(OCTLINK),$(FUNCTIONS))
-
 ifdef HAVE_GINAC
-	PROGS=symbols.oct $(SYMBOLS_LINKS)
+PROGS=symbols.oct
 	GINAC_CPP_FLAGS=$(shell ginac-config --cppflags)
 	GINAC_LD_FLAGS=$(shell ginac-config --libs)
-else
-	PROGS=
-endif
-
 
 all: $(PROGS)
+else
+all:
+	@echo "Ginac library or headers not found"
+	false
+
+endif
 
 $(PROGS): Makefile
 
 symbols.oct: $(OBJ)
 	$(MKOCTFILE) -v -o $@ $(OBJ) $(GINAC_LD_FLAGS)
 
-$(SYMBOLS_LINKS):
-	-$(RM) $@
-	$(MKOCTLINK) symbols.oct $@
-
 clean: ; $(RM) *.o core octave-core *.oct *~
diff --git a/src/autogen.sh b/src/autogen.sh
index e911da0..7c3253b 100755
--- a/src/autogen.sh
+++ b/src/autogen.sh
@@ -4,10 +4,6 @@
 rm -f configure.in
 echo "dnl --- DO NOT EDIT --- Automatically generated by autogen.sh" > configure.in
 cat configure.base >> configure.in
-files=`find . -name configure.add -print`
-if test ! -z "$files" ; then
-  cat $files >> configure.in
-fi
 cat <<EOF >> configure.in
   AC_OUTPUT(\$CONFIGURE_OUTPUTS)
   dnl XXX FIXME XXX chmod is not in autoconf's list of portable functions
@@ -22,12 +18,3 @@ find . -name NOINSTALL -print    # shows which toolboxes won't be installed
 EOF
 
 autoconf && rm -f configure.in
-
-## Generate ./Makeconf.in
-rm -f Makeconf.in
-cp Makeconf.base Makeconf.in
-files=`find . -name Makeconf.add -print`
-if test ! -z "$files" ; then
-  cat $files >> Makeconf.in
-fi
-
diff --git a/src/configure.add b/src/configure.add
deleted file mode 100644
index b25cde6..0000000
--- a/src/configure.add
+++ /dev/null
@@ -1,40 +0,0 @@
-
-if test -e main/symbolic/NOINSTALL ; then
-
-	dnl Not installing so don't test for GiNaC.
-	STATUS=noinstall
-
-else
-
-	dnl Checking if the ginac-config program exists.  See the autoconf
-	dnl manual for an extensive list of checks available.  The results
-	dnl of the check are held in have_ginac.
-	AC_DEFINE(have_ginac)
-	AC_CHECK_PROG(have_ginac, ginac-config, yes, no)
-
-	if test $have_ginac = no ; then
-
-	    dnl ginac-config doesn't exist: instruct the user how to install
-	    STATUS="GiNaC not found --- see main/symbolic/INSTALL"
-
-	else
-
-	    dnl ginac-config exists: cheer
-	    STATUS=yes
-
-	    dnl Let Makeconf.add know that ginac-config exists.	We don't
-	    dnl need to report the library location since ginac-config
-	    dnl does that.  AC_SUBST says replace @VAR@ in the substituted
-	    dnl file with the value of VAR.
-	    AC_SUBST(DEFHAVE_GINAC)
-	    DEFHAVE_GINAC="HAVE_GINAC=1"
-
-	fi
-fi
-
-dnl Append the status message to the global status message.  This will
-dnl be displayed at the end of configuration so that the user doesn't
-dnl have to scan the list for critical details.
-
-STATUS_MSG="$STATUS_MSG
-   symbolic toolbox: $STATUS"
diff --git a/src/configure.base b/src/configure.base
index 7a30b53..537b34b 100644
--- a/src/configure.base
+++ b/src/configure.base
@@ -229,34 +229,6 @@ TRY_MKOCTFILE([for F77_FUNC],
 [int F77_FUNC (hello, HELLO) (const int &n);],,
 [MKOCTFILE="$MKOCTFILE -DF77_FUNC=F77_FCN"])
 
-dnl
-dnl Check if octave still uses SLList.h
-dnl
-TRY_MKOCTFILE([for SLList.h],[#include <octave/SLList.h>],
-[MKOCTFILE="$MKOCTFILE -DHAVE_SLLIST_H"],)
-
-dnl
-dnl Check if octave has lo_ieee_nan_value
-dnl
-TRY_MKOCTFILE([for lo_ieee_nan_value],
-[ #include <octave/lo-ieee.h>
-int test(void) { lo_ieee_nan_value(); }],,
-[MKOCTFILE="$MKOCTFILE -DUSE_OCTAVE_NAN"])
-
-dnl
-dnl Check if octave is needs octave_idx_type
-dnl
-TRY_MKOCTFILE([for octave_idx_type],
-[#include <octave/oct-types.h>
-octave_idx_type test(void) { octave_idx_type idx = 1; return idx; }],,
-[MKOCTFILE="$MKOCTFILE -Doctave_idx_type=int"])
-
-dnl
-dnl Check if octave uses quit.h
-dnl
-TRY_MKOCTFILE([for quit.h],[#include <octave/quit.h>],,
-[MKOCTFILE="$MKOCTFILE -DNEED_OCTAVE_QUIT"])
-
 dnl **********************************************************
 
 dnl Evaluate an expression in octave
@@ -326,170 +298,25 @@ case "$canonical_host_type" in
     ;;
 esac
 
-dnl Things needed to link to X11 programs
-dnl defines X_CFLAGS, X_LIBS
-AC_SUBST(DEFHAVE_X)
-AC_SUBST(X_LIBS)
-AC_SUBST(X_CFLAGS)
-AC_PATH_XTRA
-if test "$no_x" = yes ; then
-	DEFHAVE_X=
-	XSTATUS="no (plot/g{input,text,zoom,rab} will not work)"
-else
-	DEFHAVE_X="HAVE_X=1"
-	X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
-	XSTATUS="yes"
-fi
-
-OCTAVE_CHECK_EXIST(autoload,[
-	HAVE_AUTOLOAD="yes"
-	OCTLINK=.octlink
-	MKOCTLINK=$TOPDIR/admin/octlink.sh
-],[
-	HAVE_AUTOLOAD="no"
-	OCTLINK=.oct
-	MKOCTLINK=$LN_S
-])
-AC_SUBST(HAVE_AUTOLOAD)
-AC_SUBST(OCTLINK)
-AC_SUBST(MKOCTLINK)
-
-OCTAVE_CHECK_EXIST(do_fortran_indexing,
-	[HAVE_DO_FORTRAN_INDEXING="-DHAVE_DO_FORTRAN_INDEXING"],)
-AC_SUBST(HAVE_DO_FORTRAN_INDEXING)
-
-OCTAVE_CHECK_EXIST(propagate_empty_matrices,
-	[PROPAGATE_EMPTY_MATRICES="-DHAVE_PROPAGATE_EMPTY_MATRICES"],)
-AC_SUBST(HAVE_PROPAGATE_EMPTY_MATRICES)
-
-OCTAVE_CHECK_EXIST(ok_to_lose_imaginary_part,
-  [HAVE_OK_TO_LOSE_IMAGINARY_PART="-DHAVE_OK_TO_LOSE_IMAGINARY_PART"],)
-AC_SUBST(HAVE_OK_TO_LOSE_IMAGINARY_PART)
-
-dnl Test for N-dimensional Arrays
-TRY_MKOCTFILE([for N-dim arrays],
-[#include <octave/dim-vector.h>],
-[HAVE_ND_ARRAYS="-DHAVE_ND_ARRAYS"],)
-AC_SUBST(HAVE_ND_ARRAYS)
-
-OCTAVE_CHECK_EXIST(class,[TYPEID_HAS_CLASS="-DTYPEID_HAS_CLASS"],)
-AC_SUBST(TYPEID_HAS_CLASS)
-
-dnl Test for load/save functions in class
-TRY_MKOCTFILE([for load/save functions in class],
-[#include <octave/ov-scalar.h>
-int main (void) { octave_scalar a; a.load_ascii(std::cin); }],
-[CLASS_HAS_LOAD_SAVE="-DCLASS_HAS_LOAD_SAVE"],)
-AC_SUBST(CLASS_HAS_LOAD_SAVE)
-
-TRY_MKOCTFILE([for Octave_map indexing],
-[#include <octave/oct-map.h>
-int main(void) { Octave_map a; a[["key"]]; }],
-[HAVE_OCTAVE_MAP_INDEX="-DHAVE_OCTAVE_MAP_INDEX"],)
-AC_SUBST(HAVE_OCTAVE_MAP_INDEX)
-
-TRY_MKOCTFILE([for old Octave concatenation],
-[#include <octave/dNDArray.h>
-int main(void) { NDArray a(dim_vector(1,1)); Array<int> idx(2,0); a=concat(a,a,idx); }],
-[HAVE_OCTAVE_CONCAT="-DHAVE_OLD_OCTAVE_CONCAT"],)
-
-TRY_MKOCTFILE([for Octave concatenation],
-[#include <octave/dNDArray.h>
-int main(void) { NDArray a(dim_vector(1,1)); Array<int> idx(2,0); a=a.concat(a,idx); }],
-[HAVE_OCTAVE_CONCAT="-DHAVE_OCTAVE_CONCAT"],)
-AC_SUBST(HAVE_OCTAVE_CONCAT)
-
-TRY_MKOCTFILE([for swap_8_bytes],
-[#include <sys/types.h>
-#include <octave/config.h>
-#include <octave/byte-swap.h>
-int main(void) {long long a = 1; swap_8_bytes (&a,1);}],,
-[HAVE_SWAP_BYTES="-DHAVE_SWAP_BYTES"])
-AC_SUBST(HAVE_SWAP_BYTES)
-
-TRY_MKOCTFILE([for op_uplus],
-[#include <octave/config.h>
-#include <octave/ov.h>
-int main(void) {int i = octave_value::op_uplus;}],
-[HAVE_OCTAVE_UPLUS="-DHAVE_OCTAVE_UPLUS"],)
-AC_SUBST(HAVE_OCTAVE_UPLUS)
-
-dnl Test for the makeinfo program
-AC_CHECK_PROG(MAKEINFO,makeinfo,makeinfo)
-if [ test -n "$MAKEINFO" ]; then
-	dnl Check whether the makeinfo command accepts the 
-	dnl "--no-split" option
-	touch conftest.texi
-	AC_MSG_CHECKING([for makeinfo --no-split])
-	ac_try="$MAKEINFO --no-split conftest.texi"
-	if AC_TRY_EVAL(ac_try) ; then
-		MAKEINFO="$MAKEINFO --no-split"
-		AC_MSG_RESULT(yes)
-	else
-		AC_MSG_RESULT(no)
-	fi
-	rm -f conftest.*
-fi
+dnl Checking if the ginac-config program exists.  See the autoconf
+dnl manual for an extensive list of checks available.  The results
+dnl of the check are held in have_ginac.
+AC_DEFINE(have_ginac)
+AC_CHECK_PROG(have_ginac, ginac-config, yes, no)
 
-dnl Test for the texi2dvi program
-AC_CHECK_PROG(TEXI2DVI,texi2dvi,texi2dvi)
-if [ test -n "$TEXI2DVI" ]; then
-	dnl Check whether the texi2dvi command accepts the 
-	dnl "--clean" option
-	cat > conftest.texi <<EOF
-\input texinfo
- at bye
-EOF
-	AC_MSG_CHECKING([that texi2dvi runs])
-	ac_try="$TEXI2DVI conftest.texi > /dev/null"
-	if AC_TRY_EVAL(ac_try) ; then
-	    AC_MSG_RESULT(yes)
-	    AC_MSG_CHECKING([for texi2dvi --clean])
-	    ac_try="$TEXI2DVI --clean conftest.texi > /dev/null"
-	    if AC_TRY_EVAL(ac_try) ; then
-		TEXI2DVI="$TEXI2DVI --clean"
-		AC_MSG_RESULT(yes)
-	    else
-		AC_MSG_RESULT(no)
-	    fi
-	else
-	    TEXI2DVI=""
-	    AC_MSG_RESULT(no)
-	fi
-	rm -f conftest.*
-fi
-
-dnl Test for the texi2html program
-AC_CHECK_PROG(TEXI2HTML,texi2html,texi2html)
-if [ test -n "$TEXI2HTML" ]; then
-	STATUS="yes"
-	dnl Check whether the texi2html command accepts the 
-	dnl "-split_chapter -number" option
-	touch conftest.texi
-	AC_MSG_CHECKING([for texi2html --clean])
-	ac_try="$TEXI2HTML -split_chapter -number conftest.texi"
-	if AC_TRY_EVAL(ac_try) ; then
-		TEXI2HTML="$TEXI2HTML -split_chapter -number"
-		AC_MSG_RESULT(yes)
-	else
-		AC_MSG_RESULT(no)
-	fi
-	rm -f conftest.*
-        dnl TeTex 3.0 on Suse is leaving a conftest directory
-	rm -rf conftest
-fi
+if test $have_ginac = no ; then
 
-dnl Test for the dvipdf program
-AC_CHECK_PROG(DVIPDF,dvipdf,dvipdf)
+    dnl ginac-config doesn't exist: instruct the user how to install
+    GINACSTATUS="GiNaC not found --- see main/symbolic/INSTALL"
 
-dnl Test for the dvips program
-AC_CHECK_PROG(DVIPS,dvips,dvips)
+else
 
-MKDOC=$TOPDIR/admin/mkdoc
-AC_SUBST(MKDOC)
+    dnl ginac-config exists: cheer
+    GINACSTATUS=yes
+    AC_SUBST(DEFHAVE_GINAC)
+    DEFHAVE_GINAC="HAVE_GINAC=1"
 
-MKTEXI=$TOPDIR/admin/mktexi
-AC_SUBST(MKTEXI)
+fi
 
 CONFIGURE_OUTPUTS="Makeconf octinst.sh"
 STATUS_MSG="
@@ -510,11 +337,4 @@ shell commands will install into the following directories:
 octave-forge is configured with
    octave:      $OCTAVE (version $OCTAVE_VERSION)
    mkoctfile:	$MKOCTFILE for Octave $subver
-   X11 support:	$XSTATUS
-   makeinfo:    $MAKEINFO
-   texi2dvi:    $TEXI2DVI
-   texi2html:   $TEXI2HTML
-   mkdoc:       $MKDOC
-   mktexi:      $MKTEXI
-   dvips:       $DVIPS
-   dvipdf:      $DVIPDF"
+   symbolic toolbox: $GINACSTATUS"
diff --git a/src/findsymbols.cc b/src/findsymbols.cc
index 90df2e0..c5b9b24 100644
--- a/src/findsymbols.cc
+++ b/src/findsymbols.cc
@@ -17,12 +17,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 */
 #include <octave/oct.h>
-
-#ifdef NEED_OCTAVE_QUIT
-#define OCTAVE_QUIT do {} while (0)
-#else
 #include <octave/quit.h>
-#endif
 
 #include <ginac/ginac.h>
 #include "ov-vpa.h"
diff --git a/src/ov-ex-mat.cc b/src/ov-ex-mat.cc
index 43ba619..124b114 100644
--- a/src/ov-ex-mat.cc
+++ b/src/ov-ex-mat.cc
@@ -103,8 +103,4 @@ octave_ex_matrix& octave_ex_matrix::operator=(const octave_ex_matrix& a)
 
 DEFINE_OCTAVE_ALLOCATOR (octave_ex_matrix);
 
-#ifdef TYPEID_HAS_CLASS
 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_ex_matrix, "symbolic matrix","sym");
-#else
-DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_ex_matrix, "symbolic matrix");
-#endif
diff --git a/src/ov-ex-mat.h b/src/ov-ex-mat.h
index d7a9d98..d6f68fe 100644
--- a/src/ov-ex-mat.h
+++ b/src/ov-ex-mat.h
@@ -23,10 +23,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include <ginac/ginac.h>
 
-#ifndef OV_REP_TYPE
-#define OV_REP_TYPE octave_value
-#endif
-
 class octave_matrix;
 class octave_complex_matrix;
 
@@ -64,9 +60,7 @@ public:
       return new octave_ex_matrix (*this); 
     }
   
-#ifdef HAVE_ND_ARRAYS
   dim_vector dims (void) const {dim_vector dv (x.rows(), x.cols()); return dv; }
-#endif
   int rows (void) const { return x.rows (); }
   int columns (void) const { return x.cols (); }
   
diff --git a/src/ov-ex.cc b/src/ov-ex.cc
index 41891f2..b4a4d07 100644
--- a/src/ov-ex.cc
+++ b/src/ov-ex.cc
@@ -138,11 +138,7 @@ octave_ex& octave_ex::operator=(const octave_ex& a)
 
 DEFINE_OCTAVE_ALLOCATOR (octave_ex);
 
-#ifdef TYPEID_HAS_CLASS
 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_ex, "ex", "sym");
-#else
-DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_ex, "ex");
-#endif
 
 /*
 ;;; Local Variables: ***
diff --git a/src/ov-ex.h b/src/ov-ex.h
index 1a98bf3..1980f67 100644
--- a/src/ov-ex.h
+++ b/src/ov-ex.h
@@ -27,10 +27,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #include <octave/ov-scalar.h>
 #include "ov-vpa.h"
 
-#ifndef OV_REP_TYPE
-#define OV_REP_TYPE octave_value
-#endif
-
 class octave_complex;
 class octave_scalar;
 
@@ -62,9 +58,7 @@ public:
       return new octave_ex (*this); 
     }
   
-#ifdef HAVE_ND_ARRAYS
   dim_vector dims (void) const { static dim_vector dv (1, 1); return dv; }
-#endif
   int rows (void) const { return 1; }
   int columns (void) const { return 1; }
   
diff --git a/src/ov-relational.cc b/src/ov-relational.cc
index 6db92c1..ecc3fd9 100644
--- a/src/ov-relational.cc
+++ b/src/ov-relational.cc
@@ -60,11 +60,7 @@ octave_relational::print (std::ostream& os, bool pr_as_read_syntax) const
 
 DEFINE_OCTAVE_ALLOCATOR (octave_relational);
 
-#ifdef TYPEID_HAS_CLASS
 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_relational, "relational", "sym");
-#else
-DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_relational, "relational");
-#endif
 
 /*
 ;;; Local Variables: ***
diff --git a/src/ov-relational.h b/src/ov-relational.h
index 4a8d806..e7be108 100644
--- a/src/ov-relational.h
+++ b/src/ov-relational.h
@@ -26,10 +26,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #include <octave/ov-base.h>
 #include "ov-ex.h"
 
-#ifndef OV_REP_TYPE
-#define OV_REP_TYPE octave_value
-#endif
-
 // relational values.
 
 class
@@ -61,9 +57,7 @@ public:
 
   OV_REP_TYPE *clone (void) { return new octave_relational (*this); }
 
-#ifdef HAVE_ND_ARRAYS
   dim_vector dims (void) const { static dim_vector dv (1, 1); return dv; }
-#endif
   int rows (void) const { return 1; }
   int columns (void) const { return 1; }
 
diff --git a/src/ov-vpa.cc b/src/ov-vpa.cc
index d831c1b..c7deba8 100644
--- a/src/ov-vpa.cc
+++ b/src/ov-vpa.cc
@@ -56,11 +56,7 @@ octave_vpa::print (std::ostream& os, bool pr_as_read_syntax) const
 
 DEFINE_OCTAVE_ALLOCATOR (octave_vpa);
 
-#ifdef TYPEID_HAS_CLASS
 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_vpa, "vpa", "sym");
-#else
-DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_vpa, "vpa");
-#endif
 
 /*
 ;;; Local Variables: ***
diff --git a/src/ov-vpa.h b/src/ov-vpa.h
index 1d8acce..0c0b529 100644
--- a/src/ov-vpa.h
+++ b/src/ov-vpa.h
@@ -27,13 +27,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #include <octave/oct-alloc.h>
 #include <octave/ov-typeinfo.h>
 
-#ifdef OV_REP_TYPE
-#define TYPE_CONV_FCN OV_REP_TYPE::type_conv_fcn
-#else
-#define OV_REP_TYPE octave_value
-#define TYPE_CONV_FCN type_conv_fcn
-#endif
-
 // vpa values.
 
 class
@@ -56,9 +49,7 @@ public:
   void operator delete (void *p, size_t size);
 #endif 
 
-#ifdef HAVE_ND_ARRAYS
   dim_vector dims (void) const { static dim_vector dv (1, 1); return dv; }
-#endif
   int rows (void) const { return 1; }
   int columns (void) const { return 1; }
 
diff --git a/src/sumterms.cc b/src/sumterms.cc
index 6674030..f440f12 100644
--- a/src/sumterms.cc
+++ b/src/sumterms.cc
@@ -16,13 +16,9 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 */
-#include <octave/oct.h>
 
-#ifdef NEED_OCTAVE_QUIT
-#define OCTAVE_QUIT do {} while (0)
-#else
+#include <octave/oct.h>
 #include <octave/quit.h>
-#endif
 
 #include <ginac/ginac.h>
 #include "ov-ex.h"
diff --git a/src/symbols.cc b/src/symbols.cc
index 4f7659c..0cb7733 100644
--- a/src/symbols.cc
+++ b/src/symbols.cc
@@ -30,12 +30,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #include <octave/gripes.h>
 #include <octave/oct-obj.h>
 #include <octave/pager.h>
-
-#ifdef NEED_OCTAVE_QUIT
-#define OCTAVE_QUIT do {} while (0)
-#else
 #include <octave/quit.h>
-#endif
 
 #include <ginac/ginac.h>
 #include "ov-vpa.h"
diff --git a/src/symbols.h b/src/symbols.h
index 43af378..73c79fe 100644
--- a/src/symbols.h
+++ b/src/symbols.h
@@ -18,7 +18,7 @@ Return the " description " of a symbolic expression.\n\
  \
   if (nargin != 1) \
     { \
-      print_usage(# oct_name); \
+      print_usage(); \
       return retval; \
     } \
  \
@@ -26,7 +26,7 @@ Return the " description " of a symbolic expression.\n\
    { \
       if(!get_expression(args(0), expression)) \
         { \
-          print_usage(# oct_name); \
+          print_usage(); \
           return retval; \
         } \
  \
@@ -66,13 +66,13 @@ Return the " description " of a symbolic expression.\n\
     { \
       if(!get_expression(args(0), expression)) \
         { \
-          print_usage(# oct_name); \
+          print_usage(); \
           return retval; \
         } \
  \
       if (!get_symbol(args(1), sym)) \
         { \
-          print_usage(# oct_name); \
+          print_usage(); \
           return retval; \
         } \
  \
@@ -116,21 +116,21 @@ Return the " description " of a symbolic expression.\n\
       if(!get_expression(args(0), expression0)) \
         { \
           gripe_wrong_type_arg(# oct_name, args(0)); \
-          print_usage(# oct_name); \
+          print_usage(); \
           return retval; \
         } \
  \
       if(!get_expression(args(1), expression1)) \
         { \
           gripe_wrong_type_arg(# oct_name, args(1)); \
-          print_usage(# oct_name); \
+          print_usage(); \
           return retval; \
         } \
  \
       if (!get_symbol(args(2), sym)) \
         { \
           gripe_wrong_type_arg(# oct_name, args(2)); \
-          print_usage(# oct_name); \
+          print_usage(); \
           return retval; \
         } \
  \

-- 
octave-symbolic



More information about the Pkg-octave-commit mailing list