Mercurial > hg > octave-nkf
diff liboctave/dMatrix.cc @ 9523:0ce82753dd72
more configure changes for libraries
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 13 Aug 2009 18:20:31 -0400 |
| parents | c6edba80dfae |
| children | ec066ba012c8 |
line wrap: on
line diff
--- a/liboctave/dMatrix.cc +++ b/liboctave/dMatrix.cc @@ -53,13 +53,10 @@ #include "mx-inlines.cc" #include "mx-op-defs.h" #include "oct-cmplx.h" +#include "oct-fftw.h" #include "oct-norm.h" #include "quit.h" -#if defined (HAVE_FFTW3) -#include "oct-fftw.h" -#endif - // Fortran functions we call. extern "C" @@ -192,20 +189,6 @@ F77_CHAR_ARG_LEN_DECL F77_CHAR_ARG_LEN_DECL); - // Note that the original complex fft routines were not written for - // double complex arguments. They have been modified by adding an - // implicit double precision (a-h,o-z) statement at the beginning of - // each subroutine. - - F77_RET_T - F77_FUNC (zffti, ZFFTI) (const octave_idx_type&, Complex*); - - F77_RET_T - F77_FUNC (zfftf, ZFFTF) (const octave_idx_type&, Complex*, Complex*); - - F77_RET_T - F77_FUNC (zfftb, ZFFTB) (const octave_idx_type&, Complex*, Complex*); - F77_RET_T F77_FUNC (dlartg, DLARTG) (const double&, const double&, double&, double&, double&); @@ -894,7 +877,7 @@ } } -#if defined (HAVE_FFTW3) +#if defined (HAVE_FFTW) ComplexMatrix Matrix::fourier (void) const @@ -982,6 +965,23 @@ #else +extern "C" +{ + // Note that the original complex fft routines were not written for + // double complex arguments. They have been modified by adding an + // implicit double precision (a-h,o-z) statement at the beginning of + // each subroutine. + + F77_RET_T + F77_FUNC (zffti, ZFFTI) (const octave_idx_type&, Complex*); + + F77_RET_T + F77_FUNC (zfftf, ZFFTF) (const octave_idx_type&, Complex*, Complex*); + + F77_RET_T + F77_FUNC (zfftb, ZFFTB) (const octave_idx_type&, Complex*, Complex*); +} + ComplexMatrix Matrix::fourier (void) const {