2006-10-17 Juan M. Guerrero * doc/fftw3.texi: Added djgpp specific info. * tools/fftw_wisdom.1.in: Added djgpp specific info. diff -aprNU5 fftw-3.1.2.orig/doc/fftw3.texi fftw-3.1.2/doc/fftw3.texi --- fftw-3.1.2.orig/doc/fftw3.texi 2006-06-23 08:31:38 +0000 +++ fftw-3.1.2/doc/fftw3.texi 2006-10-17 22:16:04 +0000 @@ -478,11 +478,11 @@ The basic usage of FFTW to compute a one fftw_free(in); fftw_free(out); @} @end example (When you compile, you must also link with the @code{fftw3} library, -e.g. @code{-lfftw3 -lm} on Unix systems.) +e.g. @code{-lfftw3 -lm} on Unix systems or @code{-lfftw -lm} on DJGPP systems.) First you allocate the input and output arrays. You can allocate them in any way that you like, but we recommend using @code{fftw_malloc}, which behaves like @findex fftw_malloc @@ -594,12 +594,13 @@ bit-compatible with the C99 complex type typecast.) @cindex C++ Single and long-double precision versions of FFTW may be installed; to use them, replace the @code{fftw_} prefix by @code{fftwf_} or -@code{fftwl_} and link with @code{-lfftw3f} or @code{-lfftw3l}, but -use the @emph{same} @code{} header file. +@code{fftwl_} and link with @code{-lfftw3f} or @code{-lfftw3l} (@code{-lfftwf} +on DJGPP systems; there is still no long double precision library available on +DJGPP systems), but use the @emph{same} @code{} header file. @cindex precision Many more flags exist besides @code{FFTW_MEASURE} and @code{FFTW_ESTIMATE}. For example, use @code{FFTW_PATIENT} if you're willing to wait even longer for a possibly even faster plan (@pxref{FFTW @@ -1677,11 +1678,12 @@ the risk of sub-optimal plans. Nevertheless, if the choice is between using @code{FFTW_ESTIMATE} or using possibly-suboptimal wisdom (created on the same machine, but for a different binary), the wisdom is likely to be better. For this reason, we provide a function to import wisdom from a standard system-wide -location (@code{/etc/fftw/wisdom} on Unix): +location (@code{/etc/fftw/wisdom} on Unix and +@code{/dev/env/DJDIR/etc/fftw/wisdom} on djgpp): @cindex wisdom, system-wide @example int fftw_import_system_wisdom(void); @end example @@ -1720,11 +1722,12 @@ All programs using FFTW should include i @example #include @end example You must also link to the FFTW library. On Unix, this -means adding @code{-lfftw3 -lm} at the @emph{end} of the link command. +means adding @code{-lfftw3 -lm} or @code{-lfftw -lm} on +DJGPP systems at the @emph{end} of the link command. @menu * Complex numbers:: * Precision:: * Memory Allocation:: @@ -1785,12 +1788,14 @@ interfaces, you: @itemize @bullet @item Link to the single/long-double libraries; on Unix, @code{-lfftw3f} or -@code{-lfftw3l} instead of (or in addition to) @code{-lfftw3}. (You -can link to the different-precision libraries simultaneously.) +@code{-lfftw3l} instead of (or in addition to) @code{-lfftw3}. On +DJGPP systems use @code{-lfftwf}; there is still no long double precision +library available on DJGPP. (You can link to the different-precision +libraries simultaneously.) @item Include the @emph{same} @code{} header file. @item @@ -3238,11 +3243,11 @@ read pointer is unspecified. @code{fftw_import_wisdom_from_string} reads wisdom from the @code{NULL}-terminated string @code{input_string}. @code{fftw_import_system_wisdom} reads wisdom from an implementation-defined standard file (@code{/etc/fftw/wisdom} on Unix -and GNU systems). +and GNU systems and @code{/dev/env/DJDIR/etc/fftw/wisdom} on djgpp). @cindex wisdom, system-wide The return value of these import routines is @code{1} if the wisdom was read successfully and @code{0} otherwise. Note that, in all of these functions, any data in the input stream past the end of the wisdom data diff -aprNU5 fftw-3.1.2.orig/tools/fftw_wisdom.1.in fftw-3.1.2/tools/fftw_wisdom.1.in --- fftw-3.1.2.orig/tools/fftw_wisdom.1.in 2006-02-25 18:57:34 +0000 +++ fftw-3.1.2/tools/fftw_wisdom.1.in 2006-10-17 22:09:34 +0000 @@ -38,10 +38,13 @@ home page: Programs using FFTW can be written to load wisdom from an arbitrary file, string, or other source. Moreover, it is likely that many FFTW-using programs will load the \fBsystem wisdom\fR file, which is stored in .I /etc/fftw/wisdom@PREC_SUFFIX@ +(or in +.I /dev/env/DJDIR/etc/fftw/wisdom@PREC_SUFFIX@ +on DJGPP systems) by default. .I fftw@PREC_SUFFIX@-wisdom can be used to create or add to such wisdom files. In its most typical usage, the wisdom file can be created to pre-plan a canonical set of sizes (see below) via: @@ -53,10 +56,13 @@ fftw@PREC_SUFFIX@-wisdom -v -c -o wisdom .B -t option) and the output .I wisdom@PREC_SUFFIX@ file can then be copied (as root) to .I /etc/fftw/ +(or to +.I /dev/env/DJDIR/etc/fftw/ +on DJGPP systems) or whatever. The .I fftw@PREC_SUFFIX@-wisdom program normally writes the wisdom directly to standard output, but this @@ -64,10 +70,13 @@ can be changed via the .B -o option, as in the example above. If the system wisdom file .I /etc/fftw/wisdom@PREC_SUFFIX@ +(or +.I /dev/env/DJDIR/etc/fftw/wisdom@PREC_SUFFIX@ +on DJGPP systems) already exists, then .I fftw@PREC_SUFFIX@-wisdom reads this existing wisdom (unless the .B -n option is specified) and outputs both the old wisdom and any @@ -164,10 +173,13 @@ about in mode). .TP \fB\-n\fR, \fB\--no-system-wisdom\fR Do not import the system wisdom from .I /etc/fftw/wisdom@PREC_SUFFIX@ +(or from +.I /dev/env/DJDIR/etc/fftw/wisdom@PREC_SUFFIX@ +on DJGPP systems) (which is normally read by default). .TP \fB\-w\fR \fIfile\fR, \fB\--wisdom-file\fR=\fIfile\fR Import wisdom from .I file