Mercurial > forge

changeset 2404:11d0a1276eaf octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplify geometry package
author adb014
date Wed, 23 Aug 2006 23:31:37 +0000
parents db9486696ca1
children e82c27feead3
files main/geometry/Makefile main/geometry/src/.cvsignore main/geometry/src/Makeconf.add main/geometry/src/Makeconf.base main/geometry/src/Makeconf.in main/geometry/src/autogen.sh main/geometry/src/configure.add main/geometry/src/configure.base
diffstat 8 files changed, 57 insertions(+), 397 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/main/geometry/Makefile	Wed Aug 23 23:31:37 2006 +0000
@@ -0,0 +1,5 @@
+sinclude ../../Makeconf
+sinclude ../../pkg.mk
+
+PKG_FILES = $(patsubst %, geometry/%, AUTHORS ChangeLog COPYING DESCRIPTION \
+	README TODO $(wildcard src/*) $(wildcard inst/*))
--- a/main/geometry/src/.cvsignore	Wed Aug 23 23:07:09 2006 +0000
+++ b/main/geometry/src/.cvsignore	Wed Aug 23 23:31:37 2006 +0000
@@ -1,3 +1,3 @@
-PKG_ADD
-*.octlink
 *.oct
+configure
+autom4te.cache
--- a/main/geometry/src/Makeconf.add	Wed Aug 23 23:07:09 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-HAVE_QHULL=@have_qhull@
-NEED_QHULL_VERSION=@need_qhull_version@
--- a/main/geometry/src/Makeconf.base	Wed Aug 23 23:07:09 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -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@
-
-@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) $<
--- a/main/geometry/src/Makeconf.in	Wed Aug 23 23:07:09 2006 +0000
+++ b/main/geometry/src/Makeconf.in	Wed Aug 23 23:31:37 2006 +0000
@@ -28,8 +28,6 @@
 RANLIB = @RANLIB@
 STRIP = @STRIP@
 LN_S = @LN_S@
-MKOCTLINK = @MKOCTLINK@
-OCTLINK= @OCTLINK@
 
 AWK = @AWK@
 
@@ -55,10 +53,6 @@
 MKOCTFILE = @MKOCTFILE@ -DHAVE_OCTAVE_$(ver) -v
 SHLEXT = @SHLEXT@
 
-@DEFHAVE_X@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-
 ver = @ver@
 MPATH = @mpath@
 OPATH = @opath@
@@ -66,29 +60,10 @@
 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@
+HAVE_QHULL=@have_qhull@
+NEED_QHULL_VERSION=@need_qhull_version@
 
 %.o: %.c ; $(MKOCTFILE) -c $<
 %.o: %.f ; $(MKOCTFILE) -c $<
 %.o: %.cc ; $(MKOCTFILE) -c $<
 %.oct: %.cc ; $(MKOCTFILE) $<
-HAVE_QHULL=@have_qhull@
-NEED_QHULL_VERSION=@need_qhull_version@
--- a/main/geometry/src/autogen.sh	Wed Aug 23 23:07:09 2006 +0000
+++ b/main/geometry/src/autogen.sh	Wed Aug 23 23:31:37 2006 +0000
@@ -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
@@ -23,11 +19,3 @@
 
 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
-
--- a/main/geometry/src/configure.add	Wed Aug 23 23:07:09 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-dnl The following check fails because qhull wants qh_version to be
-dnl defined by the user!?!
-dnl    OF_CHECK_LIB(qhull,qh_qhull,HAVE_LIBQHULL)
-dnl Instead we use the following mess cribbed from acgeneral.m4:
-
-AC_DEFUN(AC_CHECK_QHULL_VERSION,
-[AC_MSG_CHECKING([for qh_qhull in -lqhull with qh_version])
-AC_CACHE_VAL(ac_cv_lib_qhull_version,
-[changequote(, )dnl
-cat > conftest.c <<EOF
-#include <stdio.h>
-char qh_version[] = "version";
-char qh_qhull();
-int
-main(argc, argv)
-  int argc;
-  char *argv[];
-{
-  qh_qhull();
-  return 0;
-}
-EOF
-changequote([, ])dnl
-ac_try="${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS conftest.c -o conftest -lqhull $LIBS"
-if AC_TRY_EVAL(ac_try) && test -s conftest ; then
-    ac_cv_lib_qhull_version=yes
-else
-    ac_cv_lib_qhull_version=no
-fi
-rm -f conftest.c conftest.o conftest
-])dnl
-if test "$ac_cv_lib_qhull_version" = "yes"; then
-  AC_MSG_RESULT(yes)
-  ifelse([$1], , , [$1])
-else
-  AC_MSG_RESULT(no)
-  ifelse([$2], , , [$2])
-fi
-])
-
-
-if test -e main/geometry/NOINSTALL ; then
-    dnl Not installing so don't test for it.
-    HAVE_LIBQHULL=
-    STATUS=noinstall
-else
-    dnl Do we have libqhull?
-    AC_SUBST(have_qhull)
-    AC_SUBST(need_qhull_version)
-    AC_CHECK_HEADER(qhull/qhull_a.h, have_qhull=yes, have_qhull=no)
-    if test $have_qhull = yes ; then
-        OF_CHECK_LIB(qhull, qh_qhull, have_qhull=yes, have_qhull=no)
-	if test $have_qhull = yes ; then
-	    need_qhull_version=no
-	else
-	    AC_CHECK_QHULL_VERSION(have_qhull=yes, have_qhull=no)
-	    need_qhull_version=yes
-	fi
-    fi
-    if test $have_qhull = yes ; then
-	STATUS=yes
-    else
-	STATUS="Qhull not found --- see main/geometry/README"
-    fi
-fi
-
-STATUS_MSG="$STATUS_MSG
-   geometry toolbox: $STATUS"
--- a/main/geometry/src/configure.base	Wed Aug 23 23:07:09 2006 +0000
+++ b/main/geometry/src/configure.base	Wed Aug 23 23:31:37 2006 +0000
@@ -229,34 +229,6 @@
 [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,171 +298,60 @@
     ;;
 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)"
+AC_DEFUN(AC_CHECK_QHULL_VERSION,
+[AC_MSG_CHECKING([for qh_qhull in -lqhull with qh_version])
+AC_CACHE_VAL(ac_cv_lib_qhull_version,
+[changequote(, )dnl
+cat > conftest.c <<EOF
+#include <stdio.h>
+char qh_version[] = "version";
+char qh_qhull();
+int
+main(argc, argv)
+  int argc;
+  char *argv[];
+{
+  qh_qhull();
+  return 0;
+}
+EOF
+changequote([, ])dnl
+ac_try="${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS conftest.c -o conftest -lqhull $LIBS"
+if AC_TRY_EVAL(ac_try) && test -s conftest ; then
+    ac_cv_lib_qhull_version=yes
 else
-	DEFHAVE_X="HAVE_X=1"
-	X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
-	XSTATUS="yes"
+    ac_cv_lib_qhull_version=no
 fi
-
-OCTAVE_CHECK_EXIST(autoload,[
-	HAVE_AUTOLOAD="yes"
-	OCTLINK=.octlink
-	MKOCTLINK=$TOPDIR/admin/octlink.sh
-],[
-	HAVE_AUTOLOAD="no"
-	OCTLINK=.oct
-	MKOCTLINK=$LN_S
+rm -f conftest.c conftest.o conftest
+])dnl
+if test "$ac_cv_lib_qhull_version" = "yes"; then
+  AC_MSG_RESULT(yes)
+  ifelse([$1], , , [$1])
+else
+  AC_MSG_RESULT(no)
+  ifelse([$2], , , [$2])
+fi
 ])
-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.*
+dnl Do we have libqhull?
+AC_SUBST(have_qhull)
+AC_SUBST(need_qhull_version)
+AC_CHECK_HEADER(qhull/qhull_a.h, have_qhull=yes, have_qhull=no)
+if test $have_qhull = yes ; then
+   OF_CHECK_LIB(qhull, qh_qhull, have_qhull=yes, have_qhull=no)
+    if test $have_qhull = yes ; then
+        need_qhull_version=no
+    else
+	AC_CHECK_QHULL_VERSION(have_qhull=yes, have_qhull=no)
+	need_qhull_version=yes
+    fi
 fi
-
-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
-@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.*
+if test $have_qhull = yes ; then
+    QHULLSTATUS=yes
+else
+    QHULLSTATUS="Qhull not found --- see main/geometry/README"
 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
-
-dnl Test for the dvipdf program
-AC_CHECK_PROG(DVIPDF,dvipdf,dvipdf)
-
-dnl Test for the dvips program
-AC_CHECK_PROG(DVIPS,dvips,dvips)
-
-MKDOC=$TOPDIR/admin/mkdoc
-AC_SUBST(MKDOC)
-
-MKTEXI=$TOPDIR/admin/mktexi
-AC_SUBST(MKTEXI)
-
 CONFIGURE_OUTPUTS="Makeconf octinst.sh"
 STATUS_MSG="
 octave commands will install into the following directories:
@@ -510,11 +371,4 @@
 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"
+   geometry toolbox: $QHULLSTATUS"