Mercurial > hg > octave-terminal
changeset 12218:e3048d7fb131
remove ARPACK from documentation and some config files
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Sun, 30 Jan 2011 02:43:10 -0500 |
parents | 6ef3e671c87c |
children | 17d7834df7b4 |
files | ChangeLog NEWS README.MacOS configure.ac doc/ChangeLog doc/interpreter/install.txi src/ChangeLog src/Makefile.am |
diffstat | 8 files changed, 27 insertions(+), 64 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-01-30 John W. Eaton <jwe@octave.org> + + * configure.ac: Remove code to print warning for missing ARPACK. + * README.MacOS: Remove arpack from list of prerequisite software. + 2010-01-29 Rik <octave@nomad.inbox5.com> * NEWS: Deprecate saveimage function.
--- a/NEWS +++ b/NEWS @@ -416,6 +416,10 @@ * For compatibility with Matlab, mu2lin (x) is now equivalent to mu2lin (x, 0). + * The ARPACK library is now distributed with Octave so it no longer + needs to be available as an external dependency when building + Octave. + Summary of important user-visible changes for version 3.2: ---------------------------------------------------------
--- a/README.MacOS +++ b/README.MacOS @@ -152,7 +152,6 @@ To build Octave's sources the list of Fink packages below need to be installed. aquaterm - arpack autoconf (>= 2.6.0) automake (>= 1.11) fftw3 (>= 3.1.1)
--- a/configure.ac +++ b/configure.ac @@ -2233,11 +2233,6 @@ warn_msg_printed=true fi -if test -n "$warn_arpack"; then - AC_MSG_WARN([$warn_arpack]) - warn_msg_printed=true -fi - if test -n "$warn_curl"; then AC_MSG_WARN([$warn_curl]) warn_msg_printed=true
--- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,8 @@ +2011-01-30 John W. Eaton <jwe@octave.org> + + * interpreter/install.txi (Compiling Octave with 64-bit Indexing): + Remove info about ARPACK. + 2011-01-29 Rik <octave@nomad.inbox5.com> * interpreter/octave.texi: Add new subsection on FLTK interaction.
--- a/doc/interpreter/install.txi +++ b/doc/interpreter/install.txi @@ -140,9 +140,6 @@ @item --without-camd Don't use @sc{camd}, disable some sparse matrix functionality. -@item --without-arpack -Don't use @sc{arpack}, disable @code{eigs} function. - @item --without-colamd Don't use @sc{colamd}, disable some sparse matrix functionality. @@ -402,56 +399,6 @@ you installed the @sc{lapack} library as $prefix64/lib/liblapack.a. @end itemize -@item @sc{arpack} (@url{http://www.caam.rice.edu/software/ARPACK}) - -@itemize @minus -@item -In @file{ARmake.inc} set the following variables: - -@example -@group -home=path to directory @sc{arpack} -FC=gfortran -FFLAGS=-fPIC -fdefault-integer-8 -MAKE=/usr/bin/make -ARPACKLIB=$(home)/libarpack.a -DIRS=$(UTILdir) $(SRCdir) -@end group -@end example - -@item -Edit the file @file{UTIL/second.f} and change the line - -@example -EXTERNAL ETIME -@end example - -@noindent -to - -@example -INTRINSIC ETIME -@end example - -@item -After building the @file{.a} library, you can make a shared version with - -@example -@group -mkdir tmp -cd tmp -ar x ../libarpack.a -gcc -shared -o ../libarpack.so *.o -L$prefix64/lib \ - -llapack -lblas -cd .. -rm -rf tmp -@end group -@end example - -@noindent -Copy the library @file{libarpack.so} to @file{$prefix64/lib/libarpack.a}. -@end itemize - @item QRUPDATE (@url{http://sourceforge.net/projects/qrupdate}) In the @file{Makeconf} file:
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,13 @@ +2011-01-30 John W. Eaton <jwe@octave.org> + + * Makefile.am (OCTAVE_LIBS): Remove $(ARPACK_LDFLAGS) and + $(ARPACK_LIBS) from the list. + (DLD-FUNCTIONS/eigs.df): Don't add $(ARPACK_CPPFLAGS) to CPPFLAGS. + (DLD_FUNCTIONS_eigs_la_CPPFLAGS): Remove $(ARPACK_CPPFLAGS) from + the list. + (DLD_FUNCTIONS_eigs_la_LIBADD): Remove $(ARPACK_LDFLAGS) and + $(ARPACK_LIBS) from the list. + 2011-01-30 John W. Eaton <jwe@octave.org> * load-save.cc (Fload): Doc fix.
--- a/src/Makefile.am +++ b/src/Makefile.am @@ -504,7 +504,6 @@ ../libcruft/libranlib.la \ ../libgnu/libgnu.la \ $(SPARSE_XLDFLAGS) $(SPARSE_XLIBS) \ - $(ARPACK_LDFLAGS) $(ARPACK_LIBS) \ $(QRUPDATE_LDFLAGS) $(QRUPDATE_LIBS) \ $(FFTW_XLDFLAGS) $(FFTW_XLIBS) \ $(LAPACK_LIBS) $(BLAS_LIBS) \ @@ -531,7 +530,6 @@ ../libgnu/libgnu.la \ $(FFTW_XLDFLAGS) $(FFTW_XLIBS) $(QHULL_LDFLAGS) $(QHULL_LIBS) \ - $(ARPACK_LDFLAGS) $(ARPACK_LIBS) \ $(QRUPDATE_LDFLAGS) $(QRUPDATE_LIBS) \ $(SPARSE_XLDFLAGS) $(SPARSE_XLIBS) \ $(REGEX_LDFLAGS) $(REGEX_LIBS) \ @@ -797,9 +795,9 @@ DLD_FUNCTIONS___voronoi___la_CPPFLAGS = $(AM_CPPFLAGS) $(QHULL_CPPFLAGS) DLD_FUNCTIONS___voronoi___la_LIBADD += $(QHULL_LDFLAGS) $(QHULL_LIBS) -DLD-FUNCTIONS/eigs.df: CPPFLAGS += $(ARPACK_CPPFLAGS) $(SPARSE_XCPPFLAGS) -DLD_FUNCTIONS_eigs_la_CPPFLAGS = $(AM_CPPFLAGS) $(ARPACK_CPPFLAGS) $(SPARSE_XCPPFLAGS) -DLD_FUNCTIONS_eigs_la_LIBADD += $(ARPACK_LDFLAGS) $(ARPACK_LIBS) $(SPARSE_XLDFLAGS) $(SPARSE_XLIBS) $(LAPACK_LIBS) $(BLAS_LIBS) +DLD-FUNCTIONS/eigs.df: CPPFLAGS += $(SPARSE_XCPPFLAGS) +DLD_FUNCTIONS_eigs_la_CPPFLAGS = $(AM_CPPFLAGS) $(SPARSE_XCPPFLAGS) +DLD_FUNCTIONS_eigs_la_LIBADD += $(SPARSE_XLDFLAGS) $(SPARSE_XLIBS) $(LAPACK_LIBS) $(BLAS_LIBS) #DLD-FUNCTIONS/qz.df DLD-FUNCTIONS/qz.lo: DLD_FUNCTIONS_qz_la_LIBADD += $(LAPACK_LIBS) $(BLAS_LIBS)