[fftw] 03/16: Imported Debian patch 2.1.3-1

Mattia Rizzolo mattia at debian.org
Fri Feb 12 22:42:06 UTC 2016


This is an automated email from the git hooks/post-receive script.

mattia pushed a commit to branch master
in repository fftw.

commit d63d9e6931844750d0b5a00ff336460148fcffa0
Merge: d93051c b1e9681
Author: James A. Treacy <treacy at debian.org>
Date:   Mon Nov 8 13:56:53 1999 -0500

    Imported Debian patch 2.1.3-1

 AUTHORS                                            |     4 +-
 COPYRIGHT                                          |     2 +-
 ChangeLog                                          |  5006 +++++-
 FAQ/fftw-faq.ascii                                 |   140 +-
 FAQ/fftw-faq.bfnn                                  |   131 +-
 FAQ/fftw-faq.html/index.html                       |    23 +-
 FAQ/fftw-faq.html/section1.html                    |    29 +-
 FAQ/fftw-faq.html/section2.html                    |    53 +-
 FAQ/fftw-faq.html/section3.html                    |    19 +-
 FAQ/fftw-faq.html/section4.html                    |    12 +-
 FAQ/fftw-faq.html/section5.html                    |    75 +-
 FAQ/fftw-faq.info                                  |   157 +-
 FAQ/fftw-faq.xrefdb                                |     7 +-
 FAQ/html.refs                                      |     4 +-
 FAQ/m-html.pl                                      |     4 +-
 Makefile                                           |   284 +-
 Makefile.am                                        |    28 +-
 Makefile.in                                        |   282 +-
 NEWS                                               |   133 +-
 README                                             |    46 +-
 README.hacks                                       |     2 +-
 TODO                                               |    75 +-
 acinclude.m4                                       |   313 +-
 aclocal.m4                                         |   639 +-
 cilk/Makefile                                      |     8 +-
 cilk/README                                        |     2 +-
 cilk/executor_cilk.cilk                            |    12 +-
 cilk/fftw_cilk.cilkh                               |     2 +-
 cilk/fftwnd_cilk.cilk                              |     2 +-
 cilk/test_cilk.cilk                                |     4 +-
 cilk/time_cilk.cilk                                |     2 +-
 config.cache                                       |    16 +-
 config.guess                                       |   326 +-
 config.log                                         |   208 +-
 config.status                                      |   106 +-
 config.sub                                         |   341 +-
 configure                                          |  3980 +++-
 configure.in                                       |   296 +-
 debian/Makefile.mpi                                |    21 +
 tests/Makefile.package => debian/Makefile.tests    |     2 +
 debian/Makefile.threads                            |    17 +
 debian/README.debian                               |    25 +-
 debian/changelog                                   |    31 +
 debian/control                                     |     4 +-
 debian/fftw-dev.postinst                           |    13 +
 debian/fftw-dev.prerm                              |     9 +
 debian/postinst                                    |    10 +-
 debian/prerm                                       |     9 +
 debian/rules                                       |   113 +-
 debian/shlibs                                      |     4 +
 doc/Makefile                                       |   188 +-
 doc/Makefile.am                                    |    16 +-
 doc/Makefile.in                                    |   186 +-
 doc/fftw.info                                      |   140 +-
 doc/fftw.info-1                                    |   576 +-
 doc/fftw.info-2                                    |   182 +-
 doc/fftw.info-3                                    |  1338 +-
 doc/fftw.info-4                                    |   922 +
 doc/fftw.info-5                                    |   187 +
 doc/fftw.ps                                        | 17974 +++++++++----------
 doc/fftw.texi                                      |  2513 ++-
 doc/fftw_1.html                                    |    94 +-
 doc/fftw_10.html                                   |   278 +-
 doc/fftw_2.html                                    |   697 +-
 doc/fftw_3.html                                    |  1886 +-
 doc/fftw_4.html                                    |  1122 +-
 doc/fftw_5.html                                    |   354 +-
 doc/fftw_6.html                                    |  1851 +-
 doc/fftw_7.html                                    |   316 +-
 doc/fftw_8.html                                    |    85 +-
 doc/fftw_9.html                                    |   206 +-
 doc/fftw_foot.html                                 |    42 +-
 doc/fftw_toc.html                                  |   135 +-
 doc/rfftwnd.fig                                    |  1148 ++
 doc/rfftwnd.gif                                    |   Bin 0 -> 12609 bytes
 doc/stamp-vti                                      |     6 +-
 doc/texi2html                                      |     5 +-
 doc/texinfo.tex                                    |  5484 ++++++
 doc/version.texi                                   |     6 +-
 fftw.spec                                          |   171 +
 fftw.spec.in                                       |   171 +
 fftw/Makefile                                      |   232 +-
 fftw/Makefile.am                                   |    21 +-
 fftw/Makefile.in                                   |   242 +-
 fftw/config.c                                      |     2 +-
 fftw/config.h                                      |    86 +-
 fftw/config.h.in                                   |    84 +-
 fftw/executor.c                                    |   308 +-
 fftw/f77_func.h                                    |    61 +
 fftw/fftw-int.h                                    |   131 +-
 fftw/fftw.h                                        |    20 +-
 fftw/fftw.h.in                                     |    20 +-
 fortran/fftw_f77.c => fftw/fftwf77.c               |    41 +-
 fftw/fftwnd.c                                      |     6 +-
 fftw/fn_1.c                                        |    14 +-
 fftw/fn_10.c                                       |    36 +-
 fftw/fn_11.c                                       |    34 +-
 fftw/fn_12.c                                       |    46 +-
 fftw/fn_13.c                                       |    62 +-
 fftw/fn_14.c                                       |    52 +-
 fftw/fn_15.c                                       |    42 +-
 fftw/fn_16.c                                       |    54 +-
 fftw/fn_2.c                                        |    14 +-
 fftw/fn_3.c                                        |    16 +-
 fftw/fn_32.c                                       |   128 +-
 fftw/fn_4.c                                        |    18 +-
 fftw/fn_5.c                                        |    22 +-
 fftw/fn_6.c                                        |    24 +-
 fftw/fn_64.c                                       |   298 +-
 fftw/fn_7.c                                        |    26 +-
 fftw/fn_8.c                                        |    30 +-
 fftw/fn_9.c                                        |    36 +-
 fftw/fni_1.c                                       |    14 +-
 fftw/fni_10.c                                      |    36 +-
 fftw/fni_11.c                                      |    34 +-
 fftw/fni_12.c                                      |    46 +-
 fftw/fni_13.c                                      |    62 +-
 fftw/fni_14.c                                      |    52 +-
 fftw/fni_15.c                                      |    42 +-
 fftw/fni_16.c                                      |    54 +-
 fftw/fni_2.c                                       |    14 +-
 fftw/fni_3.c                                       |    16 +-
 fftw/fni_32.c                                      |   128 +-
 fftw/fni_4.c                                       |    18 +-
 fftw/fni_5.c                                       |    22 +-
 fftw/fni_6.c                                       |    24 +-
 fftw/fni_64.c                                      |   298 +-
 fftw/fni_7.c                                       |    26 +-
 fftw/fni_8.c                                       |    30 +-
 fftw/fni_9.c                                       |    36 +-
 fftw/ftw_10.c                                      |    46 +-
 fftw/ftw_16.c                                      |    84 +-
 fftw/ftw_2.c                                       |    16 +-
 fftw/ftw_3.c                                       |    20 +-
 fftw/ftw_32.c                                      |   186 +-
 fftw/ftw_4.c                                       |    24 +-
 fftw/ftw_5.c                                       |    28 +-
 fftw/ftw_6.c                                       |    34 +-
 fftw/ftw_64.c                                      |   422 +-
 fftw/ftw_7.c                                       |    38 +-
 fftw/ftw_8.c                                       |    44 +-
 fftw/ftw_9.c                                       |    52 +-
 fftw/ftwi_10.c                                     |    46 +-
 fftw/ftwi_16.c                                     |    84 +-
 fftw/ftwi_2.c                                      |    16 +-
 fftw/ftwi_3.c                                      |    20 +-
 fftw/ftwi_32.c                                     |   186 +-
 fftw/ftwi_4.c                                      |    24 +-
 fftw/ftwi_5.c                                      |    28 +-
 fftw/ftwi_6.c                                      |    34 +-
 fftw/ftwi_64.c                                     |   422 +-
 fftw/ftwi_7.c                                      |    38 +-
 fftw/ftwi_8.c                                      |    44 +-
 fftw/ftwi_9.c                                      |    52 +-
 fftw/generic.c                                     |     6 +-
 fftw/libfftw.la                                    |    10 +-
 fftw/malloc.c                                      |    27 +-
 fftw/planner.c                                     |   131 +-
 fftw/putils.c                                      |    25 +-
 fftw/rader.c                                       |    42 +-
 fftw/timer.c                                       |     6 +-
 fftw/twiddle.c                                     |    28 +-
 fftw/wisdom.c                                      |    32 +-
 fftw/wisdomio.c                                    |     4 +-
 fortran/README                                     |   191 -
 fortran/f77_test.F                                 |     5 +-
 fortran/fftw_f77.i                                 |    37 +-
 fortran/fortranize.h                               |    50 -
 gensrc/Makefile.fftw.am                            |    21 +-
 gensrc/Makefile.rfftw.am                           |    20 +-
 gensrc/README                                      |     2 +-
 gensrc/asched.ml                                   |     4 +-
 gensrc/asched.mli                                  |     4 +-
 gensrc/ast.ml                                      |     6 +-
 gensrc/complex.ml                                  |    36 +-
 gensrc/complex.mli                                 |     5 +-
 gensrc/dag.ml                                      |     9 +-
 gensrc/dag.mli                                     |     4 +-
 gensrc/expr.ml                                     |     4 +-
 gensrc/expr.mli                                    |     4 +-
 gensrc/exprdag.ml                                  |   298 +-
 gensrc/exprdag.mli                                 |     2 +-
 gensrc/fft.ml                                      |     6 +-
 gensrc/genfft.ml                                   |   139 +-
 gensrc/magic.ml                                    |     5 +-
 gensrc/number.ml                                   |    30 +-
 gensrc/number.mli                                  |     4 +-
 gensrc/rconfig_prelude                             |     2 +-
 gensrc/schedule.ml                                 |     4 +-
 gensrc/schedule.mli                                |     4 +-
 gensrc/symmetry.ml                                 |   192 +-
 gensrc/to_c.ml                                     |     8 +-
 gensrc/to_c.mli                                    |     4 +-
 gensrc/twiddle.ml                                  |     4 +-
 gensrc/util.ml                                     |    10 +-
 gensrc/util.mli                                    |     4 +-
 gensrc/variable.ml                                 |    41 +-
 gensrc/variable.mli                                |    19 +-
 install-sh                                         |     1 +
 libtool                                            |  3849 ++--
 ltconfig                                           |  2241 ++-
 ltmain.sh                                          |  3744 ++--
 matlab/README                                      |     2 +-
 matlab/fftw.c                                      |     8 +-
 matlab/fftw.m                                      |     2 +-
 missing                                            |    26 +-
 mkinstalldirs                                      |     4 +-
 mpi/Makefile                                       |   464 +-
 mpi/Makefile.am                                    |    72 +
 mpi/Makefile.in                                    |   453 +
 mpi/README                                         |   279 -
 mpi/README.f77                                     |    69 +
 mpi/{transpose_mpi => }/TOMS_transpose.c           |    38 +-
 mpi/{transpose_mpi => }/TOMS_transpose.h           |     4 +-
 mpi/fftw_f77_mpi.c                                 |   130 +
 mpi/fftw_f77_mpi.h                                 |    66 +
 mpi/fftw_mpi.c                                     |   414 +
 mpi/fftw_mpi.h                                     |   187 +
 mpi/fftw_mpi_test.c                                |   675 +
 mpi/fftwnd_mpi.c                                   |   156 +-
 mpi/libfftw_mpi.la                                 |    28 +
 mpi/librfftw_mpi.la                                |    28 +
 mpi/rfftw_f77_mpi.c                                |    98 +
 mpi/{fftwnd_mpi.h => rfftw_mpi.h}                  |    45 +-
 mpi/rfftw_mpi_test.c                               |   612 +
 mpi/rfftwnd_mpi.c                                  |   261 +
 mpi/sched.c                                        |   417 +
 mpi/{transpose_mpi/TOMS_transpose.h => sched.h}    |    30 +-
 mpi/test_fftwnd_mpi.c                              |   348 -
 mpi/test_sched.c                                   |   125 +
 mpi/test_transpose_mpi.c                           |   311 +
 mpi/time_fftwnd_mpi.c                              |   216 -
 mpi/transpose_mpi.c                                |   643 +
 mpi/transpose_mpi/Makefile                         |    11 -
 mpi/transpose_mpi/README                           |    32 -
 mpi/transpose_mpi/test_transpose_mpi.c             |   186 -
 mpi/transpose_mpi/transpose_mpi.c                  |   515 -
 mpi/transpose_mpi/transpose_mpi.h                  |    85 -
 rfftw/Makefile                                     |   193 +-
 rfftw/Makefile.am                                  |    20 +-
 rfftw/Makefile.in                                  |   203 +-
 rfftw/fcr_1.c                                      |    14 +-
 rfftw/fcr_10.c                                     |    24 +-
 rfftw/fcr_11.c                                     |    16 +-
 rfftw/fcr_12.c                                     |    26 +-
 rfftw/fcr_128.c                                    |   302 +-
 rfftw/fcr_13.c                                     |    36 +-
 rfftw/fcr_14.c                                     |    26 +-
 rfftw/fcr_15.c                                     |    26 +-
 rfftw/fcr_16.c                                     |    34 +-
 rfftw/fcr_2.c                                      |    14 +-
 rfftw/fcr_3.c                                      |    14 +-
 rfftw/fcr_32.c                                     |    66 +-
 rfftw/fcr_4.c                                      |    16 +-
 rfftw/fcr_5.c                                      |    16 +-
 rfftw/fcr_6.c                                      |    16 +-
 rfftw/fcr_64.c                                     |   136 +-
 rfftw/fcr_7.c                                      |    14 +-
 rfftw/fcr_8.c                                      |    20 +-
 rfftw/fcr_9.c                                      |    22 +-
 rfftw/fhb_10.c                                     |  1000 +-
 rfftw/fhb_16.c                                     |  1695 +-
 rfftw/fhb_2.c                                      |    70 +-
 rfftw/fhb_3.c                                      |   178 +-
 rfftw/fhb_32.c                                     |  4321 ++---
 rfftw/fhb_4.c                                      |   230 +-
 rfftw/fhb_5.c                                      |   413 +-
 rfftw/fhb_6.c                                      |   449 +-
 rfftw/fhb_7.c                                      |   511 +-
 rfftw/fhb_8.c                                      |   638 +-
 rfftw/fhb_9.c                                      |   972 +-
 rfftw/fhf_10.c                                     |  1016 +-
 rfftw/fhf_16.c                                     |  1827 +-
 rfftw/fhf_2.c                                      |    80 +-
 rfftw/fhf_3.c                                      |   167 +-
 rfftw/fhf_32.c                                     |  4587 +++--
 rfftw/fhf_4.c                                      |   242 +-
 rfftw/fhf_5.c                                      |   398 +-
 rfftw/fhf_6.c                                      |   462 +-
 rfftw/fhf_7.c                                      |   514 +-
 rfftw/fhf_8.c                                      |   662 +-
 rfftw/fhf_9.c                                      |   921 +-
 rfftw/frc_1.c                                      |    14 +-
 rfftw/frc_10.c                                     |    22 +-
 rfftw/frc_11.c                                     |    18 +-
 rfftw/frc_12.c                                     |    26 +-
 rfftw/frc_128.c                                    |   312 +-
 rfftw/frc_13.c                                     |    34 +-
 rfftw/frc_14.c                                     |    24 +-
 rfftw/frc_15.c                                     |    30 +-
 rfftw/frc_16.c                                     |    32 +-
 rfftw/frc_2.c                                      |    14 +-
 rfftw/frc_3.c                                      |    14 +-
 rfftw/frc_32.c                                     |    60 +-
 rfftw/frc_4.c                                      |    14 +-
 rfftw/frc_5.c                                      |    16 +-
 rfftw/frc_6.c                                      |    16 +-
 rfftw/frc_64.c                                     |   138 +-
 rfftw/frc_7.c                                      |    16 +-
 rfftw/frc_8.c                                      |    20 +-
 rfftw/frc_9.c                                      |    20 +-
 rfftw/librfftw.la                                  |    10 +-
 rfftw/rconfig.c                                    |     4 +-
 rfftw/rexec.c                                      |   389 +-
 rfftw/rexec2.c                                     |    16 +-
 rfftw/rfftw.h                                      |     5 +-
 fortran/rfftw_f77.c => rfftw/rfftwf77.c            |    50 +-
 rfftw/rfftwnd.c                                    |    16 +-
 rfftw/rgeneric.c                                   |     2 +-
 rfftw/rplanner.c                                   |   131 +-
 tests/Makefile                                     |   169 +-
 tests/Makefile.am                                  |    21 +-
 tests/Makefile.in                                  |   167 +-
 tests/README                                       |    28 +-
 tests/fftw_test.c                                  |   535 +-
 tests/rfftw_test.c                                 |   696 +-
 tests/test_main.c                                  |   918 +-
 tests/test_main.h                                  |    44 +-
 threads/Makefile                                   |   493 +-
 threads/Makefile.am                                |    97 +
 threads/Makefile.in                                |   457 +
 threads/README                                     |   146 -
 threads/executor_threads.c                         |   472 +-
 threads/fftw_f77_threads.c                         |    72 +
 threads/{fftw_threads.h => fftw_threads-int.h}     |   171 +-
 threads/fftw_threads.c                             |   119 +-
 threads/fftw_threads.h                             |   263 +-
 threads/fftw_threads_test.c                        |   621 +
 threads/fftwnd_threads.c                           |    64 +-
 threads/libfftw_threads.la                         |    28 +
 threads/librfftw_threads.la                        |    28 +
 threads/rexec2_threads.c                           |   210 +
 threads/rexec_threads.c                            |   657 +
 threads/rfftw_f77_threads.c                        |    82 +
 threads/rfftw_threads.h                            |    61 +
 tests/rfftw_test.c => threads/rfftw_threads_test.c |   546 +-
 threads/rfftwnd_threads.c                          |   743 +
 threads/test_threads.c                             |   320 -
 threads/time_threads.c                             |   231 -
 339 files changed, 68192 insertions(+), 39157 deletions(-)

diff --cc Makefile
index b91c1fa,0000000..bfe05e9
mode 100644,000000..100644
--- a/Makefile
+++ b/Makefile
@@@ -1,312 -1,0 +1,434 @@@
 +# Generated automatically from Makefile.in by configure.
- # Makefile.in generated automatically by automake 1.3 from Makefile.am
++# Makefile.in generated automatically by automake 1.4 from Makefile.am
 +
- # Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 +# This Makefile.in is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
 +# with or without modifications, as long as this notice is preserved.
 +
 +# This program is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
 +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 +# PARTICULAR PURPOSE.
 +
 +
 +SHELL = /bin/sh
 +
 +srcdir = .
 +top_srcdir = .
 +prefix = /usr
 +exec_prefix = ${prefix}
 +
 +bindir = ${exec_prefix}/bin
 +sbindir = ${exec_prefix}/sbin
 +libexecdir = ${exec_prefix}/libexec
 +datadir = ${prefix}/share
 +sysconfdir = ${prefix}/etc
 +sharedstatedir = ${prefix}/com
 +localstatedir = ${prefix}/var
 +libdir = ${exec_prefix}/lib
 +infodir = ${prefix}/info
 +mandir = ${prefix}/man
 +includedir = ${prefix}/include
 +oldincludedir = /usr/include
 +
- DISTDIR =
++DESTDIR =
 +
 +pkgdatadir = $(datadir)/fftw
 +pkglibdir = $(libdir)/fftw
 +pkgincludedir = $(includedir)/fftw
 +
 +top_builddir = .
 +
 +ACLOCAL = aclocal
 +AUTOCONF = autoconf
 +AUTOMAKE = automake
- AUTOHEADER = autoheader
 +
 +INSTALL = /usr/bin/install -c
- INSTALL_PROGRAM = ${INSTALL}
++INSTALL_PROGRAM = ${INSTALL} $(AM_INSTALL_PROGRAM_FLAGS)
 +INSTALL_DATA = ${INSTALL} -m 644
 +INSTALL_SCRIPT = ${INSTALL_PROGRAM}
 +transform = s,x,x,
 +
 +NORMAL_INSTALL = :
 +PRE_INSTALL = :
 +POST_INSTALL = :
 +NORMAL_UNINSTALL = :
 +PRE_UNINSTALL = :
 +POST_UNINSTALL = :
 +host_alias = i586-pc-linux-gnu
 +host_triplet = i586-pc-linux-gnu
++AS = @AS@
 +CC = cc
++CCthreads = cc
++DLLTOOL = @DLLTOOL@
++F77 = f77
++FFTW_MPI_INCLUDELIST = fftw_mpi.h rfftw_mpi.h
++FFTW_MPI_LIBLIST = libfftw_mpi.la librfftw_mpi.la
++FFTW_MPI_PROGLIST = test_sched test_transpose_mpi fftw_mpi_test rfftw_mpi_test
++FFTW_PREFIX = 
++FFTW_THREADS_INCLUDELIST = fftw_threads.h rfftw_threads.h
++FFTW_THREADS_LIBLIST = libfftw_threads.la librfftw_threads.la
++FFTW_THREADS_PROGLIST = fftw_threads_test rfftw_threads_test
++FLIBS =  -lg2c -lm -L/usr/lib/gcc-lib/i386-linux/2.95.2 -lm
 +LD = /usr/bin/ld
 +LIBTOOL = $(SHELL) $(top_builddir)/libtool
 +LN_S = ln -s
 +MAKEINFO = makeinfo
++MPICC = mpicc
++MPILIBS =  
 +NM = /usr/bin/nm -B
++OBJDUMP = @OBJDUMP@
 +PACKAGE = fftw
 +PERL = perl
 +RANLIB = ranlib
- SHARED_VERSION_INFO = 2:1:0
- VERSION = 2.0.1
++SHARED_VERSION = 2.0.5
++SHARED_VERSION_INFO = 2:5:0
++THREADLIBS = -lpthread
++VERSION = 2.1.3
 +
- SUBDIRS = fftw rfftw tests doc
++SUBDIRS = fftw rfftw tests doc threads mpi
 +EXTRA_DIST = README.hacks bootstrap.sh COPYRIGHT
 +
- extradist = fortran gensrc matlab mpi threads cilk FAQ
- distsrc=$(distdir)/fftw
++extradist = fortran gensrc matlab cilk FAQ
++distsrc = $(distdir)/fftw
++
++# for some reason, automake tries to use autoheader in order to
++# generate config.h.in, and fails because config.h.in is GNU-lly
++# incorrect.  Just disable autoheader
++AUTOHEADER = echo
++
++RPM_SRCDIR = `rpm --showrc |grep "^sourcedir" | sed 's/^.*: *//'`
++RPM_ARCH = `rpm --showrc |grep "^build arch" | sed 's/^.*: *//'`
++RPM_RPMS = `rpm --showrc |grep "^rpmdir" | sed 's/^.*: *//'`
++RPM_SRPMS = `rpm --showrc |grep "^srcrpmdir" | sed 's/^.*: *//'`
++RPM_TOPDIR = `rpm --showrc |grep "^TOPDIRdir" | sed 's/^.*: *//'`
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 +CONFIG_HEADER = ./fftw/config.h ./fftw/fftw.h
- CONFIG_CLEAN_FILES = 
++CONFIG_CLEAN_FILES =  fftw.spec
 +DIST_COMMON =  README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
 +Makefile.in NEWS TODO acinclude.m4 aclocal.m4 config.guess config.sub \
- configure configure.in install-sh ltconfig ltmain.sh missing \
++configure configure.in fftw.spec.in fftw/config.h.in fftw/fftw.h.in \
++fftw/stamp-h1.in fftw/stamp-h2.in install-sh ltconfig ltmain.sh missing \
 +mkinstalldirs
 +
 +
 +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 +
- TAR = tar
- GZIP = --best
- all: all-recursive all-am
- 
++TAR = gtar
++GZIP_ENV = --best
++all: all-redirect
 +.SUFFIXES:
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 +	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile
 +
 +Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 +	cd $(top_builddir) \
 +	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 +
 +$(ACLOCAL_M4):  configure.in  acinclude.m4
 +	cd $(srcdir) && $(ACLOCAL)
 +
- config.status: $(srcdir)/configure
++config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 +	$(SHELL) ./config.status --recheck
 +$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
 +	cd $(srcdir) && $(AUTOCONF)
 +
++fftw/config.h: fftw/stamp-h1
++	@if test ! -f $@; then \
++		rm -f fftw/stamp-h1; \
++		$(MAKE) fftw/stamp-h1; \
++	else :; fi
++fftw/stamp-h1: $(srcdir)/fftw/config.h.in $(top_builddir)/config.status
++	cd $(top_builddir) \
++	  && CONFIG_FILES= CONFIG_HEADERS=fftw/config.h \
++	     $(SHELL) ./config.status
++	@echo timestamp > fftw/stamp-h1 2> /dev/null
++$(srcdir)/fftw/config.h.in: $(srcdir)/fftw/stamp-h1.in
++	@if test ! -f $@; then \
++		rm -f $(srcdir)/fftw/stamp-h1.in; \
++		$(MAKE) $(srcdir)/fftw/stamp-h1.in; \
++	else :; fi
++$(srcdir)/fftw/stamp-h1.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) 
++	cd $(top_srcdir) && $(AUTOHEADER)
++	@echo timestamp > $(srcdir)/fftw/stamp-h1.in 2> /dev/null
++
++fftw/fftw.h: fftw/stamp-h2
++	@if test ! -f $@; then \
++		rm -f fftw/stamp-h2; \
++		$(MAKE) fftw/stamp-h2; \
++	else :; fi
++fftw/stamp-h2: $(srcdir)/fftw/fftw.h.in $(top_builddir)/config.status
++	cd $(top_builddir) \
++	  && CONFIG_FILES= CONFIG_HEADERS=fftw/fftw.h \
++	     $(SHELL) ./config.status
++	@echo timestamp > fftw/stamp-h2 2> /dev/null
++$(srcdir)/fftw/fftw.h.in: $(srcdir)/fftw/stamp-h2.in
++	@if test ! -f $@; then \
++		rm -f $(srcdir)/fftw/stamp-h2.in; \
++		$(MAKE) $(srcdir)/fftw/stamp-h2.in; \
++	else :; fi
++$(srcdir)/fftw/stamp-h2.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) 
++	cd $(top_srcdir) && $(AUTOHEADER)
++	@echo timestamp > $(srcdir)/fftw/stamp-h2.in 2> /dev/null
++
++mostlyclean-hdr:
++
++clean-hdr:
++
++distclean-hdr:
++	-rm -f fftw/config.h fftw/fftw.h
++
++maintainer-clean-hdr:
++fftw.spec: $(top_builddir)/config.status fftw.spec.in
++	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
++
 +# This directory's subdirectories are mostly independent; you can cd
 +# into them and run `make' without going through this Makefile.
 +# To change the values of `make' variables: instead of editing Makefiles,
 +# (1) if the variable is set in `config.status', edit `config.status'
 +#     (which will cause the Makefiles to be regenerated when you run `make');
 +# (2) otherwise, pass the desired values on the `make' command line.
 +
 +
 +
 +all-recursive install-data-recursive install-exec-recursive \
 +installdirs-recursive install-recursive uninstall-recursive  \
 +check-recursive installcheck-recursive info-recursive dvi-recursive:
 +	@set fnord $(MAKEFLAGS); amf=$$2; \
++	dot_seen=no; \
++	target=`echo $@ | sed s/-recursive//`; \
 +	list='$(SUBDIRS)'; for subdir in $$list; do \
- 	  target=`echo $@ | sed s/-recursive//`; \
 +	  echo "Making $$target in $$subdir"; \
- 	  (cd $$subdir && $(MAKE) $$target) \
++	  if test "$$subdir" = "."; then \
++	    dot_seen=yes; \
++	    local_target="$$target-am"; \
++	  else \
++	    local_target="$$target"; \
++	  fi; \
++	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 +	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- 	done && test -z "$$fail"
++	done; \
++	if test "$$dot_seen" = "no"; then \
++	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
++	fi; test -z "$$fail"
 +
 +mostlyclean-recursive clean-recursive distclean-recursive \
 +maintainer-clean-recursive:
 +	@set fnord $(MAKEFLAGS); amf=$$2; \
++	dot_seen=no; \
 +	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
 +	  rev="$$subdir $$rev"; \
++	  test "$$subdir" = "." && dot_seen=yes; \
 +	done; \
++	test "$$dot_seen" = "no" && rev=". $$rev"; \
++	target=`echo $@ | sed s/-recursive//`; \
 +	for subdir in $$rev; do \
- 	  target=`echo $@ | sed s/-recursive//`; \
 +	  echo "Making $$target in $$subdir"; \
- 	  (cd $$subdir && $(MAKE) $$target) \
++	  if test "$$subdir" = "."; then \
++	    local_target="$$target-am"; \
++	  else \
++	    local_target="$$target"; \
++	  fi; \
++	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 +	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
 +	done && test -z "$$fail"
 +tags-recursive:
 +	list='$(SUBDIRS)'; for subdir in $$list; do \
- 	  (cd $$subdir && $(MAKE) tags); \
++	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 +	done
 +
 +tags: TAGS
 +
 +ID: $(HEADERS) $(SOURCES) $(LISP)
++	list='$(SOURCES) $(HEADERS)'; \
++	unique=`for i in $$list; do echo $$i; done | \
++	  awk '    { files[$$0] = 1; } \
++	       END { for (i in files) print i; }'`; \
 +	here=`pwd` && cd $(srcdir) \
- 	  && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP)
++	  && mkid -f$$here/ID $$unique $(LISP)
 +
 +TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
 +	tags=; \
 +	here=`pwd`; \
 +	list='$(SUBDIRS)'; for subdir in $$list; do \
- 	  test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
++   if test "$$subdir" = .; then :; else \
++	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
++   fi; \
 +	done; \
 +	list='$(SOURCES) $(HEADERS)'; \
 +	unique=`for i in $$list; do echo $$i; done | \
 +	  awk '    { files[$$0] = 1; } \
 +	       END { for (i in files) print i; }'`; \
 +	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
 +	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
 +
 +mostlyclean-tags:
 +
 +clean-tags:
 +
 +distclean-tags:
 +	-rm -f TAGS ID
 +
 +maintainer-clean-tags:
 +
 +distdir = $(PACKAGE)-$(VERSION)
 +top_distdir = $(distdir)
 +
 +# This target untars the dist file and tries a VPATH configuration.  Then
 +# it guarantees that the distribution is self-contained by making another
 +# tarfile.
 +distcheck: dist
 +	-rm -rf $(distdir)
- 	GZIP=$(GZIP) $(TAR) zxf $(distdir).tar.gz
++	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
 +	mkdir $(distdir)/=build
 +	mkdir $(distdir)/=inst
 +	dc_install_base=`cd $(distdir)/=inst && pwd`; \
 +	cd $(distdir)/=build \
 +	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
- 	  && $(MAKE) \
- 	  && $(MAKE) dvi \
- 	  && $(MAKE) check \
- 	  && $(MAKE) install \
- 	  && $(MAKE) installcheck \
- 	  && $(MAKE) dist
++	  && $(MAKE) $(AM_MAKEFLAGS) \
++	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
++	  && $(MAKE) $(AM_MAKEFLAGS) check \
++	  && $(MAKE) $(AM_MAKEFLAGS) install \
++	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
++	  && $(MAKE) $(AM_MAKEFLAGS) dist
 +	-rm -rf $(distdir)
- 	@echo "========================"; \
- 	echo "$(distdir).tar.gz is ready for distribution"; \
- 	echo "========================"
++	@banner="$(distdir).tar.gz is ready for distribution"; \
++	dashes=`echo "$$banner" | sed s/./=/g`; \
++	echo "$$dashes"; \
++	echo "$$banner"; \
++	echo "$$dashes"
 +dist: distdir
 +	-chmod -R a+r $(distdir)
- 	GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir)
++	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
 +	-rm -rf $(distdir)
 +dist-all: distdir
 +	-chmod -R a+r $(distdir)
- 	GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir)
++	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
 +	-rm -rf $(distdir)
 +distdir: $(DISTFILES)
 +	-rm -rf $(distdir)
 +	mkdir $(distdir)
 +	-chmod 777 $(distdir)
 +	@for file in $(DISTFILES); do \
 +	  d=$(srcdir); \
- 	  test -f $(distdir)/$$file \
- 	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
- 	  || cp -p $$d/$$file $(distdir)/$$file; \
++	  if test -d $$d/$$file; then \
++	    cp -pr $$/$$file $(distdir)/$$file; \
++	  else \
++	    test -f $(distdir)/$$file \
++	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
++	    || cp -p $$d/$$file $(distdir)/$$file || :; \
++	  fi; \
 +	done
 +	for subdir in $(SUBDIRS); do \
- 	  test -d $(distdir)/$$subdir \
- 	  || mkdir $(distdir)/$$subdir \
- 	  || exit 1; \
- 	  chmod 777 $(distdir)/$$subdir; \
- 	  (cd $$subdir && $(MAKE) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
++	  if test "$$subdir" = .; then :; else \
++	    test -d $(distdir)/$$subdir \
++	    || mkdir $(distdir)/$$subdir \
 +	    || exit 1; \
++	    chmod 777 $(distdir)/$$subdir; \
++	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
++	      || exit 1; \
++	  fi; \
 +	done
- 	$(MAKE) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
++	$(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
++info-am:
 +info: info-recursive
++dvi-am:
 +dvi: dvi-recursive
- check: all-am
- 	$(MAKE) check-recursive
++check-am: all-am
++check: check-recursive
++installcheck-am:
 +installcheck: installcheck-recursive
- all-am: Makefile
- 
++install-exec-am:
 +install-exec: install-exec-recursive
- 	@$(NORMAL_INSTALL)
 +
++install-data-am:
 +install-data: install-data-recursive
- 	@$(NORMAL_INSTALL)
 +
++install-am: all-am
++	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 +install: install-recursive
- 	@:
- 
++uninstall-am:
 +uninstall: uninstall-recursive
- 
++all-am: Makefile
++all-redirect: all-recursive
 +install-strip:
- 	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
++	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
 +installdirs: installdirs-recursive
++installdirs-am:
 +
 +
 +mostlyclean-generic:
- 	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 +
 +clean-generic:
- 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 +
 +distclean-generic:
- 	-rm -f Makefile $(DISTCLEANFILES)
++	-rm -f Makefile $(CONFIG_CLEAN_FILES)
 +	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
- 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 +
 +maintainer-clean-generic:
- 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
- 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
- mostlyclean-am:  mostlyclean-tags mostlyclean-generic
- 
- clean-am:  clean-tags clean-generic mostlyclean-am
++mostlyclean-am:  mostlyclean-hdr mostlyclean-tags mostlyclean-generic
 +
- distclean-am:  distclean-tags distclean-generic clean-am
++mostlyclean: mostlyclean-recursive
 +
- maintainer-clean-am:  maintainer-clean-tags maintainer-clean-generic \
- 		distclean-am
++clean-am:  clean-hdr clean-tags clean-generic mostlyclean-am
 +
- mostlyclean:  mostlyclean-recursive mostlyclean-am
++clean: clean-recursive
 +
- clean:  clean-recursive clean-am
++distclean-am:  distclean-hdr distclean-tags distclean-generic clean-am
++	-rm -f libtool
 +
- distclean:  distclean-recursive distclean-am
++distclean: distclean-recursive
 +	-rm -f config.status
- 	-rm -f libtool
 +
- maintainer-clean:  maintainer-clean-recursive maintainer-clean-am
++maintainer-clean-am:  maintainer-clean-hdr maintainer-clean-tags \
++		maintainer-clean-generic distclean-am
 +	@echo "This command is intended for maintainers to use;"
 +	@echo "it deletes files that may require special tools to rebuild."
++
++maintainer-clean: maintainer-clean-recursive
 +	-rm -f config.status
 +
- .PHONY: install-data-recursive uninstall-data-recursive \
- install-exec-recursive uninstall-exec-recursive installdirs-recursive \
- uninstalldirs-recursive all-recursive check-recursive \
- installcheck-recursive info-recursive dvi-recursive \
- mostlyclean-recursive distclean-recursive clean-recursive \
++.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
++install-data-recursive uninstall-data-recursive install-exec-recursive \
++uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
++all-recursive check-recursive installcheck-recursive info-recursive \
++dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
 +maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
- distclean-tags clean-tags maintainer-clean-tags distdir info dvi \
- installcheck all-am install-exec install-data install uninstall all \
++distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
++dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
++install-exec install-data-am install-data install-am install \
++uninstall-am uninstall all-redirect all-am all installdirs-am \
 +installdirs mostlyclean-generic distclean-generic clean-generic \
 +maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 +
 +
 +dist-hook:
 +	rm -f $(distsrc)/fftw.h
 +	awk '{handled=0} /^#undef .*$$/ {print "/* " $$line " */"; handled=1} {if (handled == 0) print}' $(distsrc)/fftw.h.in > $(distsrc)/fftw.h
 +	rm -f $(distsrc)/config.h
 +	cat $(distsrc)/config.h.in | sed -e "s/^#undef FFTW_VERSION/#define FFTW_VERSION \"$(VERSION)\"/" | awk '{handled=0}	/^#undef .*$$/ {print "/* " $$line " */"; handled=1} {if (handled == 0) print}' > $(distsrc)/config.h
 +	(cd FAQ; make clean; make)
 +	for i in gensrc mpi threads cilk; do (cd $$i; make distclean); done
 +	for i in $(extradist); do \
 +	  echo "Adding $$i/ to the distribution"; \
 +          find $$i -name CVS -prune -o -print | cpio -pd $(distdir); \
 +        done
 +
++rpm:
++	cp -f $(PACKAGE)-$(VERSION).tar.gz $(RPM_SRCDIR)/$(PACKAGE)-$(VERSION).tar.gz
++	rm -f $(RPM_SRCDIR)/$(PACKAGE)-logo-thumb.gif
++	lynx -source -dump http://www.fftw.org/fftw-logo-thumb.gif > $(RPM_SRCDIR)/fftw-logo-thumb.gif
++	rpm --clean -ba $(PACKAGE).spec
++	rpm -U $(RPM_RPMS)/$(RPM_ARCH)/$(PACKAGE)-$(VERSION)-1.$(RPM_ARCH).rpm\
++         $(RPM_RPMS)/$(RPM_ARCH)/$(PACKAGE)-devel-$(VERSION)-1.$(RPM_ARCH).rpm
++	@echo "-------------------------------------------------------------"
++	@echo "  RPMs are built and installed, and are located under:       "
++	@echo "       $(RPM_RPMS)/$(RPM_ARCH)"
++	@echo "       $(RPM_SRPMS)"
++	@echo "-------------------------------------------------------------"
++
 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
diff --cc config.cache
index 49ceb9d,0000000..b877d5a
mode 100644,000000..100644
--- a/config.cache
+++ b/config.cache
@@@ -1,44 -1,0 +1,58 @@@
 +# This file is a shell script that caches the results of configure
 +# tests run on this system so they can be shared between configure
 +# scripts and configure runs.  It is not useful on other systems.
 +# If it contains results you don't want to keep, you may remove or edit it.
 +#
 +# By default, configure uses ./config.cache as the cache file,
 +# creating it if it does not exist already.  You can give configure
 +# the --cache-file=FILE option to use a different cache file; that is
 +# what configure does when it calls configure scripts in
 +# subdirectories, so they share the cache.
 +# Giving --cache-file=/dev/null disables caching, for debugging configure.
 +# config.status only pays attention to the cache file if you give it the
 +# --recheck option to rerun configure.
 +#
 +ac_cv_c_const=${ac_cv_c_const=yes}
++ac_cv_exeext=${ac_cv_exeext=no}
++ac_cv_flibs=${ac_cv_flibs=' -lg2c -lm -L/usr/lib/gcc-lib/i386-linux/2.95.2 -lm'}
 +ac_cv_func_BSDgettimeofday=${ac_cv_func_BSDgettimeofday=no}
++ac_cv_func_MPI_Init=${ac_cv_func_MPI_Init=yes}
 +ac_cv_func_alloca_works=${ac_cv_func_alloca_works=yes}
 +ac_cv_func_gethrtime=${ac_cv_func_gethrtime=no}
 +ac_cv_func_getopt=${ac_cv_func_getopt=yes}
++ac_cv_func_getopt_long=${ac_cv_func_getopt_long=yes}
 +ac_cv_func_gettimeofday=${ac_cv_func_gettimeofday=yes}
 +ac_cv_header_alloca_h=${ac_cv_header_alloca_h=yes}
 +ac_cv_header_getopt_h=${ac_cv_header_getopt_h=yes}
 +ac_cv_header_malloc_h=${ac_cv_header_malloc_h=yes}
 +ac_cv_header_stdc=${ac_cv_header_stdc=yes}
 +ac_cv_header_sys_time_h=${ac_cv_header_sys_time_h=yes}
 +ac_cv_header_time=${ac_cv_header_time=yes}
 +ac_cv_header_unistd_h=${ac_cv_header_unistd_h=yes}
 +ac_cv_lib_m_sqrt=${ac_cv_lib_m_sqrt=yes}
++ac_cv_lib_pthreads_pthread_attr_init=${ac_cv_lib_pthreads_pthread_attr_init=no}
 +ac_cv_path_LD=${ac_cv_path_LD=/usr/bin/ld}
 +ac_cv_path_NM=${ac_cv_path_NM='/usr/bin/nm -B'}
 +ac_cv_path_install=${ac_cv_path_install='/usr/bin/install -c'}
 +ac_cv_prog_CC=${ac_cv_prog_CC=cc}
++ac_cv_prog_CCthreads=${ac_cv_prog_CCthreads=cc}
 +ac_cv_prog_CPP=${ac_cv_prog_CPP='cc -E'}
++ac_cv_prog_F77=${ac_cv_prog_F77=f77}
 +ac_cv_prog_LN_S=${ac_cv_prog_LN_S='ln -s'}
++ac_cv_prog_MPICC=${ac_cv_prog_MPICC=mpicc}
 +ac_cv_prog_PERL=${ac_cv_prog_PERL=perl}
 +ac_cv_prog_RANLIB=${ac_cv_prog_RANLIB=ranlib}
 +ac_cv_prog_cc_cross=${ac_cv_prog_cc_cross=no}
 +ac_cv_prog_cc_g=${ac_cv_prog_cc_g=yes}
 +ac_cv_prog_cc_works=${ac_cv_prog_cc_works=yes}
++ac_cv_prog_f77_cross=${ac_cv_prog_f77_cross=no}
++ac_cv_prog_f77_g=${ac_cv_prog_f77_g=yes}
++ac_cv_prog_f77_works=${ac_cv_prog_f77_works=yes}
++ac_cv_prog_g77=${ac_cv_prog_g77=yes}
 +ac_cv_prog_gcc=${ac_cv_prog_gcc=yes}
++ac_cv_prog_gcc_2_90=${ac_cv_prog_gcc_2_90=yes}
 +ac_cv_prog_gnu_ld=${ac_cv_prog_gnu_ld=yes}
 +ac_cv_prog_make_make_set=${ac_cv_prog_make_make_set=yes}
++ac_cv_sizeof_int=${ac_cv_sizeof_int=4}
++ac_cv_sizeof_long_long=${ac_cv_sizeof_long_long=8}
 +ac_cv_type_size_t=${ac_cv_type_size_t=yes}
- acx_cv_prog_egcs=${acx_cv_prog_egcs=no}
diff --cc config.log
index 116ea72,0000000..3ad685a
mode 100644,000000..100644
--- a/config.log
+++ b/config.log
@@@ -1,52 -1,0 +1,162 @@@
 +This file contains any messages produced by compilers while
 +running configure, to aid debugging if configure makes a mistake.
 +
- configure:574: checking for a BSD compatible install
- configure:627: checking whether build environment is sane
- configure:684: checking whether make sets ${MAKE}
- configure:730: checking for working aclocal
- configure:743: checking for working autoconf
- configure:756: checking for working automake
- configure:769: checking for working autoheader
- configure:782: checking for working makeinfo
- configure:913: checking for vendor's cc to be used instead of gcc
- configure:917: checking for cc
- configure:946: checking for gcc
- configure:1023: checking whether the C compiler (cc  ) works
- configure:1037: cc -o conftest    conftest.c  1>&5
- configure:1057: checking whether the C compiler (cc  ) is a cross-compiler
- configure:1062: checking whether we are using GNU C
- configure:1086: checking whether cc accepts -g
- configure:1114: checking whether we are using the egcs variant of GCC
- configure:1144: checking for a BSD compatible install
- configure:1194: checking whether make sets ${MAKE}
- configure:1223: checking for ranlib
- configure:1250: checking whether ln -s works
- configure:1300: checking host system type
- configure:1333: checking for ld used by GCC
- configure:1390: checking if the linker (/usr/bin/ld) is GNU ld
- configure:1406: checking for BSD-compatible nm
- configure:1491: checking for perl
- configure:1574: checking whether cc accepts -malign-double
- configure:1608: checking whether cc accepts -O6 -fomit-frame-pointer -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align -pedantic -malign-double
- configure:1635: checking whether cc accepts -mcpu=pentium
- configure:1656: checking whether cc accepts -mpentium
- configure:1796: checking for sqrt in -lm
- configure:1844: checking how to run the C preprocessor
- configure:1905: checking for ANSI C header files
- configure:2012: checking for sys/time.h
- configure:2012: checking for unistd.h
- configure:2012: checking for getopt.h
- configure:2012: checking for malloc.h
- configure:2050: checking for working const
- configure:2125: checking for size_t
- configure:2158: checking whether time.h and sys/time.h may both be included
- configure:2210: checking for working alloca.h
- configure:2243: checking for alloca
- configure:2439: checking for gettimeofday
- configure:2494: checking for BSDgettimeofday
- configure:2549: checking for gethrtime
- configure:2604: checking for getopt
- configure:2666: cc -o conftest -O6 -fomit-frame-pointer -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align -pedantic -malign-double    conftest.c -lm  1>&5
- configure:2681: checking whether cc accepts -fkeep-programmers-inline
- configure:2696: checking whether cc accepts -vomit-frame-pointer
++configure:590: checking for a BSD compatible install
++configure:643: checking whether build environment is sane
++configure:700: checking whether make sets ${MAKE}
++configure:746: checking for working aclocal
++configure:759: checking for working autoconf
++configure:772: checking for working automake
++configure:785: checking for working autoheader
++configure:798: checking for working makeinfo
++configure:905: checking type prefix for installed files
++configure:1006: checking for vendor's cc to be used instead of gcc
++configure:1010: checking for cc
++configure:1040: checking for gcc
++configure:1153: checking whether the C compiler (cc  ) works
++configure:1169: cc -o conftest    conftest.c  1>&5
++configure:1195: checking whether the C compiler (cc  ) is a cross-compiler
++configure:1200: checking whether we are using GNU C
++configure:1228: checking whether cc accepts -g
++configure:1262: checking whether we are using gcc 2.90 or later
++configure:1303: checking for a BSD compatible install
++configure:1356: checking whether make sets ${MAKE}
++configure:1385: checking for ranlib
++configure:1413: checking whether ln -s works
++configure:1486: checking host system type
++configure:1507: checking build system type
++configure:1536: checking for ld used by GCC
++configure:1599: checking if the linker (/usr/bin/ld) is GNU ld
++configure:1615: checking for BSD-compatible nm
++ltconfig:603: checking for object suffix
++ltconfig:604: cc -c -g -O2  conftest.c 1>&5
++ltconfig:776: checking if cc PIC flag -fPIC works
++ltconfig:777: cc -c -g -O2 -fPIC -DPIC  conftest.c 1>&5
++ltconfig:829: checking if cc supports -c -o file.o
++ltconfig:830: cc -c -g -O2 -o out/conftest2.o  conftest.c 1>&5
++ltconfig:862: checking if cc supports -c -o file.lo
++ltconfig:863: cc -c -g -O2 -c -o conftest.lo  conftest.c 1>&5
++ltconfig:914: checking if cc supports -fno-rtti -fno-exceptions
++ltconfig:915: cc -c -g -O2 -fno-rtti -fno-exceptions -c conftest.c  conftest.c 1>&5
++ltconfig:958: checking if cc static flag -static works
++ltconfig:959: cc -o conftest -g -O2   -static conftest.c  1>&5
++GNU ld version 2.9.5 (with BFD 2.9.5.0.19)
++ltconfig:1592: checking if global_symbol_pipe works
++ltconfig:1593: cc -c -g -O2  conftest.c 1>&5
++ltconfig:1596: eval "/usr/bin/nm -B conftest.o | sed -n -e 's/^.*[ 	]\([ABCDGISTW]\)[ 	][ 	]*\(\)\([_A-Za-z][_A-Za-z0-9]*\)$/\1 \2\3 \3/p' > conftest.nm"
++ltconfig:1648: cc -o conftest -g -O2 -fno-builtin -fno-rtti -fno-exceptions   conftest.c conftstm.o 1>&5
++configure:1813: checking for perl
++configure:1849: checking for f77
++configure:1924: checking whether the Fortran 77 compiler (f77  ) works
++configure:1937: f77 -o conftest   conftest.f  1>&5
++configure:1963: checking whether the Fortran 77 compiler (f77  ) is a cross-compiler
++configure:1968: checking whether we are using GNU Fortran 77
++configure:1992: checking whether f77 accepts -g
++configure:2023: checking for Fortran 77 libraries
++configure:2182: checking how f77 mangles function names
++configure:2192: f77 -c -g -O2 mangle-func.f 1>&5
++configure:2220: cc -o conftest -g -O2   conftest.c mangle-func.o  -lg2c -lm -L/usr/lib/gcc-lib/i386-linux/2.95.2 -lm  1>&5
++/tmp/ccwkF26G.o: In function `main':
++/home/treacy/debs/fftw/fftw-2.1.3/configure:2216: undefined reference to `foobar'
++collect2: ld returned 1 exit status
++configure: failed program was:
++#line 2213 "configure"
++#include "confdefs.h"
++
++int main() {
++foobar();
++; return 0; }
++configure:2235: cc -o conftest -g -O2   conftest.c mangle-func.o  -lg2c -lm -L/usr/lib/gcc-lib/i386-linux/2.95.2 -lm  1>&5
++configure:2322: checking if f77 functions with an underscore get an extra underscore
++configure:2342: cc -o conftest -g -O2   conftest.c mangle-func.o  -lg2c -lm -L/usr/lib/gcc-lib/i386-linux/2.95.2 -lm  1>&5
++configure:2444: checking whether cc accepts -malign-double
++configure:2471: checking whether cc accepts -fstrict-aliasing
++configure:2502: checking whether cc accepts -mcpu=pentium
++configure:2769: checking whether cc accepts -O6 -fomit-frame-pointer -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align -pedantic -fno-schedule-insns -fschedule-insns2 -malign-double -fstrict-aliasing -mcpu=pentium
++configure:2812: checking whether cc accepts -mpreferred-stack-boundary=4
++configure:2837: checking whether the stack is correctly aligned by gcc
++configure:2857: cc -o conftest -O -malign-double   conftest.c  1>&5
++configure: failed program was:
++#line 2844 "configure"
++#include "confdefs.h"
++#include <stdlib.h>
++#       include <stdio.h>
++	struct yuck { int blechh; };
++	int one(void) { return 1; }
++	struct yuck ick(void) { struct yuck y; y.blechh = 3; return y; }
++#       define CHK_ALIGN(x) if ((((long) &(x)) & 0x7)) { fprintf(stderr, "bad alignment of " #x "\n"); exit(1); }
++	void blah(int foo) { double foobar; CHK_ALIGN(foobar); }
++	int main(void) { double ok1; struct yuck y; double ok2; CHK_ALIGN(ok1);
++                         CHK_ALIGN(ok2); y = ick(); blah(one()); return 0; }
++	
++configure:2889: checking whether cc accepts -mpreferred-stack-boundary=2
++configure:2922: checking for sqrt in -lm
++configure:2970: checking how to run the C preprocessor
++configure:3050: checking for ANSI C header files
++configure:3157: checking for sys/time.h
++configure:3157: checking for unistd.h
++configure:3157: checking for getopt.h
++configure:3157: checking for malloc.h
++configure:3195: checking for working const
++configure:3270: checking for size_t
++configure:3303: checking whether time.h and sys/time.h may both be included
++configure:3355: checking for working alloca.h
++configure:3388: checking for alloca
++configure:3589: checking for gettimeofday
++configure:3644: checking for BSDgettimeofday
++configure:3699: checking for gethrtime
++configure:3754: checking for getopt
++configure:3809: checking for getopt_long
++configure:3863: checking for isnan
++configure:3873: cc -o conftest -O6 -fomit-frame-pointer -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align -pedantic -fno-schedule-insns -fschedule-insns2 -malign-double -fstrict-aliasing -mcpu=pentium -mpreferred-stack-boundary=2   conftest.c -lm  1>&5
++configure:3894: checking for hrtime_t
++configure:3907: cc -o conftest -O6 -fomit-frame-pointer -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align -pedantic -fno-schedule-insns -fschedule-insns2 -malign-double -fstrict-aliasing -mcpu=pentium -mpreferred-stack-boundary=2   conftest.c -lm  1>&5
++configure: In function `main':
++configure:3903: `hrtime_t' undeclared (first use in this function)
++configure:3903: (Each undeclared identifier is reported only once
++configure:3903: for each function it appears in.)
++configure:3903: parse error before `foobar'
++configure: failed program was:
++#line 3896 "configure"
++#include "confdefs.h"
++
++#ifdef HAVE_SYS_TIME_H
++#include <sys/time.h>
++#endif
++
++int main() {
++hrtime_t foobar;
++; return 0; }
++configure:3926: checking size of int
++configure:3965: checking size of long long
++configure:4023: checking whether cc accepts -fkeep-programmers-inline
++configure:4049: checking whether cc accepts -vomit-frame-pointer
++configure:4086: checking for pthread_attr_init in -lpthreads
++configure:4135: checking for pthread_create in -lpthread
++configure:4146: cc -o conftest -O6 -fomit-frame-pointer -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align -pedantic -fno-schedule-insns -fschedule-insns2 -malign-double -fstrict-aliasing -mcpu=pentium -mpreferred-stack-boundary=2   conftest.c -lpthread -lm  1>&5
++configure:4272: checking for PTHREAD_CREATE_UNDETACHED attribute
++configure:4281: cc -o conftest -O6 -fomit-frame-pointer -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align -pedantic -fno-schedule-insns -fschedule-insns2 -malign-double -fstrict-aliasing -mcpu=pentium -mpreferred-stack-boundary=2   conftest.c -lm  1>&5
++configure: In function `main':
++configure:4277: `PTHREAD_CREATE_UNDETACHED' undeclared (first use in this function)
++configure:4277: (Each undeclared identifier is reported only once
++configure:4277: for each function it appears in.)
++configure:4277: warning: unused variable `attr'
++configure: failed program was:
++#line 4274 "configure"
++#include "confdefs.h"
++#include <pthread.h>
++int main() {
++int attr=PTHREAD_CREATE_UNDETACHED;
++; return 0; }
++configure:4303: checking for cc_r
++configure:4337: checking if special flags are required for pthreads
++configure:4740: checking for mpicc
++configure:4775: checking for MPI_Init
++configure:4874: checking for MPI_Comm_f2c
++configure:4885: mpicc -o conftest -O6 -fomit-frame-pointer -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align -pedantic -fno-schedule-insns -fschedule-insns2 -malign-double -fstrict-aliasing -mcpu=pentium -mpreferred-stack-boundary=2   conftest.c -lm  1>&5
++In file included from /usr/lib/mpich/build/LINUX/ch_p4/include/mpidefs.h:8,
++                 from /usr/lib/mpich/include/mpi.h:253,
++                 from configure:4878:
++/usr/lib/mpich/build/LINUX/ch_p4/include/mpio.h:28: warning: ANSI C does not support `long long'
++configure: In function `main':
++configure:4881: warning: statement with no effect
diff --cc config.status
index ee287cc,0000000..b9503b0
mode 100644,000000..100644
--- a/config.status
+++ b/config.status
@@@ -1,323 -1,0 +1,373 @@@
 +#! /bin/sh
 +# Generated automatically by configure.
 +# Run this file to recreate the current configuration.
 +# This directory was configured as follows,
 +# on host landru:
 +#
- # ./configure  --prefix=/usr --enable-i386-hacks
++# ./configure  --prefix=/usr --enable-mpi --enable-threads --enable-i386-hacks
 +#
 +# Compiler output produced by configure, useful for debugging
 +# configure, is in ./config.log if it exists.
 +
 +ac_cs_usage="Usage: ./config.status [--recheck] [--version] [--help]"
 +for ac_option
 +do
 +  case "$ac_option" in
 +  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-     echo "running ${CONFIG_SHELL-/bin/sh} ./configure  --prefix=/usr --enable-i386-hacks --no-create --no-recursion"
-     exec ${CONFIG_SHELL-/bin/sh} ./configure  --prefix=/usr --enable-i386-hacks --no-create --no-recursion ;;
++    echo "running ${CONFIG_SHELL-/bin/sh} ./configure  --prefix=/usr --enable-mpi --enable-threads --enable-i386-hacks --no-create --no-recursion"
++    exec ${CONFIG_SHELL-/bin/sh} ./configure  --prefix=/usr --enable-mpi --enable-threads --enable-i386-hacks --no-create --no-recursion ;;
 +  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-     echo "./config.status generated by autoconf version 2.12"
++    echo "./config.status generated by autoconf version 2.13"
 +    exit 0 ;;
 +  -help | --help | --hel | --he | --h)
 +    echo "$ac_cs_usage"; exit 0 ;;
 +  *) echo "$ac_cs_usage"; exit 1 ;;
 +  esac
 +done
 +
 +ac_given_srcdir=.
 +ac_given_INSTALL="/usr/bin/install -c"
 +
- trap 'rm -fr fftw/Makefile tests/Makefile rfftw/Makefile doc/Makefile Makefile fftw/config.h fftw/fftw.h conftest*; exit 1' 1 2 15
++trap 'rm -fr fftw/Makefile tests/Makefile rfftw/Makefile doc/Makefile Makefile threads/Makefile mpi/Makefile fftw.spec fftw/config.h fftw/fftw.h conftest*; exit 1' 1 2 15
 +
 +# Protect against being on the right side of a sed subst in config.status.
 +sed 's/%@/@@/; s/@%/@@/; s/%g$/@g/; /@g$/s/[\\&%]/\\&/g;
 + s/@@/%@/; s/@@/@%/; s/@g$/%g/' > conftest.subs <<\CEOF
 +/^[ 	]*VPATH[ 	]*=[^:]*$/d
 +
- s%@CFLAGS@%-O6 -fomit-frame-pointer -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align -pedantic -malign-double %g
++s%@SHELL@%/bin/sh%g
++s%@CFLAGS@%-O6 -fomit-frame-pointer -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align -pedantic -fno-schedule-insns -fschedule-insns2 -malign-double -fstrict-aliasing -mcpu=pentium -mpreferred-stack-boundary=2%g
 +s%@CPPFLAGS@%%g
 +s%@CXXFLAGS@%%g
++s%@FFLAGS@%-g -O2%g
 +s%@DEFS@%-DHAVE_CONFIG_H%g
 +s%@LDFLAGS@%%g
 +s%@LIBS@%-lm %g
 +s%@exec_prefix@%${prefix}%g
 +s%@prefix@%/usr%g
 +s%@program_transform_name@%s,x,x,%g
 +s%@bindir@%${exec_prefix}/bin%g
 +s%@sbindir@%${exec_prefix}/sbin%g
 +s%@libexecdir@%${exec_prefix}/libexec%g
 +s%@datadir@%${prefix}/share%g
 +s%@sysconfdir@%${prefix}/etc%g
 +s%@sharedstatedir@%${prefix}/com%g
 +s%@localstatedir@%${prefix}/var%g
 +s%@libdir@%${exec_prefix}/lib%g
 +s%@includedir@%${prefix}/include%g
 +s%@oldincludedir@%/usr/include%g
 +s%@infodir@%${prefix}/info%g
 +s%@mandir@%${prefix}/man%g
 +s%@INSTALL_PROGRAM@%${INSTALL}%g
- s%@INSTALL_DATA@%${INSTALL} -m 644%g
 +s%@INSTALL_SCRIPT@%${INSTALL_PROGRAM}%g
++s%@INSTALL_DATA@%${INSTALL} -m 644%g
 +s%@PACKAGE@%fftw%g
- s%@VERSION@%2.0.1%g
++s%@VERSION@%2.1.3%g
 +s%@ACLOCAL@%aclocal%g
 +s%@AUTOCONF@%autoconf%g
 +s%@AUTOMAKE@%automake%g
 +s%@AUTOHEADER@%autoheader%g
 +s%@MAKEINFO@%makeinfo%g
 +s%@SET_MAKE@%%g
++s=XXX_FFTW_PREFIX_XXX==g
++s%@FFTW_PREFIX@%%g
++s=XXX_FFTW_PREFIX1_XXX=xyz=g
 +s%@CC@%cc%g
 +s%@RANLIB@%ranlib%g
 +s%@LN_S@%ln -s%g
 +s%@host@%i586-pc-linux-gnu%g
 +s%@host_alias@%i586-pc-linux-gnu%g
 +s%@host_cpu@%i586%g
 +s%@host_vendor@%pc%g
 +s%@host_os@%linux-gnu%g
++s%@build@%i586-pc-linux-gnu%g
++s%@build_alias@%i586-pc-linux-gnu%g
++s%@build_cpu@%i586%g
++s%@build_vendor@%pc%g
++s%@build_os@%linux-gnu%g
 +s%@LD@%/usr/bin/ld%g
 +s%@NM@%/usr/bin/nm -B%g
 +s%@LIBTOOL@%$(SHELL) $(top_builddir)/libtool%g
 +s%@PERL@%perl%g
- s%@SHARED_VERSION_INFO@%2:1:0%g
++s%@F77@%f77%g
++s%@FLIBS@% -lg2c -lm -L/usr/lib/gcc-lib/i386-linux/2.95.2 -lm%g
++s%@SHARED_VERSION_INFO@%2:5:0%g
++s%@SHARED_VERSION@%2.0.5%g
 +s%@CPP@%cc -E%g
 +s%@ALLOCA@%%g
++s%@CCthreads@%cc%g
++s%@FFTW_THREADS_LIBLIST@%libfftw_threads.la librfftw_threads.la%g
++s%@FFTW_THREADS_INCLUDELIST@%fftw_threads.h rfftw_threads.h%g
++s%@FFTW_THREADS_PROGLIST@%fftw_threads_test rfftw_threads_test%g
++s%@THREADLIBS@%-lpthread%g
++s%@MPICC@%mpicc%g
++s%@FFTW_MPI_LIBLIST@%libfftw_mpi.la librfftw_mpi.la%g
++s%@FFTW_MPI_INCLUDELIST@%fftw_mpi.h rfftw_mpi.h%g
++s%@FFTW_MPI_PROGLIST@%test_sched test_transpose_mpi fftw_mpi_test rfftw_mpi_test%g
++s%@MPILIBS@% %g
 +
 +CEOF
 +
 +# Split the substitutions into bite-sized pieces for seds with
 +# small command number limits, like on Digital OSF/1 and HP-UX.
 +ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
 +ac_file=1 # Number of current file.
 +ac_beg=1 # First line for current file.
 +ac_end=$ac_max_sed_cmds # Line after last line for current file.
 +ac_more_lines=:
 +ac_sed_cmds=""
 +while $ac_more_lines; do
 +  if test $ac_beg -gt 1; then
 +    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
 +  else
 +    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
 +  fi
 +  if test ! -s conftest.s$ac_file; then
 +    ac_more_lines=false
 +    rm -f conftest.s$ac_file
 +  else
 +    if test -z "$ac_sed_cmds"; then
 +      ac_sed_cmds="sed -f conftest.s$ac_file"
 +    else
 +      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
 +    fi
 +    ac_file=`expr $ac_file + 1`
 +    ac_beg=$ac_end
 +    ac_end=`expr $ac_end + $ac_max_sed_cmds`
 +  fi
 +done
 +if test -z "$ac_sed_cmds"; then
 +  ac_sed_cmds=cat
 +fi
 +
- CONFIG_FILES=${CONFIG_FILES-"fftw/Makefile tests/Makefile rfftw/Makefile doc/Makefile Makefile"}
++CONFIG_FILES=${CONFIG_FILES-"fftw/Makefile tests/Makefile rfftw/Makefile doc/Makefile Makefile threads/Makefile mpi/Makefile fftw.spec"}
 +for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
 +  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
 +  case "$ac_file" in
 +  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
 +       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
 +  *) ac_file_in="${ac_file}.in" ;;
 +  esac
 +
 +  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
 +
 +  # Remove last slash and all that follows it.  Not all systems have dirname.
 +  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
 +  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
 +    # The file is in a subdirectory.
 +    test ! -d "$ac_dir" && mkdir "$ac_dir"
 +    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
 +    # A "../" for each directory in $ac_dir_suffix.
 +    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
 +  else
 +    ac_dir_suffix= ac_dots=
 +  fi
 +
 +  case "$ac_given_srcdir" in
 +  .)  srcdir=.
 +      if test -z "$ac_dots"; then top_srcdir=.
 +      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
 +  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
 +  *) # Relative path.
 +    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
 +    top_srcdir="$ac_dots$ac_given_srcdir" ;;
 +  esac
 +
 +  case "$ac_given_INSTALL" in
 +  [/$]*) INSTALL="$ac_given_INSTALL" ;;
 +  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
 +  esac
 +
 +  echo creating "$ac_file"
 +  rm -f "$ac_file"
 +  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
 +  case "$ac_file" in
 +  *Makefile*) ac_comsub="1i\\
 +# $configure_input" ;;
 +  *) ac_comsub= ;;
 +  esac
 +
 +  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
 +  sed -e "$ac_comsub
 +s%@configure_input@%$configure_input%g
 +s%@srcdir@%$srcdir%g
 +s%@top_srcdir@%$top_srcdir%g
 +s%@INSTALL@%$INSTALL%g
 +" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
 +fi; done
 +rm -f conftest.s*
 +
 +# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
 +# NAME is the cpp macro being defined and VALUE is the value it is being given.
 +#
 +# ac_d sets the value in "#define NAME VALUE" lines.
 +ac_dA='s%^\([ 	]*\)#\([ 	]*define[ 	][ 	]*\)'
 +ac_dB='\([ 	][ 	]*\)[^ 	]*%\1#\2'
 +ac_dC='\3'
 +ac_dD='%g'
 +# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE".
 +ac_uA='s%^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
 +ac_uB='\([ 	]\)%\1#\2define\3'
 +ac_uC=' '
 +ac_uD='\4%g'
 +# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
 +ac_eA='s%^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
 +ac_eB='$%\1#\2define\3'
 +ac_eC=' '
 +ac_eD='%g'
 +
 +if test "${CONFIG_HEADERS+set}" != set; then
 +  CONFIG_HEADERS="fftw/config.h fftw/fftw.h"
 +fi
 +for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then
 +  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
 +  case "$ac_file" in
 +  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
 +       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
 +  *) ac_file_in="${ac_file}.in" ;;
 +  esac
 +
 +  echo creating $ac_file
 +
 +  rm -f conftest.frag conftest.in conftest.out
 +  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
 +  cat $ac_file_inputs > conftest.in
 +
 +  cat > conftest.frag <<CEOF
 +${ac_dA}PACKAGE${ac_dB}PACKAGE${ac_dC}"fftw"${ac_dD}
 +${ac_uA}PACKAGE${ac_uB}PACKAGE${ac_uC}"fftw"${ac_uD}
 +${ac_eA}PACKAGE${ac_eB}PACKAGE${ac_eC}"fftw"${ac_eD}
- ${ac_dA}VERSION${ac_dB}VERSION${ac_dC}"2.0.1"${ac_dD}
- ${ac_uA}VERSION${ac_uB}VERSION${ac_uC}"2.0.1"${ac_uD}
- ${ac_eA}VERSION${ac_eB}VERSION${ac_eC}"2.0.1"${ac_eD}
++${ac_dA}VERSION${ac_dB}VERSION${ac_dC}"2.1.3"${ac_dD}
++${ac_uA}VERSION${ac_uB}VERSION${ac_uC}"2.1.3"${ac_uD}
++${ac_eA}VERSION${ac_eB}VERSION${ac_eC}"2.1.3"${ac_eD}
 +${ac_dA}FFTW_ENABLE_I386_HACKS${ac_dB}FFTW_ENABLE_I386_HACKS${ac_dC}1${ac_dD}
 +${ac_uA}FFTW_ENABLE_I386_HACKS${ac_uB}FFTW_ENABLE_I386_HACKS${ac_uC}1${ac_uD}
 +${ac_eA}FFTW_ENABLE_I386_HACKS${ac_eB}FFTW_ENABLE_I386_HACKS${ac_eC}1${ac_eD}
- ${ac_dA}FFTW_VERSION${ac_dB}FFTW_VERSION${ac_dC}"2.0.1"${ac_dD}
- ${ac_uA}FFTW_VERSION${ac_uB}FFTW_VERSION${ac_uC}"2.0.1"${ac_uD}
- ${ac_eA}FFTW_VERSION${ac_eB}FFTW_VERSION${ac_eC}"2.0.1"${ac_eD}
++${ac_dA}FFTW_FORTRANIZE_LOWERCASE_UNDERSCORE${ac_dB}FFTW_FORTRANIZE_LOWERCASE_UNDERSCORE${ac_dC}1${ac_dD}
++${ac_uA}FFTW_FORTRANIZE_LOWERCASE_UNDERSCORE${ac_uB}FFTW_FORTRANIZE_LOWERCASE_UNDERSCORE${ac_uC}1${ac_uD}
++${ac_eA}FFTW_FORTRANIZE_LOWERCASE_UNDERSCORE${ac_eB}FFTW_FORTRANIZE_LOWERCASE_UNDERSCORE${ac_eC}1${ac_eD}
 +CEOF
 +  sed -f conftest.frag conftest.in > conftest.out
 +  rm -f conftest.in
 +  mv conftest.out conftest.in
 +
 +  cat > conftest.frag <<CEOF
++${ac_dA}FFTW_FORTRANIZE_EXTRA_UNDERSCORE${ac_dB}FFTW_FORTRANIZE_EXTRA_UNDERSCORE${ac_dC}1${ac_dD}
++${ac_uA}FFTW_FORTRANIZE_EXTRA_UNDERSCORE${ac_uB}FFTW_FORTRANIZE_EXTRA_UNDERSCORE${ac_uC}1${ac_uD}
++${ac_eA}FFTW_FORTRANIZE_EXTRA_UNDERSCORE${ac_eB}FFTW_FORTRANIZE_EXTRA_UNDERSCORE${ac_eC}1${ac_eD}
++${ac_dA}FFTW_VERSION${ac_dB}FFTW_VERSION${ac_dC}"2.1.3"${ac_dD}
++${ac_uA}FFTW_VERSION${ac_uB}FFTW_VERSION${ac_uC}"2.1.3"${ac_uD}
++${ac_eA}FFTW_VERSION${ac_eB}FFTW_VERSION${ac_eC}"2.1.3"${ac_eD}
 +${ac_dA}HAVE_LIBM${ac_dB}HAVE_LIBM${ac_dC}1${ac_dD}
 +${ac_uA}HAVE_LIBM${ac_uB}HAVE_LIBM${ac_uC}1${ac_uD}
 +${ac_eA}HAVE_LIBM${ac_eB}HAVE_LIBM${ac_eC}1${ac_eD}
 +${ac_dA}STDC_HEADERS${ac_dB}STDC_HEADERS${ac_dC}1${ac_dD}
 +${ac_uA}STDC_HEADERS${ac_uB}STDC_HEADERS${ac_uC}1${ac_uD}
 +${ac_eA}STDC_HEADERS${ac_eB}STDC_HEADERS${ac_eC}1${ac_eD}
- ${ac_dA}HAVE_SYS_TIME_H${ac_dB}HAVE_SYS_TIME_H${ac_dC}1${ac_dD}
- ${ac_uA}HAVE_SYS_TIME_H${ac_uB}HAVE_SYS_TIME_H${ac_uC}1${ac_uD}
- ${ac_eA}HAVE_SYS_TIME_H${ac_eB}HAVE_SYS_TIME_H${ac_eC}1${ac_eD}
- ${ac_dA}HAVE_UNISTD_H${ac_dB}HAVE_UNISTD_H${ac_dC}1${ac_dD}
- ${ac_uA}HAVE_UNISTD_H${ac_uB}HAVE_UNISTD_H${ac_uC}1${ac_uD}
- ${ac_eA}HAVE_UNISTD_H${ac_eB}HAVE_UNISTD_H${ac_eC}1${ac_eD}
 +CEOF
 +  sed -f conftest.frag conftest.in > conftest.out
 +  rm -f conftest.in
 +  mv conftest.out conftest.in
 +
 +  cat > conftest.frag <<CEOF
++${ac_dA}HAVE_SYS_TIME_H${ac_dB}HAVE_SYS_TIME_H${ac_dC}1${ac_dD}
++${ac_uA}HAVE_SYS_TIME_H${ac_uB}HAVE_SYS_TIME_H${ac_uC}1${ac_uD}
++${ac_eA}HAVE_SYS_TIME_H${ac_eB}HAVE_SYS_TIME_H${ac_eC}1${ac_eD}
++${ac_dA}HAVE_UNISTD_H${ac_dB}HAVE_UNISTD_H${ac_dC}1${ac_dD}
++${ac_uA}HAVE_UNISTD_H${ac_uB}HAVE_UNISTD_H${ac_uC}1${ac_uD}
++${ac_eA}HAVE_UNISTD_H${ac_eB}HAVE_UNISTD_H${ac_eC}1${ac_eD}
 +${ac_dA}HAVE_GETOPT_H${ac_dB}HAVE_GETOPT_H${ac_dC}1${ac_dD}
 +${ac_uA}HAVE_GETOPT_H${ac_uB}HAVE_GETOPT_H${ac_uC}1${ac_uD}
 +${ac_eA}HAVE_GETOPT_H${ac_eB}HAVE_GETOPT_H${ac_eC}1${ac_eD}
 +${ac_dA}HAVE_MALLOC_H${ac_dB}HAVE_MALLOC_H${ac_dC}1${ac_dD}
 +${ac_uA}HAVE_MALLOC_H${ac_uB}HAVE_MALLOC_H${ac_uC}1${ac_uD}
 +${ac_eA}HAVE_MALLOC_H${ac_eB}HAVE_MALLOC_H${ac_eC}1${ac_eD}
- ${ac_dA}TIME_WITH_SYS_TIME${ac_dB}TIME_WITH_SYS_TIME${ac_dC}1${ac_dD}
- ${ac_uA}TIME_WITH_SYS_TIME${ac_uB}TIME_WITH_SYS_TIME${ac_uC}1${ac_uD}
- ${ac_eA}TIME_WITH_SYS_TIME${ac_eB}TIME_WITH_SYS_TIME${ac_eC}1${ac_eD}
- ${ac_dA}HAVE_ALLOCA_H${ac_dB}HAVE_ALLOCA_H${ac_dC}1${ac_dD}
- ${ac_uA}HAVE_ALLOCA_H${ac_uB}HAVE_ALLOCA_H${ac_uC}1${ac_uD}
- ${ac_eA}HAVE_ALLOCA_H${ac_eB}HAVE_ALLOCA_H${ac_eC}1${ac_eD}
 +CEOF
 +  sed -f conftest.frag conftest.in > conftest.out
 +  rm -f conftest.in
 +  mv conftest.out conftest.in
 +
 +  cat > conftest.frag <<CEOF
++${ac_dA}TIME_WITH_SYS_TIME${ac_dB}TIME_WITH_SYS_TIME${ac_dC}1${ac_dD}
++${ac_uA}TIME_WITH_SYS_TIME${ac_uB}TIME_WITH_SYS_TIME${ac_uC}1${ac_uD}
++${ac_eA}TIME_WITH_SYS_TIME${ac_eB}TIME_WITH_SYS_TIME${ac_eC}1${ac_eD}
++${ac_dA}HAVE_ALLOCA_H${ac_dB}HAVE_ALLOCA_H${ac_dC}1${ac_dD}
++${ac_uA}HAVE_ALLOCA_H${ac_uB}HAVE_ALLOCA_H${ac_uC}1${ac_uD}
++${ac_eA}HAVE_ALLOCA_H${ac_eB}HAVE_ALLOCA_H${ac_eC}1${ac_eD}
 +${ac_dA}HAVE_ALLOCA${ac_dB}HAVE_ALLOCA${ac_dC}1${ac_dD}
 +${ac_uA}HAVE_ALLOCA${ac_uB}HAVE_ALLOCA${ac_uC}1${ac_uD}
 +${ac_eA}HAVE_ALLOCA${ac_eB}HAVE_ALLOCA${ac_eC}1${ac_eD}
 +${ac_dA}HAVE_GETTIMEOFDAY${ac_dB}HAVE_GETTIMEOFDAY${ac_dC}1${ac_dD}
 +${ac_uA}HAVE_GETTIMEOFDAY${ac_uB}HAVE_GETTIMEOFDAY${ac_uC}1${ac_uD}
 +${ac_eA}HAVE_GETTIMEOFDAY${ac_eB}HAVE_GETTIMEOFDAY${ac_eC}1${ac_eD}
++CEOF
++  sed -f conftest.frag conftest.in > conftest.out
++  rm -f conftest.in
++  mv conftest.out conftest.in
++
++  cat > conftest.frag <<CEOF
 +${ac_dA}HAVE_GETOPT${ac_dB}HAVE_GETOPT${ac_dC}1${ac_dD}
 +${ac_uA}HAVE_GETOPT${ac_uB}HAVE_GETOPT${ac_uC}1${ac_uD}
 +${ac_eA}HAVE_GETOPT${ac_eB}HAVE_GETOPT${ac_eC}1${ac_eD}
++${ac_dA}HAVE_GETOPT_LONG${ac_dB}HAVE_GETOPT_LONG${ac_dC}1${ac_dD}
++${ac_uA}HAVE_GETOPT_LONG${ac_uB}HAVE_GETOPT_LONG${ac_uC}1${ac_uD}
++${ac_eA}HAVE_GETOPT_LONG${ac_eB}HAVE_GETOPT_LONG${ac_eC}1${ac_eD}
 +${ac_dA}HAVE_ISNAN${ac_dB}HAVE_ISNAN${ac_dC}1${ac_dD}
 +${ac_uA}HAVE_ISNAN${ac_uB}HAVE_ISNAN${ac_uC}1${ac_uD}
 +${ac_eA}HAVE_ISNAN${ac_eB}HAVE_ISNAN${ac_eC}1${ac_eD}
++${ac_dA}SIZEOF_INT${ac_dB}SIZEOF_INT${ac_dC}4${ac_dD}
++${ac_uA}SIZEOF_INT${ac_uB}SIZEOF_INT${ac_uC}4${ac_uD}
++${ac_eA}SIZEOF_INT${ac_eB}SIZEOF_INT${ac_eC}4${ac_eD}
 +CEOF
 +  sed -f conftest.frag conftest.in > conftest.out
 +  rm -f conftest.in
 +  mv conftest.out conftest.in
 +
 +  cat > conftest.frag <<CEOF
++${ac_dA}SIZEOF_LONG_LONG${ac_dB}SIZEOF_LONG_LONG${ac_dC}8${ac_dD}
++${ac_uA}SIZEOF_LONG_LONG${ac_uB}SIZEOF_LONG_LONG${ac_uC}8${ac_uD}
++${ac_eA}SIZEOF_LONG_LONG${ac_eB}SIZEOF_LONG_LONG${ac_eC}8${ac_eD}
++${ac_dA}FFTW_USING_POSIX_THREADS${ac_dB}FFTW_USING_POSIX_THREADS${ac_dC}1${ac_dD}
++${ac_uA}FFTW_USING_POSIX_THREADS${ac_uB}FFTW_USING_POSIX_THREADS${ac_uC}1${ac_uD}
++${ac_eA}FFTW_USING_POSIX_THREADS${ac_eB}FFTW_USING_POSIX_THREADS${ac_eC}1${ac_eD}
++${ac_dA}HAVE_MPI_COMM_F2C${ac_dB}HAVE_MPI_COMM_F2C${ac_dC}1${ac_dD}
++${ac_uA}HAVE_MPI_COMM_F2C${ac_uB}HAVE_MPI_COMM_F2C${ac_uC}1${ac_uD}
++${ac_eA}HAVE_MPI_COMM_F2C${ac_eB}HAVE_MPI_COMM_F2C${ac_eC}1${ac_eD}
 +s%^[ 	]*#[ 	]*undef[ 	][ 	]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */%
 +CEOF
 +  sed -f conftest.frag conftest.in > conftest.out
 +  rm -f conftest.in
 +  mv conftest.out conftest.in
 +
 +  rm -f conftest.frag conftest.h
 +  echo "/* $ac_file.  Generated automatically by configure.  */" > conftest.h
 +  cat conftest.in >> conftest.h
 +  rm -f conftest.in
 +  if cmp -s $ac_file conftest.h 2>/dev/null; then
 +    echo "$ac_file is unchanged"
 +    rm -f conftest.h
 +  else
 +    # Remove last slash and all that follows it.  Not all systems have dirname.
 +      ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
 +      if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
 +      # The file is in a subdirectory.
 +      test ! -d "$ac_dir" && mkdir "$ac_dir"
 +    fi
 +    rm -f $ac_file
 +    mv conftest.h $ac_file
 +  fi
 +fi; done
 +
 +
 +
 +am_indx=1
 +for am_file in fftw/config.h fftw/fftw.h; do
 +  case " $CONFIG_HEADERS " in
 +  *" $am_file "*)
 +    echo timestamp > `echo $am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx
 +    ;;
 +  esac
 +  am_indx=`expr "$am_indx" + 1`
 +done
 +
 +exit 0
diff --cc debian/Makefile.mpi
index 0000000,0000000..fd1acc0
new file mode 100644
--- /dev/null
+++ b/debian/Makefile.mpi
@@@ -1,0 -1,0 +1,21 @@@
++INCL=-I. -I./../tests
++OPTS=-O6 -fomit-frame-pointer -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align -pedantic -malign-double
++LIBS=-lfftw_mpi -lrfftw_mpi -lfftw -lrfftw
++CFLAGS=-DHAVE_CONFIG_H
++
++.c.o:
++	mpicc $(CFLAGS) $(INCL) $(OPTS) -c $<
++
++all: fftw_mpi_test rfftw_mpi_test test_sched test_transpose_mpi
++
++fftw_mpi_test: fftw_mpi_test.o ../tests/test_main.o
++	mpicc -o fftw_mpi_test $(LIBS) fftw_mpi_test.o ../tests/test_main.o -lm
++rfftw_mpi_test: rfftw_mpi_test.o ../tests/test_main.o
++	mpicc -o rfftw_mpi_test $(LIBS) rfftw_mpi_test.o ../tests/test_main.o -lm
++test_sched: test_sched.o
++	mpicc -o test_sched $(LIBS) test_sched.o -lm
++test_transpose_mpi: test_transpose_mpi.o
++	mpicc -o test_transpose_mpi $(LIBS) test_transpose_mpi.o -lm
++
++clean:
++	-rm fftw_mpi_test.o rfftw_mpi_test.o fftw_mpi_test rfftw_mpi_test
diff --cc debian/Makefile.tests
index 4630955,0000000..201ba9f
mode 100644,000000..100644
--- a/debian/Makefile.tests
+++ b/debian/Makefile.tests
@@@ -1,16 -1,0 +1,18 @@@
 +CFLAGS=-DHAVE_CONFIG_H
 +INCLUDES=-I. -I/usr/include
 +OPTS=-O6 -fomit-frame-pointer -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align -pedantic -malign-double
 +# LIBS=-L/usr/lib
 +LIBS=-lfftw -lrfftw
 +
 +.c.o:
 +	gcc $(CFLAGS) $(INCLUDES) $(OPTS) -c $<
 +
 +all: fftw_test rfftw_test
 +
 +fftw_test: fftw_test.o test_main.o
 +	gcc $(LIBS) -o fftw_test fftw_test.o test_main.o -lm
 +rfftw_test: rfftw_test.o test_main.o
 +	gcc $(LIBS) -o rfftw_test rfftw_test.o test_main.o -lm
 +
++clean:
++	-rm fftw_test.o rfftw_test.o test_main.o fftw_test rfftw_test
diff --cc debian/Makefile.threads
index 0000000,0000000..7535226
new file mode 100644
--- /dev/null
+++ b/debian/Makefile.threads
@@@ -1,0 -1,0 +1,17 @@@
++INCL=-I. -I./../tests
++OPTS=-O6 -fomit-frame-pointer -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align -pedantic -malign-double
++LIBS=-lfftw_threads -lrfftw_threads -lfftw -lrfftw
++CFLAGS=-DHAVE_CONFIG_H
++
++.c.o:
++	gcc $(CFLAGS) $(INCL) $(OPTS) -c $<
++
++all: fftw_threads_test rfftw_threads_test
++
++fftw_threads_test: fftw_threads_test.o ../tests/test_main.o
++	gcc -o fftw_threads_test $(LIBS) fftw_threads_test.o ../tests/test_main.o -lpthread -lm
++rfftw_threads_test: rfftw_threads_test.o ../tests/test_main.o
++	gcc -o rfftw_threads_test $(LIBS) rfftw_threads_test.o ../tests/test_main.o -lpthread -lm
++
++clean:
++	-rm fftw_threads_test.o rfftw_threads_test.o fftw_threads_test rfftw_threads_test
diff --cc debian/README.debian
index 603fee6,0000000..622c4b1
mode 100644,000000..100644
--- a/debian/README.debian
+++ b/debian/README.debian
@@@ -1,10 -1,0 +1,25 @@@
 +fftw for DEBIAN
 +----------------------
 +
- The libraries of fftw in Debian are heavily optimized and not
- threaded. There is code in the source for creating a threaded
- version. If anyone is interested in a threaded version of fftw,
- send me mail and I will create a separate package containing
- threadsafe libraries.
++There are two Debian packages for fftw. The first, fftw2, contains
++shared libraries. The second, fftw-dev, contains static libraries
++and header files needed for compiling. If you wish to use the
++static libraries you need to be careful when compiling as the
++usual -lfftw looks for shared libraries first. On architectures
++without many registers (like x86 machines) there is a performance
++penalty to using shared libraries (estimates are from 5-30% slower
++depending on the application).
++
++The package also contains a threaded version of fftw.
++Using the threaded version is almost identical to using the non-
++threaded version, but the function calls are renamed and you
++need to call a special function first to handle some housekeeping.
++See the documentation for details.
++
++The packages also contain mpi based libraries. Mpi is a system
++for spreading computations over multiple machines. This relies
++on the mpich package. The fftw packages do not depend on mpich,
++but only suggests it, since fftw can be used without mpi. Again,
++see the documentation for details.
 +
 +James A. Treacy <treacy at debian.org>, Fri, 11 Sep 1998 21:42:20 -0500
diff --cc debian/changelog
index 31db851,0000000..bf49001
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,53 -1,0 +1,84 @@@
++fftw (2.1.3-1) unstable; urgency=low
++
++  * New upstream version.
++
++ -- James A. Treacy <treacy at debian.org>  Mon,  8 Nov 1999 13:56:53 -0500
++
++fftw (2.1.2-1) unstable; urgency=low
++
++  * New Upstream version.
++
++ -- James A. Treacy <treacy at debian.org>  Fri, 28 May 1999 01:03:42 -0400
++
++fftw (2.1.1-1) unstable; urgency=low
++
++  * New Upstream version.
++
++ -- James A. Treacy <treacy at debian.org>  Thu,  1 Apr 1999 01:58:09 -0500
++
++fftw (2.1-1) unstable; urgency=low
++
++  * New Upstream version.
++  * info documentation now included. Fixes bug #33140
++
++ -- James A. Treacy <treacy at debian.org>  Tue,  9 Mar 1999 12:35:27 -0500
++
++fftw (2.0.1-2) unstable; urgency=low
++
++  * Include threaded version of library (uses different name).
++
++ -- James A. Treacy <treacy at debian.org>  Mon,  1 Feb 1999 16:23:46 -0500
++
 +fftw (2.0.1-1) unstable; urgency=low
 +
 +  * New Upstream version.
 +
 + -- James A. Treacy <treacy at debian.org>  Thu,  1 Oct 1998 13:10:51 -0400
 +
 +fftw (2.0-1) unstable; urgency=low
 +
 +  * New Upstream version.
 +
 + -- James A. Treacy <treacy at debian.org>  Fri, 11 Sep 1998 16:00:00 -0400
 +
 +fftw (1.3-2) unstable; urgency=low
 +
 +  * missing .gif files added to documentation. Fixes bug #22304
 +
 + -- James A. Treacy <treacy at debian.org>  Sun, 24 May 1998 00:03:36 -0400
 +
 +fftw (1.3-1) unstable; urgency=low
 +
 +  * new upstream version
 +  * released under the GPL
 +
 + -- James A. Treacy <treacy at debian.org>  Fri, 17 Apr 1998 03:09:51 -0400
 +
 +fftw (1.2.1-4) unstable; urgency=low
 +
 +  * made -dev package depend on specific version of fftw1
 +
 + -- James A. Treacy <treacy at debian.org>  Mon, 16 Feb 1998 23:15:16 -0500
 +
 +fftw (1.2.1-3) unstable; urgency=low
 +
 +  * Got rid of lintian bugs.
 +
 + -- James A. Treacy <treacy at debian.org>  Thu, 12 Feb 1998 15:03:14 -0500
 +
 +fftw (1.2.1-2) unstable; urgency=low
 +
 +  * Added missing copyright file
 +
 + -- James A. Treacy <treacy at debian.org>  Mon,  2 Feb 1998 15:34:33 -0500
 +
 +fftw (1.2.1-1) unstable; urgency=low
 +
 +  * Initial Release.
 +
 + -- James A. Treacy <treacy at debian.org>  Fri,  9 Jan 1998 11:42:20 -0500
 +
 +Local variables:
 +mode: debian-changelog
 +add-log-mailing-address: "treacy at debian.org"
 +End:
diff --cc debian/control
index 1a39c7e,0000000..92ce72e
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,26 -1,0 +1,26 @@@
 +Source: fftw
 +Section: math
 +Priority: optional
 +Maintainer: James A. Treacy <treacy at debian.org>
- Standards-Version: 2.4.0.0
++Standards-Version: 2.5.1
 +
 +Package: fftw2
 +Architecture: any
 +Depends: ${shlibs:Depends}
- Suggests: fftw-dev
++Suggests: fftw-dev, mpich
 +Description: library for computing Fast Fourier Transforms
 + This library computes Fast Fourier Transforms (FFT) in one
 + or more dimensions. It is extremely fast. This package
 + contains the documentation and the shared version of the fftw
 + libraries. To get the static library and the header files you
 + need to install fftw1-dev.
 +
 +Package: fftw-dev
 +Architecture: any
 +Depends: fftw2 (= ${Source-Version}), ${shlibs:Depends}
 +Conflicts: fftw1-dev
 +Description: library for computing Fast Fourier Transforms
 + This library computes FFTs in one or more dimensions. It
 + is extremely fast. This package contains the statically
 + linked library and the header files.
 +
diff --cc debian/fftw-dev.postinst
index 0000000,0000000..b4e8fdd
new file mode 100644
--- /dev/null
+++ b/debian/fftw-dev.postinst
@@@ -1,0 -1,0 +1,13 @@@
++#!/bin/sh
++
++set -e
++
++install-info --quiet --section Development Development \
++	--description="Collection of fast C routines for computing discrete Fourier transforms." \
++	/usr/info/fftw.info
++
++if [ "$1" = "configure" ]; then
++   if [ -d /usr/doc -a ! -e /usr/doc/fftw-dev -a -d /usr/share/doc/fftw-dev ]; then
++      ln -sf ../share/doc/fftw-dev /usr/doc/fftw-dev
++   fi
++fi
diff --cc debian/fftw-dev.prerm
index 0000000,0000000..fff8349
new file mode 100644
--- /dev/null
+++ b/debian/fftw-dev.prerm
@@@ -1,0 -1,0 +1,9 @@@
++#!/bin/sh
++
++set -e
++
++install-info --quiet --remove /usr/info/fftw.info
++
++if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/fftw-dev ]; then
++   rm -f /usr/doc/fftw-dev 1
++fi
diff --cc debian/postinst
index e40ca97,0000000..77ce3d1
mode 100644,000000..100644
--- a/debian/postinst
+++ b/debian/postinst
@@@ -1,9 -1,0 +1,17 @@@
 +#!/bin/sh
 +
 +set -e
 +
 +if [ "$1" = "configure" ]; then
 +  ldconfig
 +fi
 +
- exit
++install-info --quiet --section Development Development \
++	--description="Collection of fast C routines for computing discrete Fourier transforms." \
++	/usr/share/info/fftw.info
++
++if [ "$1" = "configure" ]; then
++   if [ -d /usr/doc -a ! -e /usr/doc/fftw2 -a -d /usr/share/doc/fftw2 ]; then
++      ln -sf ../share/doc/fftw2 /usr/doc/fftw2
++   fi
++fi
diff --cc debian/prerm
index 0000000,0000000..64db35e
new file mode 100644
--- /dev/null
+++ b/debian/prerm
@@@ -1,0 -1,0 +1,9 @@@
++#!/bin/sh
++
++set -e
++
++install-info --quiet --remove /usr/share/info/fftw.info
++
++if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/fftw2 ]; then
++   rm -f /usr/doc/fftw2 1
++fi
diff --cc debian/rules
index 2eb97b0,0000000..ecf8969
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,117 -1,0 +1,158 @@@
 +#!/usr/bin/make -f
 +# Made with the aid of debmake, by Christoph Lameter,
 +# based on the sample debian/rules file for GNU hello by Ian Jackson.
 +
 +package=fftw
 +lib=libfftw
 +
- version=2.0.1
++version=2.1.3
++#lib_version=$version
++lib_version=2.0.5
 +version_major=$(shell expr `pwd` : '.*-\([0-9]*\).[0-9.]*')
 +ARCHITECTURE=$(shell dpkg --print-architecture)
 +INSTALL_DIR = install -m755 -o root -g root -d
 +INSTALL_DATA = install -m644 -o root -g root
 +INSTALL_LIB = install -m644 -o root -g root
 +INSTALL_BIN = install -m755 -o root -g root
 +
 +build:
 +	$(checkdir)
 +	-mkdir shared static
 +
 +	#
 +	# First build the shared library
 +	#
 +ifeq ($(ARCHITECTURE), i386)
- 	./configure --prefix=/usr --enable-shared --enable-i386-hacks
++	./configure --prefix=/usr --enable-shared --enable-mpi --enable-threads --enable-i386-hacks 
 +else
- 	./configure --prefix=/usr --enable-shared
++	./configure --prefix=/usr --enable-shared --enable-mpi --enable-threads
 +endif
 +	$(MAKE)
- 	mv fftw/.libs/libfftw.so.$(version) rfftw/.libs/librfftw.so.$(version) shared
++	mv fftw/.libs/libfftw.so.$(lib_version) rfftw/.libs/librfftw.so.$(lib_version) shared
++	mv threads/.libs/lib*fftw_threads.so.$(lib_version) shared
++	# don't use mpicc to create the shared lib or the mpich static lib will be included
++	cd mpi && gcc -shared -Wl,-soname -Wl,libfftw_mpi.so.$(version_major) -o .libs/libfftw_mpi.so.$(lib_version) sched.lo \
++		TOMS_transpose.lo transpose_mpi.lo fftwnd_mpi.lo fftw_mpi.lo
++	mv mpi/.libs/libfftw_mpi.so.$(lib_version) mpi/.libs/librfftw_mpi.so.$(lib_version) shared
 +
 +	#
 +	# Build the static library
 +	#
 +ifeq ($(ARCHITECTURE), i386)
- 	./configure --prefix=/usr --enable-i386-hacks
++	./configure --prefix=/usr --enable-mpi --enable-threads --enable-i386-hacks
 +else
- 	./configure --prefix=/usr
++	./configure --prefix=/usr --enable-mpi --enable-threads
 +endif
- 	$(MAKE) clean ; $(MAKE) ; mv fftw/.libs/libfftw.a rfftw/.libs/librfftw.a static
++	$(MAKE) clean ; $(MAKE)
++	mv fftw/.libs/libfftw.a rfftw/.libs/librfftw.a threads/.libs/lib*.a mpi/.libs/lib*.a static
 +
 +	cd doc ; $(MAKE) html
 +	touch build
 +
 +clean:
 +	$(checkdir)
 +	-rm -rf  fftw/*.o  fftw/*.lo  fftw/.libs
 +	-rm -rf rfftw/*.o rfftw/*.lo rfftw/.libs
 +	-rm -rf tests/*.o tests/.libs tests/fftw_test tests/rfftw_test
 +	-rm -rf static shared
++	-rm -rf threads/*.o threads/*.lo threads/.libs threads/*fftw_threads_test
++	-rm -rf mpi/*.o mpi/*.lo mpi/.libs mpi/*fftw_mpi_test mpi/test_sched mpi/test_transpose_mpi
 +	-rm -f build
 +	-rm -f `find . -name "*~"`
 +	-rm -rf debian/tmp `find debian/* -type d ! -name CVS` debian/files* core
 +	-rm -f debian/*substvars
 +
 +binary-indep: checkroot build
 +	$(checkdir)
 +# There are no architecture-independent files to be uploaded
 +# generated by this package.  If there were any they would be
 +# made here.
 +
 +binary-arch: checkroot build
 +	$(checkdir)
 +	-rm -rf debian/tmp `find debian/* -type d`
 +	$(INSTALL_DIR) debian/tmp
- 	cd debian/tmp ; $(INSTALL_DIR) DEBIAN usr/lib usr/doc/fftw${version_major}/html
- 	$(INSTALL_DATA) README README.hacks TODO debian/tmp/usr/doc/fftw${version_major}
- 	$(INSTALL_DATA) debian/copyright debian/tmp/usr/doc/fftw${version_major}
- 	$(INSTALL_DATA) ChangeLog debian/tmp/usr/doc/fftw${version_major}/changelog
- 	$(INSTALL_DATA) NEWS debian/tmp/usr/doc/fftw${version_major}
- 	$(INSTALL_DATA) debian/changelog debian/tmp/usr/doc/fftw${version_major}/changelog.Debian
- 	gzip -9 debian/tmp/usr/doc/fftw${version_major}/changelog*
- 	$(INSTALL_DATA) debian/README.debian debian/tmp/usr/doc/fftw${version_major}
- 	$(INSTALL_DATA) doc/*.html doc/*.gif debian/tmp/usr/doc/fftw${version_major}/html
- 	$(INSTALL_DIR) debian/tmp/usr/doc/fftw${version_major}/FAQ
- 	$(INSTALL_DATA) FAQ/fftw-faq.html/* debian/tmp/usr/doc/fftw${version_major}/FAQ
++	cd debian/tmp ; $(INSTALL_DIR) DEBIAN usr/lib usr/share/doc/fftw${version_major}
++	$(INSTALL_DATA) debian/copyright debian/tmp/usr/share/doc/fftw${version_major}
++	$(INSTALL_DATA) ChangeLog debian/tmp/usr/share/doc/fftw${version_major}/changelog
++	$(INSTALL_DATA) debian/changelog debian/tmp/usr/share/doc/fftw${version_major}/changelog.Debian
++	gzip -9 debian/tmp/usr/share/doc/fftw${version_major}/changelog*
++	$(INSTALL_DATA) debian/README.debian debian/tmp/usr/share/doc/fftw${version_major}
 +
 +	$(INSTALL_DATA) debian/shlibs debian/tmp/DEBIAN
- 	$(INSTALL_BIN) debian/postinst debian/tmp/DEBIAN
- 	strip --strip-unneeded shared/libfftw.so.$(version) shared/librfftw.so.$(version)
- 	$(INSTALL_LIB) shared/libfftw.so.$(version) debian/tmp/usr/lib
- 	$(INSTALL_LIB) shared/librfftw.so.$(version) debian/tmp/usr/lib
- 	ln -s libfftw.so.$(version) debian/tmp/usr/lib/libfftw.so.$(version_major)
- 	ln -s librfftw.so.$(version) debian/tmp/usr/lib/librfftw.so.$(version_major)
- 	$(INSTALL_DIR) debian/tmp/usr/doc/fftw${version_major}/tests
- 	$(INSTALL_DATA) tests/*.c tests/README debian/tmp/usr/doc/fftw${version_major}/tests
- 	$(INSTALL_DATA) tests/Makefile.package debian/tmp/usr/doc/fftw${version_major}/tests/Makefile
- 	$(INSTALL_DATA) fftw/fftw-int.h tests/test_main.h debian/tmp/usr/doc/fftw${version_major}/tests
- 	gzip -9 debian/tmp/usr/doc/fftw${version_major}/tests/*
- 
- 	dpkg-shlibdeps shared/$(lib).so.$(version)
++	$(INSTALL_BIN) debian/postinst debian/prerm debian/tmp/DEBIAN
++	strip --strip-unneeded shared/lib*fftw*.so.$(lib_version)
++	$(INSTALL_LIB) shared/lib*.so.$(lib_version) debian/tmp/usr/lib
++	ln -s libfftw.so.$(lib_version) debian/tmp/usr/lib/libfftw.so.$(version_major)
++	ln -s librfftw.so.$(lib_version) debian/tmp/usr/lib/librfftw.so.$(version_major)
++
++	ln -s libfftw_threads.so.$(lib_version) debian/tmp/usr/lib/libfftw_threads.so.$(version_major)
++	ln -s librfftw_threads.so.$(lib_version) debian/tmp/usr/lib/librfftw_threads.so.$(version_major)
++	ln -s libfftw_mpi.so.$(lib_version) debian/tmp/usr/lib/libfftw_mpi.so.$(version_major)
++	ln -s librfftw_mpi.so.$(lib_version) debian/tmp/usr/lib/librfftw_mpi.so.$(version_major)
++
++	dpkg-shlibdeps shared/$(lib).so.$(lib_version)
 +	dpkg-gencontrol -isp -pfftw${version_major} -Pdebian/tmp
 +	dpkg --build debian/tmp ..
 +#
 +	-rm -rf debian/tmp-dev
 +	$(INSTALL_DIR) debian/tmp-dev
- 	( cd debian/tmp-dev && $(INSTALL_DIR) DEBIAN usr/lib usr/doc usr/include )
- 	ln -s fftw${version_major} debian/tmp-dev/usr/doc/fftw-dev
- 	strip --strip-debug static/libfftw.a static/librfftw.a
- 	$(INSTALL_LIB) static/libfftw.a static/librfftw.a debian/tmp-dev/usr/lib/
++	( cd debian/tmp-dev && $(INSTALL_DIR) DEBIAN usr/lib usr/share/doc/fftw-dev usr/include usr/share/info )
++	$(INSTALL_DATA) README README.hacks TODO NEWS debian/tmp-dev/usr/share/doc/fftw-dev
++	$(INSTALL_DATA) debian/copyright debian/tmp-dev/usr/share/doc/fftw-dev
++	$(INSTALL_DATA) debian/changelog debian/tmp-dev/usr/share/doc/fftw-dev/changelog.Debian
++	$(INSTALL_DATA) ChangeLog debian/tmp-dev/usr/share/doc/fftw-dev/changelog
++	gzip -9 debian/tmp-dev/usr/share/doc/fftw-dev/changelog*
++
++	$(INSTALL_BIN) debian/fftw-dev.postinst debian/tmp-dev/DEBIAN/postinst
++	$(INSTALL_BIN) debian/fftw-dev.prerm debian/tmp-dev/DEBIAN/prerm
++
++	$(INSTALL_DIR) debian/tmp-dev/usr/share/doc/fftw-dev/tests/tests
++	$(INSTALL_DATA) tests/README debian/tmp-dev/usr/share/doc/fftw-dev/tests/tests
++	$(INSTALL_DATA) tests/*.c tests/README debian/tmp-dev/usr/share/doc/fftw-dev/tests/tests
++	$(INSTALL_DATA) debian/Makefile.tests debian/tmp-dev/usr/share/doc/fftw-dev/tests/tests/Makefile
++	$(INSTALL_DATA) fftw/fftw-int.h tests/test_main.h debian/tmp-dev/usr/share/doc/fftw-dev/tests/tests
++	gzip -9 debian/tmp-dev/usr/share/doc/fftw-dev/tests/tests/*
++
++	$(INSTALL_DIR) debian/tmp-dev/usr/share/doc/fftw-dev/tests/threads
++	$(INSTALL_DATA) debian/Makefile.threads debian/tmp-dev/usr/share/doc/fftw-dev/tests/threads/Makefile
++	$(INSTALL_DATA) threads/*fftw_threads_test.c debian/tmp-dev/usr/share/doc/fftw-dev/tests/threads
++	$(INSTALL_DATA) threads/fftw_threads-int.h debian/tmp-dev/usr/share/doc/fftw-dev/tests/threads
++	gzip -9 debian/tmp-dev/usr/share/doc/fftw-dev/tests/threads/*
++
++	$(INSTALL_DIR) debian/tmp-dev/usr/share/doc/fftw-dev/tests/mpi
++	$(INSTALL_DATA) debian/Makefile.mpi debian/tmp-dev/usr/share/doc/fftw-dev/tests/mpi/Makefile
++	$(INSTALL_DATA) mpi/*test*.c debian/tmp-dev/usr/share/doc/fftw-dev/tests/mpi/
++	$(INSTALL_DATA) mpi/sched.h mpi/TOMS_transpose.h debian/tmp-dev/usr/share/doc/fftw-dev/tests/mpi/
++	gzip -9 debian/tmp-dev/usr/share/doc/fftw-dev/tests/mpi/*
++
++	$(INSTALL_DIR) debian/tmp-dev/usr/share/doc/fftw-dev/FAQ
++	$(INSTALL_DATA) FAQ/fftw-faq.html/* debian/tmp-dev/usr/share/doc/fftw-dev/FAQ
++	$(INSTALL_DIR) debian/tmp-dev/usr/share/doc/fftw-dev/html
++	$(INSTALL_DATA) doc/*.html doc/*.gif debian/tmp-dev/usr/share/doc/fftw-dev/html
++	$(INSTALL_DATA) doc/fftw.info* debian/tmp-dev/usr/share/info
++	gzip -9 debian/tmp-dev/usr/share/info/*
++
++	strip --strip-debug static/lib*fftw*.a
++	$(INSTALL_LIB) static/lib*fftw*.a debian/tmp-dev/usr/lib/
 +	ln -s libfftw.so.$(version_major) debian/tmp-dev/usr/lib/libfftw.so
 +	ln -s librfftw.so.$(version_major) debian/tmp-dev/usr/lib/librfftw.so
- 	$(INSTALL_DATA) fftw/fftw.h rfftw/rfftw.h debian/tmp-dev/usr/include
++	ln -s libfftw_threads.so.$(version_major) debian/tmp-dev/usr/lib/libfftw_threads.so
++	ln -s librfftw_threads.so.$(version_major) debian/tmp-dev/usr/lib/librfftw_threads.so
++	$(INSTALL_DATA) threads/*fftw_threads.h fftw/fftw.h rfftw/rfftw.h debian/tmp-dev/usr/include
++	$(INSTALL_DATA) mpi/fftw_mpi.h mpi/rfftw_mpi.h debian/tmp-dev/usr/include
 +
 +	dpkg-gencontrol -isp -p${package}-dev -Pdebian/tmp-dev
 +	dpkg --build debian/tmp-dev ..
 +
 +define checkdir
 +	test -f debian/rules
 +endef
 +
 +binary: binary-indep binary-arch
 +
 +checkroot:
 +	$(checkdir)
 +	test root = "`whoami`"
 +
 +.PHONY: binary binary-arch binary-indep clean checkroot
diff --cc debian/shlibs
index 898dd6a,0000000..9421ef5
mode 100644,000000..100644
--- a/debian/shlibs
+++ b/debian/shlibs
@@@ -1,2 -1,0 +1,6 @@@
 +libfftw	2	fftw2
 +librfftw	2	fftw2
++libfftw_mpi	2	fftw2
++librfftw_mpi	2	fftw2
++libfftw_threads	2	fftw2
++librfftw_threads	2	fftw2
diff --cc doc/Makefile
index fe29c23,0000000..8fd6d95
mode 100644,000000..100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@@ -1,328 -1,0 +1,368 @@@
 +# Generated automatically from Makefile.in by configure.
- # Makefile.in generated automatically by automake 1.3 from Makefile.am
++# Makefile.in generated automatically by automake 1.4 from Makefile.am
 +
- # Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 +# This Makefile.in is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
 +# with or without modifications, as long as this notice is preserved.
 +
 +# This program is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
 +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 +# PARTICULAR PURPOSE.
 +
 +
 +SHELL = /bin/sh
 +
 +srcdir = .
 +top_srcdir = ..
 +prefix = /usr
 +exec_prefix = ${prefix}
 +
 +bindir = ${exec_prefix}/bin
 +sbindir = ${exec_prefix}/sbin
 +libexecdir = ${exec_prefix}/libexec
 +datadir = ${prefix}/share
 +sysconfdir = ${prefix}/etc
 +sharedstatedir = ${prefix}/com
 +localstatedir = ${prefix}/var
 +libdir = ${exec_prefix}/lib
 +infodir = ${prefix}/info
 +mandir = ${prefix}/man
 +includedir = ${prefix}/include
 +oldincludedir = /usr/include
 +
- DISTDIR =
++DESTDIR =
 +
 +pkgdatadir = $(datadir)/fftw
 +pkglibdir = $(libdir)/fftw
 +pkgincludedir = $(includedir)/fftw
 +
 +top_builddir = ..
 +
 +ACLOCAL = aclocal
 +AUTOCONF = autoconf
 +AUTOMAKE = automake
 +AUTOHEADER = autoheader
 +
 +INSTALL = /usr/bin/install -c
- INSTALL_PROGRAM = ${INSTALL}
++INSTALL_PROGRAM = ${INSTALL} $(AM_INSTALL_PROGRAM_FLAGS)
 +INSTALL_DATA = ${INSTALL} -m 644
 +INSTALL_SCRIPT = ${INSTALL_PROGRAM}
 +transform = s,x,x,
 +
 +NORMAL_INSTALL = :
 +PRE_INSTALL = :
 +POST_INSTALL = :
 +NORMAL_UNINSTALL = :
 +PRE_UNINSTALL = :
 +POST_UNINSTALL = :
 +host_alias = i586-pc-linux-gnu
 +host_triplet = i586-pc-linux-gnu
++AS = @AS@
 +CC = cc
++CCthreads = cc
++DLLTOOL = @DLLTOOL@
++F77 = f77
++FFTW_MPI_INCLUDELIST = fftw_mpi.h rfftw_mpi.h
++FFTW_MPI_LIBLIST = libfftw_mpi.la librfftw_mpi.la
++FFTW_MPI_PROGLIST = test_sched test_transpose_mpi fftw_mpi_test rfftw_mpi_test
++FFTW_PREFIX = 
++FFTW_THREADS_INCLUDELIST = fftw_threads.h rfftw_threads.h
++FFTW_THREADS_LIBLIST = libfftw_threads.la librfftw_threads.la
++FFTW_THREADS_PROGLIST = fftw_threads_test rfftw_threads_test
++FLIBS =  -lg2c -lm -L/usr/lib/gcc-lib/i386-linux/2.95.2 -lm
 +LD = /usr/bin/ld
 +LIBTOOL = $(SHELL) $(top_builddir)/libtool
 +LN_S = ln -s
 +MAKEINFO = makeinfo
++MPICC = mpicc
++MPILIBS =  
 +NM = /usr/bin/nm -B
++OBJDUMP = @OBJDUMP@
 +PACKAGE = fftw
 +RANLIB = ranlib
- SHARED_VERSION_INFO = 2:1:0
- VERSION = 2.0.1
++SHARED_VERSION = 2.0.5
++SHARED_VERSION_INFO = 2:5:0
++THREADLIBS = -lpthread
++VERSION = 2.1.3
 +
 +info_TEXINFOS = fftw.texi
 +
 +fftw_TEXINFOS = fftw.texi version.texi
 +
- HTML_FILES = equation-1.gif fftw_1.html fftw_4.html fftw_7.html \
- 	fftw_foot.html equation-2.gif fftw_2.html fftw_5.html fftw_8.html \
- 	fftw_toc.html equation-3.gif fftw_3.html fftw_6.html fftw_9.html \
-         fftw_10.html equation-4.gif
++HTML_FILES = equation-1.gif fftw_1.html fftw_4.html fftw_7.html 	fftw_foot.html equation-2.gif fftw_2.html fftw_5.html fftw_8.html 	fftw_toc.html equation-3.gif fftw_3.html fftw_6.html fftw_9.html         fftw_10.html equation-4.gif 
 +
- EXTRA_DIST = fftw.ps $(HTML_FILES) texi2html
++
++EXTRA_DIST = fftw.ps $(HTML_FILES) texi2html rfftwnd.fig rfftwnd.gif
 +PERL = perl
++DVIPS = dvips -Z
 +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 +CONFIG_HEADER = ../fftw/config.h ../fftw/fftw.h
 +CONFIG_CLEAN_FILES = 
 +TEXI2DVI = texi2dvi
- TEXINFO_TEX = $(srcdir)/texinfo.tex
 +INFO_DEPS = fftw.info
 +DVIS = fftw.dvi
 +TEXINFOS = fftw.texi
 +DIST_COMMON =  $(fftw_TEXINFOS) Makefile.am Makefile.in mdate-sh \
- stamp-vti version.texi
++stamp-vti texinfo.tex version.texi
 +
 +
 +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 +
- TAR = tar
- GZIP = --best
- all: Makefile $(INFO_DEPS)
- 
++TAR = gtar
++GZIP_ENV = --best
++all: all-redirect
 +.SUFFIXES:
 +.SUFFIXES: .dvi .info .ps .texi .texinfo .txi
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 +	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps doc/Makefile
 +
 +Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 +	cd $(top_builddir) \
 +	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 +
 +
- version.texi: stamp-vti
- 	cp $(srcdir)/stamp-vti $(srcdir)/version.texi
++$(srcdir)/version.texi: stamp-vti
++	@:
 +
- stamp-vti: fftw.texi $(top_srcdir)/configure.in
- 	@echo "@set UPDATED `cd $(srcdir) \
- 	  && $(SHELL) ./mdate-sh fftw.texi`" > vti.tmp
++$(srcdir)/stamp-vti: fftw.texi $(top_srcdir)/configure.in
++	@echo "@set UPDATED `$(SHELL) $(srcdir)/mdate-sh $(srcdir)/fftw.texi`" > vti.tmp
 +	@echo "@set EDITION $(VERSION)" >> vti.tmp
 +	@echo "@set VERSION $(VERSION)" >> vti.tmp
- 	@cmp -s vti.tmp $(srcdir)/stamp-vti \
- 	  || (echo "Updating $(srcdir)/stamp-vti"; \
- 	      cp vti.tmp $(srcdir)/stamp-vti)
++	@cmp -s vti.tmp $(srcdir)/version.texi \
++	  || (echo "Updating $(srcdir)/version.texi"; \
++	      cp vti.tmp $(srcdir)/version.texi)
 +	- at rm -f vti.tmp
++	@cp $(srcdir)/version.texi $@
 +
 +mostlyclean-vti:
 +	-rm -f vti.tmp
 +
 +clean-vti:
 +
 +distclean-vti:
 +
 +maintainer-clean-vti:
- 	-rm -f stamp-vti version.texi
++	-rm -f $(srcdir)/stamp-vti $(srcdir)/version.texi
 +
 +fftw.info: fftw.texi version.texi $(fftw_TEXINFOS)
 +fftw.dvi: fftw.texi version.texi $(fftw_TEXINFOS)
 +
 +
- DVIPS = dvips
- 
 +.texi.info:
 +	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
 +	cd $(srcdir) \
 +	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
 +
 +.texi.dvi:
- 	TEXINPUTS=$(srcdir):$$TEXINPUTS \
++	TEXINPUTS=.:$$TEXINPUTS \
 +	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
 +
 +.texi:
 +	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
 +	cd $(srcdir) \
 +	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
 +
 +.texinfo.info:
 +	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
 +	cd $(srcdir) \
 +	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
 +
 +.texinfo:
 +	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
 +	cd $(srcdir) \
 +	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
 +
 +.texinfo.dvi:
- 	TEXINPUTS=$(srcdir):$$TEXINPUTS \
++	TEXINPUTS=.:$$TEXINPUTS \
 +	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
 +
 +.txi.info:
 +	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
 +	cd $(srcdir) \
 +	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
 +
 +.txi.dvi:
- 	TEXINPUTS=$(srcdir):$$TEXINPUTS \
++	TEXINPUTS=.:$$TEXINPUTS \
 +	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
 +
 +.txi:
 +	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
 +	cd $(srcdir) \
 +	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
 +.dvi.ps:
 +	$(DVIPS) $< -o $@
 +
 +install-info-am: $(INFO_DEPS)
 +	@$(NORMAL_INSTALL)
 +	$(mkinstalldirs) $(DESTDIR)$(infodir)
- 	@for file in $(INFO_DEPS); do \
++	@list='$(INFO_DEPS)'; \
++	for file in $$list; do \
 +	  d=$(srcdir); \
 +	  for ifile in `cd $$d && echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \
 +	    if test -f $$d/$$ifile; then \
 +	      echo " $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile"; \
 +	      $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile; \
 +	    else : ; fi; \
 +	  done; \
 +	done
 +	@$(POST_INSTALL)
 +	@if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
- 	  for file in $(INFO_DEPS); do \
++	  list='$(INFO_DEPS)'; \
++	  for file in $$list; do \
 +	    echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file";\
 +	    install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file || :;\
 +	  done; \
 +	else : ; fi
 +
 +uninstall-info:
 +	$(PRE_UNINSTALL)
 +	@if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
 +	  ii=yes; \
 +	else ii=; fi; \
- 	for file in $(INFO_DEPS); do \
++	list='$(INFO_DEPS)'; \
++	for file in $$list; do \
 +	  test -z "$ii" \
 +	    || install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file; \
 +	done
 +	@$(NORMAL_UNINSTALL)
- 	for file in $(INFO_DEPS); do \
++	list='$(INFO_DEPS)'; \
++	for file in $$list; do \
 +	  (cd $(DESTDIR)$(infodir) && rm -f $$file $$file-[0-9] $$file-[0-9][0-9]); \
 +	done
 +
 +dist-info: $(INFO_DEPS)
- 	for base in $(INFO_DEPS); do \
++	list='$(INFO_DEPS)'; \
++	for base in $$list; do \
 +	  d=$(srcdir); \
 +	  for file in `cd $$d && eval echo $$base*`; do \
 +	    test -f $(distdir)/$$file \
 +	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
 +	    || cp -p $$d/$$file $(distdir)/$$file; \
 +	  done; \
 +	done
 +
 +mostlyclean-aminfo:
 +	-rm -f fftw.aux fftw.cp fftw.cps fftw.dvi fftw.fn fftw.fns fftw.ky \
 +	  fftw.kys fftw.ps fftw.log fftw.pg fftw.toc fftw.tp fftw.tps \
 +	  fftw.vr fftw.vrs fftw.op fftw.tr fftw.cv fftw.cn
 +
 +clean-aminfo:
 +
 +distclean-aminfo:
 +
 +maintainer-clean-aminfo:
- 	for i in $(INFO_DEPS); do \
++	cd $(srcdir) && for i in $(INFO_DEPS); do \
 +	  rm -f $$i; \
 +	  if test "`echo $$i-[0-9]*`" != "$$i-[0-9]*"; then \
 +	    rm -f $$i-[0-9]*; \
 +	  fi; \
 +	done
 +tags: TAGS
 +TAGS:
 +
 +
 +distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 +
 +subdir = doc
 +
 +distdir: $(DISTFILES)
 +	@for file in $(DISTFILES); do \
 +	  d=$(srcdir); \
- 	  test -f $(distdir)/$$file \
- 	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
- 	  || cp -p $$d/$$file $(distdir)/$$file; \
++	  if test -d $$d/$$file; then \
++	    cp -pr $$/$$file $(distdir)/$$file; \
++	  else \
++	    test -f $(distdir)/$$file \
++	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
++	    || cp -p $$d/$$file $(distdir)/$$file || :; \
++	  fi; \
 +	done
- 	$(MAKE) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-info
- info: $(INFO_DEPS)
- dvi: $(DVIS)
- check: all
- 	$(MAKE)
- installcheck:
- install-exec: 
- 	@$(NORMAL_INSTALL)
- 
- install-data: install-info-am
- 	@$(NORMAL_INSTALL)
- 
- install: install-exec install-data all
- 	@:
- 
- uninstall: uninstall-info
- 
++	$(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-info
++info-am: $(INFO_DEPS)
++info: info-am
++dvi-am: $(DVIS)
++dvi: dvi-am
++check-am: all-am
++check: check-am
++installcheck-am:
++installcheck: installcheck-am
++install-exec-am:
++install-exec: install-exec-am
++
++install-data-am: install-info-am
++install-data: install-data-am
++
++install-am: all-am
++	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++install: install-am
++uninstall-am: uninstall-info
++uninstall: uninstall-am
++all-am: Makefile $(INFO_DEPS)
++all-redirect: all-am
 +install-strip:
- 	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
++	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
 +installdirs:
 +	$(mkinstalldirs)  $(DESTDIR)$(infodir)
 +
 +
 +mostlyclean-generic:
- 	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 +
 +clean-generic:
- 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 +
 +distclean-generic:
- 	-rm -f Makefile $(DISTCLEANFILES)
++	-rm -f Makefile $(CONFIG_CLEAN_FILES)
 +	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
- 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 +
 +maintainer-clean-generic:
- 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
- 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
- mostlyclean:  mostlyclean-vti mostlyclean-aminfo mostlyclean-generic
++mostlyclean-am:  mostlyclean-vti mostlyclean-aminfo mostlyclean-generic
++
++mostlyclean: mostlyclean-am
++
++clean-am:  clean-vti clean-aminfo clean-generic mostlyclean-am \
++		clean-local
 +
- clean:  clean-vti clean-aminfo clean-generic mostlyclean clean-local
++clean: clean-am
 +
- distclean:  distclean-vti distclean-aminfo distclean-generic clean
- 	-rm -f config.status
++distclean-am:  distclean-vti distclean-aminfo distclean-generic clean-am
 +	-rm -f libtool
 +
- maintainer-clean:  maintainer-clean-vti maintainer-clean-aminfo \
- 		maintainer-clean-generic distclean
++distclean: distclean-am
++
++maintainer-clean-am:  maintainer-clean-vti maintainer-clean-aminfo \
++		maintainer-clean-generic distclean-am
 +	@echo "This command is intended for maintainers to use;"
 +	@echo "it deletes files that may require special tools to rebuild."
 +
++maintainer-clean: maintainer-clean-am
++
 +.PHONY: mostlyclean-vti distclean-vti clean-vti maintainer-clean-vti \
 +install-info-am uninstall-info mostlyclean-aminfo distclean-aminfo \
- clean-aminfo maintainer-clean-aminfo tags distdir info dvi installcheck \
- install-exec install-data install uninstall all installdirs \
++clean-aminfo maintainer-clean-aminfo tags distdir info-am info dvi-am \
++dvi check check-am installcheck-am installcheck install-exec-am \
++install-exec install-data-am install-data install-am install \
++uninstall-am uninstall all-redirect all-am all installdirs \
 +mostlyclean-generic distclean-generic clean-generic \
 +maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 +
 +
- html:	$(fftw_TEXINFOS)
++html:	$(fftw_TEXINFOS) rfftwnd.gif
 +	$(PERL) texi2html -split_chapter -no_toc_href fftw.texi
 +
 +$(HTML_FILES): html
 +
++# fig2dev gif output sucks.
++# rfftwnd.gif: rfftwnd.fig
++# 	fig2dev -L gif rfftwnd.fig rfftwnd.gif
++
++fftw.ps: rfftwnd.eps
++
++rfftwnd.eps: rfftwnd.fig
++	fig2dev -L ps -m .7 rfftwnd.fig rfftwnd.eps
++
 +clean-local:
 +	rm -f *.html
 +
 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
diff --cc doc/fftw_1.html
index f9b1973,20cbcb4..1629276
--- a/doc/fftw_1.html
+++ b/doc/fftw_1.html
@@@ -2,7 -2,7 +2,7 @@@
  <HTML>
  <HEAD>
  <!-- This HTML file has been created by texi2html 1.52
-      from fftw.texi on 1 October 1998 -->
 -     from fftw.texi on 7 November 1999 -->
++     from fftw.texi on 9 November 1999 -->
  
  <TITLE>FFTW - Introduction</TITLE>
  </HEAD>
diff --cc doc/fftw_10.html
index 690a2a3,c064405..9dac21a
--- a/doc/fftw_10.html
+++ b/doc/fftw_10.html
@@@ -2,9 -2,9 +2,9 @@@
  <HTML>
  <HEAD>
  <!-- This HTML file has been created by texi2html 1.52
-      from fftw.texi on 1 October 1998 -->
 -     from fftw.texi on 7 November 1999 -->
++     from fftw.texi on 9 November 1999 -->
  
- <TITLE>FFTW - Index</TITLE>
+ <TITLE>FFTW - Library Index</TITLE>
  </HEAD>
  <BODY TEXT="#000000" BGCOLOR="#FFFFFF">
  Go to the <A HREF="fftw_1.html">first</A>, <A HREF="fftw_9.html">previous</A>, next, last section, <A HREF="fftw_toc.html">table of contents</A>.
diff --cc doc/fftw_2.html
index 948ec86,55e9553..bc83774
--- a/doc/fftw_2.html
+++ b/doc/fftw_2.html
@@@ -2,7 -2,7 +2,7 @@@
  <HTML>
  <HEAD>
  <!-- This HTML file has been created by texi2html 1.52
-      from fftw.texi on 1 October 1998 -->
 -     from fftw.texi on 7 November 1999 -->
++     from fftw.texi on 9 November 1999 -->
  
  <TITLE>FFTW - Tutorial</TITLE>
  </HEAD>
diff --cc doc/fftw_3.html
index b6fc4a3,bd20a5e..bc471bd
--- a/doc/fftw_3.html
+++ b/doc/fftw_3.html
@@@ -2,9 -2,9 +2,9 @@@
  <HTML>
  <HEAD>
  <!-- This HTML file has been created by texi2html 1.52
-      from fftw.texi on 1 October 1998 -->
 -     from fftw.texi on 7 November 1999 -->
++     from fftw.texi on 9 November 1999 -->
  
- <TITLE>FFTW - Words of Wisdom</TITLE>
+ <TITLE>FFTW - FFTW Reference</TITLE>
  </HEAD>
  <BODY TEXT="#000000" BGCOLOR="#FFFFFF">
  Go to the <A HREF="fftw_1.html">first</A>, <A HREF="fftw_2.html">previous</A>, <A HREF="fftw_4.html">next</A>, <A HREF="fftw_10.html">last</A> section, <A HREF="fftw_toc.html">table of contents</A>.
diff --cc doc/fftw_4.html
index 516df9a,6500068..c297524
--- a/doc/fftw_4.html
+++ b/doc/fftw_4.html
@@@ -2,9 -2,9 +2,9 @@@
  <HTML>
  <HEAD>
  <!-- This HTML file has been created by texi2html 1.52
-      from fftw.texi on 1 October 1998 -->
 -     from fftw.texi on 7 November 1999 -->
++     from fftw.texi on 9 November 1999 -->
  
- <TITLE>FFTW - Multi-dimensional Array Format</TITLE>
+ <TITLE>FFTW - Parallel FFTW</TITLE>
  </HEAD>
  <BODY TEXT="#000000" BGCOLOR="#FFFFFF">
  Go to the <A HREF="fftw_1.html">first</A>, <A HREF="fftw_3.html">previous</A>, <A HREF="fftw_5.html">next</A>, <A HREF="fftw_10.html">last</A> section, <A HREF="fftw_toc.html">table of contents</A>.
diff --cc doc/fftw_5.html
index f23569b,cdb541c..78a2774
--- a/doc/fftw_5.html
+++ b/doc/fftw_5.html
@@@ -2,9 -2,9 +2,9 @@@
  <HTML>
  <HEAD>
  <!-- This HTML file has been created by texi2html 1.52
-      from fftw.texi on 1 October 1998 -->
 -     from fftw.texi on 7 November 1999 -->
++     from fftw.texi on 9 November 1999 -->
  
- <TITLE>FFTW - Parallel Computing and FFTW</TITLE>
+ <TITLE>FFTW - Calling FFTW from Fortran</TITLE>
  </HEAD>
  <BODY TEXT="#000000" BGCOLOR="#FFFFFF">
  Go to the <A HREF="fftw_1.html">first</A>, <A HREF="fftw_4.html">previous</A>, <A HREF="fftw_6.html">next</A>, <A HREF="fftw_10.html">last</A> section, <A HREF="fftw_toc.html">table of contents</A>.
diff --cc doc/fftw_6.html
index f36f8b4,f934c0c..62ee1ab
--- a/doc/fftw_6.html
+++ b/doc/fftw_6.html
@@@ -2,9 -2,9 +2,9 @@@
  <HTML>
  <HEAD>
  <!-- This HTML file has been created by texi2html 1.52
-      from fftw.texi on 1 October 1998 -->
 -     from fftw.texi on 7 November 1999 -->
++     from fftw.texi on 9 November 1999 -->
  
- <TITLE>FFTW - FFTW Reference</TITLE>
+ <TITLE>FFTW - Installation and Customization</TITLE>
  </HEAD>
  <BODY TEXT="#000000" BGCOLOR="#FFFFFF">
  Go to the <A HREF="fftw_1.html">first</A>, <A HREF="fftw_5.html">previous</A>, <A HREF="fftw_7.html">next</A>, <A HREF="fftw_10.html">last</A> section, <A HREF="fftw_toc.html">table of contents</A>.
diff --cc doc/fftw_7.html
index 54e40fc,a9e0ee0..b9260fd
--- a/doc/fftw_7.html
+++ b/doc/fftw_7.html
@@@ -2,9 -2,9 +2,9 @@@
  <HTML>
  <HEAD>
  <!-- This HTML file has been created by texi2html 1.52
-      from fftw.texi on 1 October 1998 -->
 -     from fftw.texi on 7 November 1999 -->
++     from fftw.texi on 9 November 1999 -->
  
- <TITLE>FFTW - Installation and Customization</TITLE>
+ <TITLE>FFTW - Acknowledgments</TITLE>
  </HEAD>
  <BODY TEXT="#000000" BGCOLOR="#FFFFFF">
  Go to the <A HREF="fftw_1.html">first</A>, <A HREF="fftw_6.html">previous</A>, <A HREF="fftw_8.html">next</A>, <A HREF="fftw_10.html">last</A> section, <A HREF="fftw_toc.html">table of contents</A>.
diff --cc doc/fftw_8.html
index 42fa25b,09bc271..e57e9e8
--- a/doc/fftw_8.html
+++ b/doc/fftw_8.html
@@@ -2,9 -2,9 +2,9 @@@
  <HTML>
  <HEAD>
  <!-- This HTML file has been created by texi2html 1.52
-      from fftw.texi on 1 October 1998 -->
 -     from fftw.texi on 7 November 1999 -->
++     from fftw.texi on 9 November 1999 -->
  
- <TITLE>FFTW - Acknowledgments</TITLE>
+ <TITLE>FFTW - License and Copyright</TITLE>
  </HEAD>
  <BODY TEXT="#000000" BGCOLOR="#FFFFFF">
  Go to the <A HREF="fftw_1.html">first</A>, <A HREF="fftw_7.html">previous</A>, <A HREF="fftw_9.html">next</A>, <A HREF="fftw_10.html">last</A> section, <A HREF="fftw_toc.html">table of contents</A>.
diff --cc doc/fftw_9.html
index 47c3f83,ad9af19..e0ff29c
--- a/doc/fftw_9.html
+++ b/doc/fftw_9.html
@@@ -2,9 -2,9 +2,9 @@@
  <HTML>
  <HEAD>
  <!-- This HTML file has been created by texi2html 1.52
-      from fftw.texi on 1 October 1998 -->
 -     from fftw.texi on 7 November 1999 -->
++     from fftw.texi on 9 November 1999 -->
  
- <TITLE>FFTW - License and Copyright</TITLE>
+ <TITLE>FFTW - Concept Index</TITLE>
  </HEAD>
  <BODY TEXT="#000000" BGCOLOR="#FFFFFF">
  Go to the <A HREF="fftw_1.html">first</A>, <A HREF="fftw_8.html">previous</A>, <A HREF="fftw_10.html">next</A>, <A HREF="fftw_10.html">last</A> section, <A HREF="fftw_toc.html">table of contents</A>.
diff --cc doc/fftw_foot.html
index ed40669,58bd349..0db9e93
--- a/doc/fftw_foot.html
+++ b/doc/fftw_foot.html
@@@ -2,7 -2,7 +2,7 @@@
  <HTML>
  <HEAD>
  <!-- This HTML file has been created by texi2html 1.52
-      from fftw.texi on 1 October 1998 -->
 -     from fftw.texi on 7 November 1999 -->
++     from fftw.texi on 9 November 1999 -->
  
  <TITLE>FFTW - Footnotes</TITLE>
  </HEAD>
@@@ -38,7 -60,7 +60,7 @@@ seems to have its own magic incantatio
  the time--you'd think that people would have agreed upon some
  convention, e.g. "<CODE>-Omax</CODE>", by now.
  <P><HR><P>
- This document was generated on 1 October 1998 using the
 -This document was generated on 7 November 1999 using the
++This document was generated on 9 November 1999 using the
  <A HREF="http://wwwinfo.cern.ch/dis/texi2html/">texi2html</A>
  translator version 1.52. (properly hacked by athena at theory.lcs.mit.edu)</P>
  </BODY>
diff --cc doc/fftw_toc.html
index 6dd0240,db4c0d9..01f7fcb
--- a/doc/fftw_toc.html
+++ b/doc/fftw_toc.html
@@@ -2,7 -2,7 +2,7 @@@
  <HTML>
  <HEAD>
  <!-- This HTML file has been created by texi2html 1.52
-      from fftw.texi on 1 October 1998 -->
 -     from fftw.texi on 7 November 1999 -->
++     from fftw.texi on 9 November 1999 -->
  
  <TITLE>FFTW - Table of Contents</TITLE>
  </HEAD>
@@@ -19,81 -19,106 +19,106 @@@
  <LI><A NAME="TOC4" HREF="fftw_2.html#SEC4">Complex Multi-dimensional Transforms Tutorial</A>
  <LI><A NAME="TOC5" HREF="fftw_2.html#SEC5">Real One-dimensional Transforms Tutorial</A>
  <LI><A NAME="TOC6" HREF="fftw_2.html#SEC6">Real Multi-dimensional Transforms Tutorial</A>
- </UL>
- <LI><A NAME="TOC7" HREF="fftw_3.html#SEC7">Words of Wisdom</A>
+ <LI><A NAME="TOC7" HREF="fftw_2.html#SEC7">Multi-dimensional Array Format</A>
  <UL>
- <LI><A NAME="TOC8" HREF="fftw_3.html#SEC8">Caveats in Using Wisdom</A>
- <LI><A NAME="TOC9" HREF="fftw_3.html#SEC9">Importing and Exporting Wisdom</A>
+ <LI><A NAME="TOC8" HREF="fftw_2.html#SEC8">Row-major Format</A>
+ <LI><A NAME="TOC9" HREF="fftw_2.html#SEC9">Column-major Format</A>
+ <LI><A NAME="TOC10" HREF="fftw_2.html#SEC10">Static Arrays in C</A>
+ <LI><A NAME="TOC11" HREF="fftw_2.html#SEC11">Dynamic Arrays in C</A>
+ <LI><A NAME="TOC12" HREF="fftw_2.html#SEC12">Dynamic Arrays in C--The Wrong Way</A>
  </UL>
- <LI><A NAME="TOC10" HREF="fftw_4.html#SEC10">Multi-dimensional Array Format</A>
+ <LI><A NAME="TOC13" HREF="fftw_2.html#SEC13">Words of Wisdom</A>
  <UL>
- <LI><A NAME="TOC11" HREF="fftw_4.html#SEC11">Row-major Format</A>
- <LI><A NAME="TOC12" HREF="fftw_4.html#SEC12">Column-major Format</A>
- <LI><A NAME="TOC13" HREF="fftw_4.html#SEC13">Static Arrays in C</A>
- <LI><A NAME="TOC14" HREF="fftw_4.html#SEC14">Dynamic Arrays in C</A>
- <LI><A NAME="TOC15" HREF="fftw_4.html#SEC15">Dynamic Arrays in C--The Wrong Way</A>
+ <LI><A NAME="TOC14" HREF="fftw_2.html#SEC14">Caveats in Using Wisdom</A>
+ <LI><A NAME="TOC15" HREF="fftw_2.html#SEC15">Importing and Exporting Wisdom</A>
+ </UL>
  </UL>
- <LI><A NAME="TOC16" HREF="fftw_5.html#SEC16">Parallel Computing and FFTW</A>
+ <LI><A NAME="TOC16" HREF="fftw_3.html#SEC16">FFTW Reference</A>
  <UL>
- <LI><A NAME="TOC17" HREF="fftw_5.html#SEC17">Parallel Transform Routines</A>
- <LI><A NAME="TOC18" HREF="fftw_5.html#SEC18">Thread-safety</A>
+ <LI><A NAME="TOC17" HREF="fftw_3.html#SEC17">Data Types</A>
+ <LI><A NAME="TOC18" HREF="fftw_3.html#SEC18">One-dimensional Transforms Reference</A>
+ <UL>
+ <LI><A NAME="TOC19" HREF="fftw_3.html#SEC19">Plan Creation for One-dimensional Transforms</A>
+ <LI><A NAME="TOC20" HREF="fftw_3.html#SEC20">Discussion on Specific Plans</A>
+ <LI><A NAME="TOC21" HREF="fftw_3.html#SEC21">Computing the One-dimensional Transform</A>
+ <LI><A NAME="TOC22" HREF="fftw_3.html#SEC22">Destroying a One-dimensional Plan</A>
+ <LI><A NAME="TOC23" HREF="fftw_3.html#SEC23">What FFTW Really Computes</A>
  </UL>
- <LI><A NAME="TOC19" HREF="fftw_6.html#SEC19">FFTW Reference</A>
+ <LI><A NAME="TOC24" HREF="fftw_3.html#SEC24">Multi-dimensional Transforms Reference</A>
  <UL>
- <LI><A NAME="TOC20" HREF="fftw_6.html#SEC20">Data Types</A>
- <LI><A NAME="TOC21" HREF="fftw_6.html#SEC21">One-dimensional Transforms Reference</A>
+ <LI><A NAME="TOC25" HREF="fftw_3.html#SEC25">Plan Creation for Multi-dimensional Transforms</A>
+ <LI><A NAME="TOC26" HREF="fftw_3.html#SEC26">Computing the Multi-dimensional Transform</A>
+ <LI><A NAME="TOC27" HREF="fftw_3.html#SEC27">Destroying a Multi-dimensional Plan</A>
+ <LI><A NAME="TOC28" HREF="fftw_3.html#SEC28">What FFTWND Really Computes</A>
+ </UL>
+ <LI><A NAME="TOC29" HREF="fftw_3.html#SEC29">Real One-dimensional Transforms Reference</A>
  <UL>
- <LI><A NAME="TOC22" HREF="fftw_6.html#SEC22">Plan Creation for One-dimensional Transforms</A>
- <LI><A NAME="TOC23" HREF="fftw_6.html#SEC23">Discussion on Specific Plans</A>
- <LI><A NAME="TOC24" HREF="fftw_6.html#SEC24">Computing the One-dimensional Transform</A>
- <LI><A NAME="TOC25" HREF="fftw_6.html#SEC25">Destroying a One-dimensional Plan</A>
- <LI><A NAME="TOC26" HREF="fftw_6.html#SEC26">What FFTW Really Computes</A>
+ <LI><A NAME="TOC30" HREF="fftw_3.html#SEC30">Plan Creation for Real One-dimensional Transforms</A>
+ <LI><A NAME="TOC31" HREF="fftw_3.html#SEC31">Computing the Real One-dimensional Transform</A>
+ <LI><A NAME="TOC32" HREF="fftw_3.html#SEC32">Destroying a Real One-dimensional Plan</A>
+ <LI><A NAME="TOC33" HREF="fftw_3.html#SEC33">What RFFTW Really Computes</A>
  </UL>
- <LI><A NAME="TOC27" HREF="fftw_6.html#SEC27">Multi-dimensional Transforms Reference</A>
+ <LI><A NAME="TOC34" HREF="fftw_3.html#SEC34">Real Multi-dimensional Transforms Reference</A>
  <UL>
- <LI><A NAME="TOC28" HREF="fftw_6.html#SEC28">Plan Creation for Multi-dimensional Transforms</A>
- <LI><A NAME="TOC29" HREF="fftw_6.html#SEC29">Computing the Multi-dimensional Transform</A>
- <LI><A NAME="TOC30" HREF="fftw_6.html#SEC30">Destroying a Multi-dimensional Plan</A>
- <LI><A NAME="TOC31" HREF="fftw_6.html#SEC31">What FFTWND Really Computes</A>
+ <LI><A NAME="TOC35" HREF="fftw_3.html#SEC35">Plan Creation for Real Multi-dimensional Transforms</A>
+ <LI><A NAME="TOC36" HREF="fftw_3.html#SEC36">Computing the Real Multi-dimensional Transform</A>
+ <LI><A NAME="TOC37" HREF="fftw_3.html#SEC37">Array Dimensions for Real Multi-dimensional Transforms</A>
+ <LI><A NAME="TOC38" HREF="fftw_3.html#SEC38">Strides in In-place RFFTWND</A>
+ <LI><A NAME="TOC39" HREF="fftw_3.html#SEC39">Destroying a Multi-dimensional Plan</A>
+ <LI><A NAME="TOC40" HREF="fftw_3.html#SEC40">What RFFTWND Really Computes</A>
  </UL>
- <LI><A NAME="TOC32" HREF="fftw_6.html#SEC32">Real One-dimensional Transforms Reference</A>
+ <LI><A NAME="TOC41" HREF="fftw_3.html#SEC41">Wisdom Reference</A>
  <UL>
- <LI><A NAME="TOC33" HREF="fftw_6.html#SEC33">Plan Creation for Real One-dimensional Transforms</A>
- <LI><A NAME="TOC34" HREF="fftw_6.html#SEC34">Computing the Real One-dimensional Transform</A>
- <LI><A NAME="TOC35" HREF="fftw_6.html#SEC35">Destroying a Real One-dimensional Plan</A>
- <LI><A NAME="TOC36" HREF="fftw_6.html#SEC36">What RFFTW Really Computes</A>
+ <LI><A NAME="TOC42" HREF="fftw_3.html#SEC42">Exporting Wisdom</A>
+ <LI><A NAME="TOC43" HREF="fftw_3.html#SEC43">Importing Wisdom</A>
+ <LI><A NAME="TOC44" HREF="fftw_3.html#SEC44">Forgetting Wisdom</A>
  </UL>
- <LI><A NAME="TOC37" HREF="fftw_6.html#SEC37">Real Multi-dimensional Transforms Reference</A>
+ <LI><A NAME="TOC45" HREF="fftw_3.html#SEC45">Memory Allocator Reference</A>
+ <LI><A NAME="TOC46" HREF="fftw_3.html#SEC46">Thread safety</A>
+ </UL>
+ <LI><A NAME="TOC47" HREF="fftw_4.html#SEC47">Parallel FFTW</A>
+ <UL>
+ <LI><A NAME="TOC48" HREF="fftw_4.html#SEC48">Multi-threaded FFTW</A>
  <UL>
- <LI><A NAME="TOC38" HREF="fftw_6.html#SEC38">Plan Creation for Real Multi-dimensional Transforms</A>
- <LI><A NAME="TOC39" HREF="fftw_6.html#SEC39">Computing the Real Multi-dimensional Transform</A>
- <LI><A NAME="TOC40" HREF="fftw_6.html#SEC40">Array Dimensions for Real Multi-dimensional Transforms</A>
- <LI><A NAME="TOC41" HREF="fftw_6.html#SEC41">Strides in In-place RFFTWND</A>
- <LI><A NAME="TOC42" HREF="fftw_6.html#SEC42">Destroying a Multi-dimensional Plan</A>
- <LI><A NAME="TOC43" HREF="fftw_6.html#SEC43">What RFFTWND Really Computes</A>
+ <LI><A NAME="TOC49" HREF="fftw_4.html#SEC49">Installation and Supported Hardware/Software</A>
+ <LI><A NAME="TOC50" HREF="fftw_4.html#SEC50">Usage of Multi-threaded FFTW</A>
+ <LI><A NAME="TOC51" HREF="fftw_4.html#SEC51">How Many Threads to Use?</A>
+ <LI><A NAME="TOC52" HREF="fftw_4.html#SEC52">Using Multi-threaded FFTW in a Multi-threaded Program</A>
+ <LI><A NAME="TOC53" HREF="fftw_4.html#SEC53">Tips for Optimal Threading</A>
+ <LI><A NAME="TOC54" HREF="fftw_4.html#SEC54">Parallelization deficiencies in one-dimensional transforms</A>
  </UL>
- <LI><A NAME="TOC44" HREF="fftw_6.html#SEC44">Wisdom Reference</A>
+ <LI><A NAME="TOC55" HREF="fftw_4.html#SEC55">MPI FFTW</A>
  <UL>
- <LI><A NAME="TOC45" HREF="fftw_6.html#SEC45">Exporting Wisdom</A>
- <LI><A NAME="TOC46" HREF="fftw_6.html#SEC46">Importing Wisdom</A>
- <LI><A NAME="TOC47" HREF="fftw_6.html#SEC47">Forgetting Wisdom</A>
+ <LI><A NAME="TOC56" HREF="fftw_4.html#SEC56">MPI FFTW Installation</A>
+ <LI><A NAME="TOC57" HREF="fftw_4.html#SEC57">Usage of MPI FFTW for Complex Multi-dimensional Transforms</A>
+ <LI><A NAME="TOC58" HREF="fftw_4.html#SEC58">MPI Data Layout</A>
+ <LI><A NAME="TOC59" HREF="fftw_4.html#SEC59">Usage of MPI FFTW for Real Multi-dimensional Transforms</A>
+ <LI><A NAME="TOC60" HREF="fftw_4.html#SEC60">Usage of MPI FFTW for Complex One-dimensional Transforms</A>
+ <LI><A NAME="TOC61" HREF="fftw_4.html#SEC61">MPI Tips</A>
  </UL>
- <LI><A NAME="TOC48" HREF="fftw_6.html#SEC48">Memory Allocator Reference</A>
  </UL>
- <LI><A NAME="TOC49" HREF="fftw_7.html#SEC49">Installation and Customization</A>
+ <LI><A NAME="TOC62" HREF="fftw_5.html#SEC62">Calling FFTW from Fortran</A>
+ <UL>
+ <LI><A NAME="TOC63" HREF="fftw_5.html#SEC63">Wrapper Routines</A>
+ <LI><A NAME="TOC64" HREF="fftw_5.html#SEC64">FFTW Constants in Fortran</A>
+ <LI><A NAME="TOC65" HREF="fftw_5.html#SEC65">Fortran Examples</A>
+ </UL>
+ <LI><A NAME="TOC66" HREF="fftw_6.html#SEC66">Installation and Customization</A>
  <UL>
- <LI><A NAME="TOC50" HREF="fftw_7.html#SEC50">Installation on Unix</A>
- <LI><A NAME="TOC51" HREF="fftw_7.html#SEC51">Installation on non-Unix Systems</A>
- <LI><A NAME="TOC52" HREF="fftw_7.html#SEC52"><CODE>gcc</CODE> and Pentium/PentiumPro hacks</A>
- <LI><A NAME="TOC53" HREF="fftw_7.html#SEC53">Customizing the timer</A>
- <LI><A NAME="TOC54" HREF="fftw_7.html#SEC54">Generating your own code</A>
+ <LI><A NAME="TOC67" HREF="fftw_6.html#SEC67">Installation on Unix</A>
+ <LI><A NAME="TOC68" HREF="fftw_6.html#SEC68">Installation on non-Unix Systems</A>
+ <LI><A NAME="TOC69" HREF="fftw_6.html#SEC69">Installing FFTW in both single and double precision</A>
+ <LI><A NAME="TOC70" HREF="fftw_6.html#SEC70"><CODE>gcc</CODE> and Pentium hacks</A>
+ <LI><A NAME="TOC71" HREF="fftw_6.html#SEC71">Customizing the timer</A>
+ <LI><A NAME="TOC72" HREF="fftw_6.html#SEC72">Generating your own code</A>
  </UL>
- <LI><A NAME="TOC55" HREF="fftw_8.html#SEC55">Acknowledgments</A>
- <LI><A NAME="TOC56" HREF="fftw_9.html#SEC56">License and Copyright</A>
- <LI><A NAME="TOC57" HREF="fftw_10.html#SEC57">Index</A>
+ <LI><A NAME="TOC73" HREF="fftw_7.html#SEC73">Acknowledgments</A>
+ <LI><A NAME="TOC74" HREF="fftw_8.html#SEC74">License and Copyright</A>
+ <LI><A NAME="TOC75" HREF="fftw_9.html#SEC75">Concept Index</A>
+ <LI><A NAME="TOC76" HREF="fftw_10.html#SEC76">Library Index</A>
  </UL>
  <P><HR><P>
- This document was generated on 1 October 1998 using the
 -This document was generated on 7 November 1999 using the
++This document was generated on 9 November 1999 using the
  <A HREF="http://wwwinfo.cern.ch/dis/texi2html/">texi2html</A>
  translator version 1.52. (properly hacked by athena at theory.lcs.mit.edu)</P>
  </BODY>
diff --cc fftw.spec
index 0000000,0000000..04cefff
new file mode 100644
--- /dev/null
+++ b/fftw.spec
@@@ -1,0 -1,0 +1,171 @@@
++# RPM spec file for FFTW.
++# This file is used to build Redhat Package Manager packages for the
++# FFTW library.  Such packages make it easy to install and uninstall
++# the library and related files from binaries or source.
++#
++# This spec file is for version 2.1.3 of FFTW; the appropriate
++# version numbers are automatically substituted in to fftw.spec.in
++# by the configure script.  However, fftw.spec.in may need to be
++# modified for future releases, if the list of installed files
++# or build commands change.
++#
++# The icon associated with this package can be downloaded from:
++#     http://www.fftw.org/fftw-logo-thumb.gif
++# and will need to be placed in /usr/src/redhat/SOURCES, along with
++# the fftw-2.1.3.tar.gz file, to build the RPM.  To build, use
++# the command: rpm --clean -ba fftw.spec
++#
++# Alternatively, you can just use 'make rpm' (as root).
++#
++Name: fftw
++Summary: fast fourier transform library
++Version: 2.1.3
++Release: 1
++Copyright: GPL
++Icon: fftw-logo-thumb.gif
++Group: Libraries
++Prefix: /usr/local
++BuildRoot: /tmp/%{name}-%{version}-buildroot
++Source: ftp://ftp.fftw.org/pub/fftw/fftw-2.1.3.tar.gz
++URL: http://www.fftw.org
++%description
++FFTW is a collection of fast C routines for computing the Discrete Fourier
++Transform in one or more dimensions.  It includes complex, real, and
++parallel transforms, and can handle arbitrary array sizes efficiently.
++This RPM package includes both the double- and single-precision FFTW
++uniprocessor and threads libraries.  (The single-precision files have
++an "s" prefix.)
++%package devel
++Summary: headers, libraries, & docs for FFTW fast fourier transform library
++Group: Development/Libraries
++Prefix: %{prefix}
++Requires: fftw = %{version}-%{release}
++%description devel
++This package contains the additional header files, documentation, and
++libraries you need to develop programs using the FFTW fast fourier
++transform library.
++%prep
++
++# We will be compiling two copies of FFTW, one for double precision and
++# one for single precision.  During the build process, these copies
++# will be stored in fftw-%{version}/double and fftw-%{version}/single
++
++# Unpack the tar archive, first (-c) creating a fftw-%{version}
++# directory and then unpacking in there.
++%setup -c
++
++# Now, rename the unpacked FFTW directory to "double":
++mv ${RPM_PACKAGE_NAME}-${RPM_PACKAGE_VERSION} double
++
++# Second, make a copy of this directory in "single":
++cp -r double single
++
++%build
++
++# Configure and build the double and single precision versions.
++# Notes:
++#  (1) We install into ${RPM_BUILD_ROOT}, which is set either
++#      by the BuildRoot option above or by --buildroot at build-time.
++#      This allows you to build the RPM without blowing away your existing
++#      FFTW installation, and even without being root.
++#  (2) The double-precision version is installed with the normal library
++#      names, while the single-precision version is installed with an "s"
++#      prefix.
++
++cd double
++%ifarch i386
++./configure --prefix="${RPM_BUILD_ROOT}%{prefix}" --enable-shared --enable-i386-hacks --enable-threads
++%else
++./configure --prefix="${RPM_BUILD_ROOT}%{prefix}" --enable-shared --enable-threads
++%endif
++make
++
++cd ../single
++./configure --prefix="${RPM_BUILD_ROOT}%{prefix}" --enable-shared --enable-type-prefix --enable-threads --enable-float
++make
++
++%install
++
++cd double
++make install
++
++cd ../single
++make install
++
++%clean
++
++rm -rf ${RPM_BUILD_ROOT}
++
++%post
++# Force ${RPM_INSTALL_PREFIX}/lib to be in /etc/ld.so.conf?
++# No...that would make it impossible to completely uninstall reliably.
++# Instead, warn the user fix a broken /etc/ld.so.conf manually:
++if test -z `grep ${RPM_INSTALL_PREFIX}/lib /etc/ld.so.conf`; then
++     echo "warning: ${RPM_INSTALL_PREFIX}/lib is not in /etc/ld.so.conf" 1>&2
++     echo "         You should add it and then run ldconfig." 1>&2
++fi
++
++# run ldconfig to update the runtime linker database with the new libraries
++# (make sure /sbin is in the $PATH)
++PATH="/sbin:$PATH" ldconfig
++
++%postun
++# after uninstall, run ldconfig to remove the libs from the linker database
++PATH="/sbin:$PATH" ldconfig
++
++%files
++/usr/local/lib/libfftw.so.2.0.5
++/usr/local/lib/libfftw_threads.so.2.0.5
++/usr/local/lib/librfftw.so.2.0.5
++/usr/local/lib/librfftw_threads.so.2.0.5
++/usr/local/lib/libsfftw.so.2.0.5
++/usr/local/lib/libsfftw_threads.so.2.0.5
++/usr/local/lib/libsrfftw.so.2.0.5
++/usr/local/lib/libsrfftw_threads.so.2.0.5
++/usr/local/lib/libfftw.so.2
++/usr/local/lib/libfftw_threads.so.2
++/usr/local/lib/librfftw.so.2
++/usr/local/lib/librfftw_threads.so.2
++/usr/local/lib/libsfftw.so.2
++/usr/local/lib/libsfftw_threads.so.2
++/usr/local/lib/libsrfftw.so.2
++/usr/local/lib/libsrfftw_threads.so.2
++%files devel
++/usr/local/include/fftw.h
++/usr/local/include/fftw_threads.h
++/usr/local/include/rfftw.h
++/usr/local/include/rfftw_threads.h
++/usr/local/include/sfftw.h
++/usr/local/include/sfftw_threads.h
++/usr/local/include/srfftw.h
++/usr/local/include/srfftw_threads.h
++/usr/local/info/fftw.info
++/usr/local/info/fftw.info-1
++/usr/local/info/fftw.info-2
++/usr/local/info/fftw.info-3
++/usr/local/info/fftw.info-4
++/usr/local/info/fftw.info-5
++/usr/local/lib/libfftw.a
++/usr/local/lib/libfftw.la
++/usr/local/lib/libfftw.so
++/usr/local/lib/libfftw_threads.a
++/usr/local/lib/libfftw_threads.la
++/usr/local/lib/libfftw_threads.so
++/usr/local/lib/librfftw.a
++/usr/local/lib/librfftw.la
++/usr/local/lib/librfftw.so
++/usr/local/lib/librfftw_threads.a
++/usr/local/lib/librfftw_threads.la
++/usr/local/lib/librfftw_threads.so
++/usr/local/lib/libsfftw.a
++/usr/local/lib/libsfftw.la
++/usr/local/lib/libsfftw.so
++/usr/local/lib/libsfftw_threads.a
++/usr/local/lib/libsfftw_threads.la
++/usr/local/lib/libsfftw_threads.so
++/usr/local/lib/libsrfftw.a
++/usr/local/lib/libsrfftw.la
++/usr/local/lib/libsrfftw.so
++/usr/local/lib/libsrfftw_threads.a
++/usr/local/lib/libsrfftw_threads.la
++/usr/local/lib/libsrfftw_threads.so
diff --cc fftw/Makefile
index 8512439,0000000..a010984
mode 100644,000000..100644
--- a/fftw/Makefile
+++ b/fftw/Makefile
@@@ -1,372 -1,0 +1,436 @@@
 +# Generated automatically from Makefile.in by configure.
- # Makefile.in generated automatically by automake 1.3 from Makefile.am
++# Makefile.in generated automatically by automake 1.4 from Makefile.am
 +
- # Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 +# This Makefile.in is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
 +# with or without modifications, as long as this notice is preserved.
 +
 +# This program is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
 +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 +# PARTICULAR PURPOSE.
 +
 +# This file was automatically generated
 +# DO NOT EDIT!
 +#
 +
 +
 +SHELL = /bin/sh
 +
 +srcdir = .
 +top_srcdir = ..
 +prefix = /usr
 +exec_prefix = ${prefix}
 +
 +bindir = ${exec_prefix}/bin
 +sbindir = ${exec_prefix}/sbin
 +libexecdir = ${exec_prefix}/libexec
 +datadir = ${prefix}/share
 +sysconfdir = ${prefix}/etc
 +sharedstatedir = ${prefix}/com
 +localstatedir = ${prefix}/var
 +libdir = ${exec_prefix}/lib
 +infodir = ${prefix}/info
 +mandir = ${prefix}/man
 +includedir = ${prefix}/include
 +oldincludedir = /usr/include
 +
- DISTDIR =
++DESTDIR =
 +
 +pkgdatadir = $(datadir)/fftw
 +pkglibdir = $(libdir)/fftw
 +pkgincludedir = $(includedir)/fftw
 +
 +top_builddir = ..
 +
 +ACLOCAL = aclocal
 +AUTOCONF = autoconf
 +AUTOMAKE = automake
 +
 +INSTALL = /usr/bin/install -c
- INSTALL_PROGRAM = ${INSTALL}
++INSTALL_PROGRAM = ${INSTALL} $(AM_INSTALL_PROGRAM_FLAGS)
 +INSTALL_DATA = ${INSTALL} -m 644
 +INSTALL_SCRIPT = ${INSTALL_PROGRAM}
 +transform = s,x,x,
 +
 +NORMAL_INSTALL = :
 +PRE_INSTALL = :
 +POST_INSTALL = :
 +NORMAL_UNINSTALL = :
 +PRE_UNINSTALL = :
 +POST_UNINSTALL = :
 +host_alias = i586-pc-linux-gnu
 +host_triplet = i586-pc-linux-gnu
++AS = @AS@
 +CC = cc
++CCthreads = cc
++DLLTOOL = @DLLTOOL@
++F77 = f77
++FFTW_MPI_INCLUDELIST = fftw_mpi.h rfftw_mpi.h
++FFTW_MPI_LIBLIST = libfftw_mpi.la librfftw_mpi.la
++FFTW_MPI_PROGLIST = test_sched test_transpose_mpi fftw_mpi_test rfftw_mpi_test
++FFTW_PREFIX = 
++FFTW_THREADS_INCLUDELIST = fftw_threads.h rfftw_threads.h
++FFTW_THREADS_LIBLIST = libfftw_threads.la librfftw_threads.la
++FFTW_THREADS_PROGLIST = fftw_threads_test rfftw_threads_test
++FLIBS =  -lg2c -lm -L/usr/lib/gcc-lib/i386-linux/2.95.2 -lm
 +LD = /usr/bin/ld
 +LIBTOOL = $(SHELL) $(top_builddir)/libtool
 +LN_S = ln -s
 +MAKEINFO = makeinfo
++MPICC = mpicc
++MPILIBS =  
 +NM = /usr/bin/nm -B
++OBJDUMP = @OBJDUMP@
 +PACKAGE = fftw
 +PERL = perl
 +RANLIB = ranlib
- SHARED_VERSION_INFO = 2:1:0
- VERSION = 2.0.1
++SHARED_VERSION = 2.0.5
++SHARED_VERSION_INFO = 2:5:0
++THREADLIBS = -lpthread
++VERSION = 2.1.3
 +
 +lib_LTLIBRARIES = libfftw.la
 +include_HEADERS = fftw.h
 +INCLUDES = -I$(srcdir)/../fftw -I$(srcdir)
 +
- NOTW_CODELETS= fn_1.c fn_2.c fn_3.c fn_4.c fn_5.c fn_6.c fn_7.c fn_8.c fn_9.c fn_10.c fn_11.c fn_12.c fn_13.c fn_14.c fn_15.c fn_16.c fn_32.c fn_64.c
- TWID_CODELETS= ftw_2.c ftw_3.c ftw_4.c ftw_5.c ftw_6.c ftw_7.c ftw_8.c ftw_9.c ftw_10.c ftw_16.c ftw_32.c ftw_64.c
- NOTWI_CODELETS= fni_1.c fni_2.c fni_3.c fni_4.c fni_5.c fni_6.c fni_7.c fni_8.c fni_9.c fni_10.c fni_11.c fni_12.c fni_13.c fni_14.c fni_15.c fni_16.c fni_32.c fni_64.c
- TWIDI_CODELETS= ftwi_2.c ftwi_3.c ftwi_4.c ftwi_5.c ftwi_6.c ftwi_7.c ftwi_8.c ftwi_9.c ftwi_10.c ftwi_16.c ftwi_32.c ftwi_64.c
++NOTW_CODELETS = fn_1.c fn_2.c fn_3.c fn_4.c fn_5.c fn_6.c fn_7.c fn_8.c fn_9.c fn_10.c fn_11.c fn_12.c fn_13.c fn_14.c fn_15.c fn_16.c fn_32.c fn_64.c
++TWID_CODELETS = ftw_2.c ftw_3.c ftw_4.c ftw_5.c ftw_6.c ftw_7.c ftw_8.c ftw_9.c ftw_10.c ftw_16.c ftw_32.c ftw_64.c
++NOTWI_CODELETS = fni_1.c fni_2.c fni_3.c fni_4.c fni_5.c fni_6.c fni_7.c fni_8.c fni_9.c fni_10.c fni_11.c fni_12.c fni_13.c fni_14.c fni_15.c fni_16.c fni_32.c fni_64.c
++TWIDI_CODELETS = ftwi_2.c ftwi_3.c ftwi_4.c ftwi_5.c ftwi_6.c ftwi_7.c ftwi_8.c ftwi_9.c ftwi_10.c ftwi_16.c ftwi_32.c ftwi_64.c
 +
- CODELETS=$(NOTW_CODELETS) $(TWID_CODELETS) $(NOTWI_CODELETS) $(TWIDI_CODELETS)
- OTHERSRC = timer.c config.c planner.c twiddle.c executor.c \
- 	generic.c fftwnd.c malloc.c wisdom.c wisdomio.c putils.c rader.c
++CODELETS = $(NOTW_CODELETS) $(TWID_CODELETS) $(NOTWI_CODELETS) $(TWIDI_CODELETS)
++OTHERSRC = timer.c config.c planner.c twiddle.c executor.c 	   generic.c fftwnd.c malloc.c wisdom.c wisdomio.c putils.c rader.c            fftwf77.c f77_func.h
 +
- libfftw_la_SOURCES = $(CODELETS) $(OTHERSRC) fftw.h fftw-int.h
- libfftw_la_LDFLAGS = -version-info 2:1:0
++
++libfftw_la_SOURCES = $(CODELETS) $(OTHERSRC)                                                     fftw.h fftw-int.h 
++
++
++libfftw_la_LDFLAGS = -version-info 2:5:0
 +MAINTAINERCLEANFILES = $(CODELETS) config.c
++DISTCLEANFILES = fftw.h sfftw.h dfftw.h
++
++CLEANFILES = xyzfftw.h
 +
 +# for some reason, automake tries to use autoheader in order to
 +# generate config.h.in, and fails because config.h.in is GNU-lly
 +# incorrect.  Just disable autoheader
- AUTOHEADER=echo
++AUTOHEADER = echo
 +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 +CONFIG_HEADER = config.h fftw.h
 +CONFIG_CLEAN_FILES = 
 +LTLIBRARIES =  $(lib_LTLIBRARIES)
 +
 +
 +DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir) -I. -I.
 +CPPFLAGS = 
 +LDFLAGS = 
 +LIBS = -lm 
 +libfftw_la_LIBADD = 
- libfftw_la_OBJECTS =  fn_1.lo fn_2.lo fn_3.lo fn_4.lo fn_5.lo fn_6.lo \
- fn_7.lo fn_8.lo fn_9.lo fn_10.lo fn_11.lo fn_12.lo fn_13.lo fn_14.lo \
- fn_15.lo fn_16.lo fn_32.lo fn_64.lo ftw_2.lo ftw_3.lo ftw_4.lo ftw_5.lo \
- ftw_6.lo ftw_7.lo ftw_8.lo ftw_9.lo ftw_10.lo ftw_16.lo ftw_32.lo \
- ftw_64.lo fni_1.lo fni_2.lo fni_3.lo fni_4.lo fni_5.lo fni_6.lo \
- fni_7.lo fni_8.lo fni_9.lo fni_10.lo fni_11.lo fni_12.lo fni_13.lo \
- fni_14.lo fni_15.lo fni_16.lo fni_32.lo fni_64.lo ftwi_2.lo ftwi_3.lo \
- ftwi_4.lo ftwi_5.lo ftwi_6.lo ftwi_7.lo ftwi_8.lo ftwi_9.lo ftwi_10.lo \
- ftwi_16.lo ftwi_32.lo ftwi_64.lo timer.lo config.lo planner.lo \
- twiddle.lo executor.lo generic.lo fftwnd.lo malloc.lo wisdom.lo \
- wisdomio.lo putils.lo rader.lo
- CFLAGS = -O6 -fomit-frame-pointer -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align -pedantic -malign-double 
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
- LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
++libfftw_la_OBJECTS =  fn_1.lo fn_2.lo fn_3.lo fn_4.lo \
++fn_5.lo fn_6.lo fn_7.lo fn_8.lo fn_9.lo fn_10.lo fn_11.lo fn_12.lo \
++fn_13.lo fn_14.lo fn_15.lo fn_16.lo fn_32.lo fn_64.lo ftw_2.lo ftw_3.lo \
++ftw_4.lo ftw_5.lo ftw_6.lo ftw_7.lo ftw_8.lo ftw_9.lo ftw_10.lo \
++ftw_16.lo ftw_32.lo ftw_64.lo fni_1.lo fni_2.lo fni_3.lo fni_4.lo \
++fni_5.lo fni_6.lo fni_7.lo fni_8.lo fni_9.lo fni_10.lo fni_11.lo \
++fni_12.lo fni_13.lo fni_14.lo fni_15.lo fni_16.lo fni_32.lo fni_64.lo \
++ftwi_2.lo ftwi_3.lo ftwi_4.lo ftwi_5.lo ftwi_6.lo ftwi_7.lo ftwi_8.lo \
++ftwi_9.lo ftwi_10.lo ftwi_16.lo ftwi_32.lo ftwi_64.lo timer.lo \
++config.lo planner.lo twiddle.lo executor.lo generic.lo fftwnd.lo \
++malloc.lo wisdom.lo wisdomio.lo putils.lo rader.lo fftwf77.lo
++CFLAGS = -O6 -fomit-frame-pointer -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align -pedantic -fno-schedule-insns -fschedule-insns2 -malign-double -fstrict-aliasing -mcpu=pentium -mpreferred-stack-boundary=2
++COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
 +HEADERS =  $(include_HEADERS)
 +
- DIST_COMMON =  Makefile.am Makefile.in config.h.in fftw.h.in stamp-h1.in \
- stamp-h2.in
++DIST_COMMON =  ./stamp-h1.in ./stamp-h2.in Makefile.am Makefile.in \
++config.h.in fftw.h.in
 +
 +
 +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 +
- TAR = tar
- GZIP = --best
++TAR = gtar
++GZIP_ENV = --best
 +SOURCES = $(libfftw_la_SOURCES)
 +OBJECTS = $(libfftw_la_OBJECTS)
 +
- all: Makefile $(LTLIBRARIES) $(HEADERS) config.h fftw.h
- 
++all: all-redirect
 +.SUFFIXES:
 +.SUFFIXES: .S .c .lo .o .s
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 +	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps fftw/Makefile
 +
 +Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 +	cd $(top_builddir) \
 +	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 +
 +
 +config.h: stamp-h1
- 	@:
++	@if test ! -f $@; then \
++		rm -f stamp-h1; \
++		$(MAKE) stamp-h1; \
++	else :; fi
 +stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 +	cd $(top_builddir) \
 +	  && CONFIG_FILES= CONFIG_HEADERS=fftw/config.h \
 +	     $(SHELL) ./config.status
- 	@echo timestamp > stamp-h1
++	@echo timestamp > stamp-h1 2> /dev/null
 +$(srcdir)/config.h.in: $(srcdir)/stamp-h1.in
++	@if test ! -f $@; then \
++		rm -f $(srcdir)/stamp-h1.in; \
++		$(MAKE) $(srcdir)/stamp-h1.in; \
++	else :; fi
 +$(srcdir)/stamp-h1.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 +	cd $(top_srcdir) && $(AUTOHEADER)
- 	@echo timestamp > $(srcdir)/stamp-h1.in
++	@echo timestamp > $(srcdir)/stamp-h1.in 2> /dev/null
 +
 +fftw.h: stamp-h2
- 	@:
++	@if test ! -f $@; then \
++		rm -f stamp-h2; \
++		$(MAKE) stamp-h2; \
++	else :; fi
 +stamp-h2: $(srcdir)/fftw.h.in $(top_builddir)/config.status
 +	cd $(top_builddir) \
 +	  && CONFIG_FILES= CONFIG_HEADERS=fftw/fftw.h \
 +	     $(SHELL) ./config.status
- 	@echo timestamp > stamp-h2
++	@echo timestamp > stamp-h2 2> /dev/null
 +$(srcdir)/fftw.h.in: $(srcdir)/stamp-h2.in
++	@if test ! -f $@; then \
++		rm -f $(srcdir)/stamp-h2.in; \
++		$(MAKE) $(srcdir)/stamp-h2.in; \
++	else :; fi
 +$(srcdir)/stamp-h2.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 +	cd $(top_srcdir) && $(AUTOHEADER)
- 	@echo timestamp > $(srcdir)/stamp-h2.in
++	@echo timestamp > $(srcdir)/stamp-h2.in 2> /dev/null
 +
 +mostlyclean-hdr:
 +
 +clean-hdr:
 +
 +distclean-hdr:
 +	-rm -f config.h fftw.h
 +
 +maintainer-clean-hdr:
 +
 +mostlyclean-libLTLIBRARIES:
 +
 +clean-libLTLIBRARIES:
 +	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
 +
 +distclean-libLTLIBRARIES:
 +
 +maintainer-clean-libLTLIBRARIES:
 +
 +install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 +	@$(NORMAL_INSTALL)
 +	$(mkinstalldirs) $(DESTDIR)$(libdir)
 +	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 +	  if test -f $$p; then \
- 	    echo "$(LIBTOOL)  --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p"; \
- 	    $(LIBTOOL)  --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p; \
++	    echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p"; \
++	    $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p; \
 +	  else :; fi; \
 +	done
 +
 +uninstall-libLTLIBRARIES:
 +	@$(NORMAL_UNINSTALL)
 +	list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 +	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
 +	done
 +
 +.c.o:
 +	$(COMPILE) -c $<
 +
 +.s.o:
 +	$(COMPILE) -c $<
 +
 +.S.o:
 +	$(COMPILE) -c $<
 +
 +mostlyclean-compile:
 +	-rm -f *.o core *.core
 +
 +clean-compile:
 +
 +distclean-compile:
 +	-rm -f *.tab.c
 +
 +maintainer-clean-compile:
 +
 +.c.lo:
 +	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
 +
 +.s.lo:
 +	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
 +
 +.S.lo:
 +	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
 +
 +mostlyclean-libtool:
 +	-rm -f *.lo
 +
 +clean-libtool:
 +	-rm -rf .libs _libs
 +
 +distclean-libtool:
 +
 +maintainer-clean-libtool:
 +
 +libfftw.la: $(libfftw_la_OBJECTS) $(libfftw_la_DEPENDENCIES)
 +	$(LINK) -rpath $(libdir) $(libfftw_la_LDFLAGS) $(libfftw_la_OBJECTS) $(libfftw_la_LIBADD) $(LIBS)
 +
 +install-includeHEADERS: $(include_HEADERS)
 +	@$(NORMAL_INSTALL)
 +	$(mkinstalldirs) $(DESTDIR)$(includedir)
 +	@list='$(include_HEADERS)'; for p in $$list; do \
 +	  if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
 +	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$p"; \
 +	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$p; \
 +	done
 +
 +uninstall-includeHEADERS:
 +	@$(NORMAL_UNINSTALL)
 +	list='$(include_HEADERS)'; for p in $$list; do \
 +	  rm -f $(DESTDIR)$(includedir)/$$p; \
 +	done
 +
 +tags: TAGS
 +
 +ID: $(HEADERS) $(SOURCES) $(LISP)
++	list='$(SOURCES) $(HEADERS)'; \
++	unique=`for i in $$list; do echo $$i; done | \
++	  awk '    { files[$$0] = 1; } \
++	       END { for (i in files) print i; }'`; \
 +	here=`pwd` && cd $(srcdir) \
- 	  && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP)
++	  && mkid -f$$here/ID $$unique $(LISP)
 +
 +TAGS:  $(HEADERS) $(SOURCES) config.h.in fftw.h.in $(TAGS_DEPENDENCIES) $(LISP)
 +	tags=; \
 +	here=`pwd`; \
 +	list='$(SOURCES) $(HEADERS)'; \
 +	unique=`for i in $$list; do echo $$i; done | \
 +	  awk '    { files[$$0] = 1; } \
 +	       END { for (i in files) print i; }'`; \
 +	test -z "$(ETAGS_ARGS)config.h.in fftw.h.in$$unique$(LISP)$$tags" \
 +	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in fftw.h.in $$unique $(LISP) -o $$here/TAGS)
 +
 +mostlyclean-tags:
 +
 +clean-tags:
 +
 +distclean-tags:
 +	-rm -f TAGS ID
 +
 +maintainer-clean-tags:
 +
 +distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 +
 +subdir = fftw
 +
 +distdir: $(DISTFILES)
 +	@for file in $(DISTFILES); do \
 +	  d=$(srcdir); \
- 	  test -f $(distdir)/$$file \
- 	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
- 	  || cp -p $$d/$$file $(distdir)/$$file; \
++	  if test -d $$d/$$file; then \
++	    cp -pr $$/$$file $(distdir)/$$file; \
++	  else \
++	    test -f $(distdir)/$$file \
++	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
++	    || cp -p $$d/$$file $(distdir)/$$file || :; \
++	  fi; \
 +	done
 +
- info:
- dvi:
- check: all
- 	$(MAKE)
- installcheck:
- install-exec: install-libLTLIBRARIES
- 	@$(NORMAL_INSTALL)
- 
- install-data: install-includeHEADERS
- 	@$(NORMAL_INSTALL)
- 
- install: install-exec install-data all
- 	@:
- 
- uninstall: uninstall-libLTLIBRARIES uninstall-includeHEADERS
- 
++info-am:
++info: info-am
++dvi-am:
++dvi: dvi-am
++check-am: all-am
++check: check-am
++installcheck-am:
++installcheck: installcheck-am
++all-recursive-am: config.h fftw.h
++	$(MAKE) $(AM_MAKEFLAGS) all-recursive
++
++install-exec-am: install-libLTLIBRARIES
++install-exec: install-exec-am
++
++install-data-am: install-includeHEADERS
++install-data: install-data-am
++
++install-am: all-am
++	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++install: install-am
++uninstall-am: uninstall-libLTLIBRARIES uninstall-includeHEADERS
++uninstall: uninstall-am
++all-am: Makefile $(LTLIBRARIES) $(HEADERS) config.h fftw.h
++all-redirect: all-am
 +install-strip:
- 	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
++	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
 +installdirs:
- 	$(mkinstalldirs)  $(DATADIR)$(libdir) $(DATADIR)$(includedir)
++	$(mkinstalldirs)  $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
 +
 +
 +mostlyclean-generic:
- 	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 +
 +clean-generic:
 +	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 +
 +distclean-generic:
- 	-rm -f Makefile $(DISTCLEANFILES)
++	-rm -f Makefile $(CONFIG_CLEAN_FILES)
 +	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
- 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 +
 +maintainer-clean-generic:
 +	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
- 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
- mostlyclean:  mostlyclean-hdr mostlyclean-libLTLIBRARIES \
++mostlyclean-am:  mostlyclean-hdr mostlyclean-libLTLIBRARIES \
 +		mostlyclean-compile mostlyclean-libtool \
 +		mostlyclean-tags mostlyclean-generic
 +
- clean:  clean-hdr clean-libLTLIBRARIES clean-compile clean-libtool \
- 		clean-tags clean-generic mostlyclean
++mostlyclean: mostlyclean-am
 +
- distclean:  distclean-hdr distclean-libLTLIBRARIES distclean-compile \
++clean-am:  clean-hdr clean-libLTLIBRARIES clean-compile clean-libtool \
++		clean-tags clean-generic mostlyclean-am
++
++clean: clean-am
++
++distclean-am:  distclean-hdr distclean-libLTLIBRARIES distclean-compile \
 +		distclean-libtool distclean-tags distclean-generic \
- 		clean
- 	-rm -f config.status
++		clean-am
 +	-rm -f libtool
 +
- maintainer-clean:  maintainer-clean-hdr maintainer-clean-libLTLIBRARIES \
++distclean: distclean-am
++
++maintainer-clean-am:  maintainer-clean-hdr \
++		maintainer-clean-libLTLIBRARIES \
 +		maintainer-clean-compile maintainer-clean-libtool \
 +		maintainer-clean-tags maintainer-clean-generic \
- 		distclean
++		distclean-am
 +	@echo "This command is intended for maintainers to use;"
 +	@echo "it deletes files that may require special tools to rebuild."
 +
++maintainer-clean: maintainer-clean-am
++
 +.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
 +mostlyclean-libLTLIBRARIES distclean-libLTLIBRARIES \
 +clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \
 +uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \
 +distclean-compile clean-compile maintainer-clean-compile \
 +mostlyclean-libtool distclean-libtool clean-libtool \
 +maintainer-clean-libtool uninstall-includeHEADERS \
 +install-includeHEADERS tags mostlyclean-tags distclean-tags clean-tags \
- maintainer-clean-tags distdir info dvi installcheck install-exec \
- install-data install uninstall all installdirs mostlyclean-generic \
- distclean-generic clean-generic maintainer-clean-generic clean \
- mostlyclean distclean maintainer-clean
++maintainer-clean-tags distdir info-am info dvi-am dvi check check-am \
++installcheck-am installcheck all-recursive-am install-exec-am \
++install-exec install-data-am install-data install-am install \
++uninstall-am uninstall all-redirect all-am all installdirs \
++mostlyclean-generic distclean-generic clean-generic \
++maintainer-clean-generic clean mostlyclean distclean maintainer-clean
++
 +
++xyzfftw.h: fftw.h
++	rm -f fftw.h
++	sed 's/<fftw/<fftw/g;s/<rfftw/<rfftw/g' fftw.h > fftw.h
 +
 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
diff --cc fftw/config.h
index 9ecc3b2,0141f8d..cd6dd37
--- a/fftw/config.h
+++ b/fftw/config.h
@@@ -1,7 -1,6 +1,7 @@@
 +/* fftw/config.h.  Generated automatically by configure.  */
  /* -*- C -*- */
  /*
-  * Copyright (c) 1997,1998 Massachusetts Institute of Technology
+  * Copyright (c) 1997-1999 Massachusetts Institute of Technology
   *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
@@@ -47,12 -46,28 +47,28 @@@
  
  /* Define if you have gethrtime() a la Solaris 2 */
  /* #undef HAVE_GETHRTIME */
+ /* #undef HAVE_HRTIME_T */
+ 
+ /* Define to sizeof int and long long, if available: */
 -#define SIZEOF_INT 0
 -#define SIZEOF_LONG_LONG 0
++#define SIZEOF_INT 4
++#define SIZEOF_LONG_LONG 8
+ 
+ #if (SIZEOF_INT != 0) && (SIZEOF_LONG_LONG >= 2 * SIZEOF_INT)
+ #  define LONGLONG_IS_TWOINTS
+ #endif
+ 
+ /* Define to use "unsafe" modular multiply (can cause integer overflow
+    and errors for transforms of large prime sizes using Rader). */
+ /* #undef FFTW_ENABLE_UNSAFE_MULMOD */
  
  /* Define if you have getopt() */
 -/* #undef HAVE_GETOPT */
 +#define HAVE_GETOPT 1
  
+ /* Define if you have getopt_long() */
 -/* #undef HAVE_GETOPT_LONG */
++#define HAVE_GETOPT_LONG 1
+ 
  /* Define if you have isnan() */
 -/* #undef HAVE_ISNAN */
 +#define HAVE_ISNAN 1
  
  /* Define for enabling the high resolution Pentium timer */
  /* #undef FFTW_ENABLE_PENTIUM_TIMER */
@@@ -68,8 -83,11 +84,11 @@@
   * Define to enable a gcc/x86 specific hack that aligns
   * the stack to an 8-byte boundary 
   */
 -/* #undef FFTW_ENABLE_I386_HACKS */
 +#define FFTW_ENABLE_I386_HACKS 1
  
+ /* Define when using a version of gcc that aligns the stack properly */
+ /* #undef FFTW_GCC_ALIGNS_STACK */
+ 
  /* Define to enable extra runtime checks for debugging. */
  /* #undef FFTW_DEBUG */
  
@@@ -88,8 -110,61 +111,61 @@@
  
  /* Use MacOS Time Manager timer */
  #if defined(MAC) || defined(macintosh)
- #define HAVE_MAC_TIMER
+ #  define HAVE_MAC_TIMER
+ #  define HAVE_MACOS
  
  /* Define to use nanosecond timer on PCI PowerMacs: */
+ /* (WARNING: experimental, use at your own risk.) */
  /* #undef HAVE_MAC_PCI_TIMER */
  #endif
+ 
+ /* define if you have alloca.h: */
 -/* #undef HAVE_ALLOCA_H */
++#define HAVE_ALLOCA_H 1
+ 
+ /* define if you have the alloca function: */
 -/* #undef HAVE_ALLOCA */
++#define HAVE_ALLOCA 1
+ 
+ /************************** threads configuration ************************/
+ 
+ /* The following preprocessor symbols select which threads library
+    to use when compiling the FFTW threads parallel libraries: */
+ 
+ /* #undef FFTW_USING_SOLARIS_THREADS */
 -/* #undef FFTW_USING_POSIX_THREADS */
++#define FFTW_USING_POSIX_THREADS 1
+ /* #undef FFTW_USING_BEOS_THREADS */
+ /* #undef FFTW_USING_MACH_THREADS */
+ 
+ /* #undef HAVE_PTHREAD_CREATE_UNDETACHED */
+ 
+ /* #undef HAVE_MACH_CTHREADS_H */
+ /* #undef HAVE_CTHREADS_H */
+ /* #undef HAVE_CTHREAD_H */
+ 
+ #ifdef HAVE_WIN32
+ #define FFTW_USING_WIN32_THREADS
+ #endif
+ 
+ #ifdef HAVE_MACOS
+ #define FFTW_USING_MACOS_THREADS
+ #endif
+ 
+ /*********************** fortran wrapper configuration *********************/
+ 
+ /* These symbols select how to mangle function names so that they will
+    be recognized by the linker.  If none of them are defined, then
+    Fortran wrappers will not be compiled. */
+ 
+ /* #undef FFTW_FORTRANIZE_LOWERCASE */
 -/* #undef FFTW_FORTRANIZE_LOWERCASE_UNDERSCORE */
++#define FFTW_FORTRANIZE_LOWERCASE_UNDERSCORE 1
+ /* #undef FFTW_FORTRANIZE_UPPERCASE */
+ /* #undef FFTW_FORTRANIZE_UPPERCASE_UNDERSCORE */
+ 
+ /* define the following if names with an underscore get an extra one: */
 -/* #undef FFTW_FORTRANIZE_EXTRA_UNDERSCORE */
++#define FFTW_FORTRANIZE_EXTRA_UNDERSCORE 1
+ 
+ /* The following symbols control how MPI_Comm data structures are
+    translated between Fortran and C for the fftw_mpi wrappers.  See
+    the file mpi/fftw_f77_mpi.h for more information. */
 -/* #undef HAVE_MPI_COMM_F2C */
++#define HAVE_MPI_COMM_F2C 1
+ /* #undef FFTW_USE_F77_MPI_COMM */
+ /* #undef FFTW_USE_F77_MPI_COMM_P */
diff --cc fftw/fftw.h
index 577b219,a829e12..60d4d6d
--- a/fftw/fftw.h
+++ b/fftw/fftw.h
@@@ -1,7 -1,6 +1,7 @@@
 +/* fftw/fftw.h.  Generated automatically by configure.  */
  /* -*- C -*- */
  /*
-  * Copyright (c) 1997,1998 Massachusetts Institute of Technology
+  * Copyright (c) 1997-1999 Massachusetts Institute of Technology
   *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
diff --cc fftw/libfftw.la
index 92ef68d,0000000..da1cea2
mode 100644,000000..100644
--- a/fftw/libfftw.la
+++ b/fftw/libfftw.la
@@@ -1,22 -1,0 +1,28 @@@
 +# libfftw.la - a libtool library file
- # Generated by ltmain.sh - GNU libtool 1.2
++# Generated by ltmain.sh - GNU libtool 1.3.3 (1.385.2.181 1999/07/02 15:49:11)
++#
++# Please DO NOT delete this file!
++# It is necessary for linking the library.
 +
 +# The name that we can dlopen(3).
 +dlname=''
 +
 +# Names of this library.
 +library_names=''
 +
 +# The name of the static archive.
 +old_library='libfftw.a'
 +
 +# Libraries that this one depends upon.
 +dependency_libs=' -lm'
 +
 +# Version information for libfftw.
 +current=2
 +age=0
- revision=1
++revision=5
++
++# Is this an already installed library?
++installed=no
 +
 +# Directory that this library needs to be installed in:
 +libdir='/usr/lib'
diff --cc libtool
index 4099e92,0000000..5d31859
mode 100644,000000..100644
--- a/libtool
+++ b/libtool
@@@ -1,2624 -1,0 +1,4235 @@@
 +#! /bin/sh
 +
 +# libtool - Provide generalized library-building support services.
- # Generated automatically by ltconfig - GNU libtool 1.2
++# Generated automatically by ltconfig (GNU libtool 1.3.3 (1.385.2.181 1999/07/02 15:49:11))
 +# NOTE: Changes made to this file will be lost: look at ltconfig or ltmain.sh.
 +#
- # Copyright (C) 1996-1998 Free Software Foundation, Inc.
++# Copyright (C) 1996-1999 Free Software Foundation, Inc.
 +# Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
 +#
 +# This program is free software; you can redistribute it and/or modify
 +# it under the terms of the GNU General Public License as published by
 +# the Free Software Foundation; either version 2 of the License, or
 +# (at your option) any later version.
 +#
 +# This program is distributed in the hope that it will be useful, but
 +# WITHOUT ANY WARRANTY; without even the implied warranty of
 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 +# General Public License for more details.
 +#
 +# You should have received a copy of the GNU General Public License
 +# along with this program; if not, write to the Free Software
 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 +#
 +# As a special exception to the GNU General Public License, if you
 +# distribute this file as part of a program that contains a
 +# configuration script generated by Autoconf, you may include it under
 +# the same distribution terms that you use for the rest of that program.
 +
- # This program was configured as follows,
- # on host landru:
- #
- # CC="cc" CFLAGS="-g -O2" CPPFLAGS="" \
- # LD="/usr/bin/ld" NM="/usr/bin/nm -B" RANLIB="ranlib" LN_S="ln -s" \
- #   ./ltconfig --disable-shared --with-gcc --with-gnu-ld --no-verify ./ltmain.sh i586-pc-linux-gnu
- #
- # Compiler and other test output produced by ltconfig, useful for
- # debugging ltconfig, is in ./config.log if it exists.
- 
 +# Sed that helps us avoid accidentally triggering echo(1) options like -n.
 +Xsed="sed -e s/^X//"
 +
 +# The HP-UX ksh and POSIX shell print the target directory to stdout
 +# if CDPATH is set.
 +if test "${CDPATH+set}" = set; then CDPATH=; export CDPATH; fi
 +
- # An echo program that does not interpret backslashes.
- echo="echo"
++### BEGIN LIBTOOL CONFIG
++# Libtool was configured as follows, on host landru:
++#
++# CC="cc" CFLAGS="-g -O2" CPPFLAGS="" \
++# LD="/usr/bin/ld" LDFLAGS="" LIBS="" \
++# NM="/usr/bin/nm -B" RANLIB="ranlib" LN_S="ln -s" \
++# DLLTOOL="" OBJDUMP="" AS="" \
++#   ./ltconfig --cache-file=./config.cache --disable-shared --with-gcc --with-gnu-ld --no-verify ./ltmain.sh i586-pc-linux-gnu
++#
++# Compiler and other test output produced by ltconfig, useful for
++# debugging ltconfig, is in ./config.log if it exists.
 +
 +# The version of ltconfig that generated this script.
- LTCONFIG_VERSION="1.2"
++LTCONFIG_VERSION="1.3.3"
 +
 +# Shell to use when invoking shell scripts.
- SHELL=/bin/sh
++SHELL="/bin/sh"
 +
- # Whether or not to build libtool libraries.
++# Whether or not to build shared libraries.
 +build_libtool_libs=no
 +
- # Whether or not to build old-style libraries.
++# Whether or not to build static libraries.
 +build_old_libs=yes
 +
++# Whether or not to optimize for fast installation.
++fast_install=needless
++
 +# The host system.
- host_alias="i586-pc-linux-gnu"
- host="i586-pc-linux-gnu"
++host_alias=i586-pc-linux-gnu
++host=i586-pc-linux-gnu
++
++# An echo program that does not interpret backslashes.
++echo="echo"
 +
 +# The archiver.
 +AR="ar"
 +
 +# The default C compiler.
 +CC="cc"
 +
 +# The linker used to build libraries.
 +LD="/usr/bin/ld"
 +
 +# Whether we need hard or soft links.
 +LN_S="ln -s"
 +
 +# A BSD-compatible nm program.
 +NM="/usr/bin/nm -B"
 +
++# Used on cygwin: DLL creation program.
++DLLTOOL="dlltool"
++
++# Used on cygwin: object dumper.
++OBJDUMP="objdump"
++
++# Used on cygwin: assembler.
++AS="as"
++
 +# The name of the directory that contains temporary libtool files.
- objdir=".libs"
++objdir=.libs
 +
 +# How to create reloadable object files.
 +reload_flag=" -r"
 +reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs"
 +
 +# How to pass a linker flag through the compiler.
 +wl="-Wl,"
 +
++# Object file suffix (normally "o").
++objext="o"
++
++# Old archive suffix (normally "a").
++libext="a"
++
++# Executable file suffix (normally "").
++exeext=""
++
 +# Additional compiler flags for building library objects.
 +pic_flag=" -fPIC"
 +
++# Does compiler simultaneously support -c and -o options?
++compiler_c_o="yes"
++
++# Can we write directly to a .lo ?
++compiler_o_lo="yes"
++
++# Must we lock files when doing compilation ?
++need_locks="no"
++
++# Do we need the lib prefix for modules?
++need_lib_prefix=no
++
++# Do we need a version for libraries?
++need_version=no
++
++# Whether dlopen is supported.
++dlopen=unknown
++
++# Whether dlopen of programs is supported.
++dlopen_self=unknown
++
++# Whether dlopen of statically linked programs is supported.
++dlopen_self_static=unknown
++
 +# Compiler flag to prevent dynamic linking.
 +link_static_flag="-static"
 +
 +# Compiler flag to turn off builtin functions.
- no_builtin_flag=" -fno-builtin"
++no_builtin_flag=" -fno-builtin -fno-rtti -fno-exceptions"
 +
 +# Compiler flag to allow reflexive dlopens.
 +export_dynamic_flag_spec="\${wl}--export-dynamic"
 +
++# Compiler flag to generate shared objects directly from archives.
++whole_archive_flag_spec="\${wl}--whole-archive\$convenience \${wl}--no-whole-archive"
++
++# Compiler flag to generate thread-safe objects.
++thread_safe_flag_spec=""
++
 +# Library versioning type.
 +version_type=linux
 +
 +# Format of library name prefix.
 +libname_spec="lib\$name"
 +
 +# List of archive names.  First name is the real one, the rest are links.
 +# The last name is the one that the linker finds with -lNAME.
- library_names_spec="\${libname}\${release}.so.\$versuffix \${libname}\${release}.so.\$major \$libname.so"
++library_names_spec="\${libname}\${release}.so\$versuffix \${libname}\${release}.so\$major \$libname.so"
 +
 +# The coded name of the library, if different from the real name.
- soname_spec="\${libname}\${release}.so.\$major"
++soname_spec="\${libname}\${release}.so\$major"
 +
 +# Commands used to build and install an old-style archive.
 +RANLIB="ranlib"
- old_archive_cmds="\$AR cru \$oldlib\$oldobjs;\$RANLIB \$oldlib"
- old_postinstall_cmds="\$RANLIB \$oldlib;chmod 644 \$oldlib"
++old_archive_cmds="\$AR cru \$oldlib\$oldobjs~\$RANLIB \$oldlib"
++old_postinstall_cmds="\$RANLIB \$oldlib~chmod 644 \$oldlib"
 +old_postuninstall_cmds=""
 +
 +# Create an old-style archive from a shared archive.
 +old_archive_from_new_cmds=""
 +
 +# Commands used to build and install a shared archive.
- archive_cmds="\$CC -shared \${wl}-soname \$wl\$soname -o \$lib\$libobjs -lc"
++archive_cmds="\$CC -shared \$libobjs \$deplibs \$linkopts \${wl}-soname \$wl\$soname -o \$lib"
++archive_expsym_cmds="\$CC -shared \$libobjs \$deplibs \$linkopts \${wl}-soname \$wl\$soname \${wl}-retain-symbols-file \$wl\$export_symbols -o \$lib"
 +postinstall_cmds=""
 +postuninstall_cmds=""
 +
++# Method to check whether dependent libraries are shared objects.
++deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )"
++
++# Command to use when deplibs_check_method == file_magic.
++file_magic_cmd="/usr/bin/file"
++
 +# Flag that allows shared libraries with undefined symbols to be built.
 +allow_undefined_flag=""
 +
 +# Flag that forces no undefined symbols.
 +no_undefined_flag=""
 +
 +# Commands used to finish a libtool library installation in a directory.
- finish_cmds="PATH=\\\"\$PATH:/sbin\\\" ldconfig -n \$libdir"
++finish_cmds="PATH=\\\"\\\$PATH:/sbin\\\" ldconfig -n \$libdir"
 +
 +# Same as above, but a single script fragment to be evaled but not shown.
 +finish_eval=""
 +
 +# Take the output of nm and produce a listing of raw symbols and C names.
- global_symbol_pipe="sed -n -e 's/^.* [ABCDGISTUW] \\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\1/p'"
++global_symbol_pipe="sed -n -e 's/^.*[ 	]\\([ABCDGISTW]\\)[ 	][ 	]*\\(\\)\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2\\3 \\3/p'"
++
++# Transform the output of nm in a proper C declaration
++global_symbol_to_cdecl="sed -n -e 's/^. .* \\(.*\\)\$/extern char \\1;/p'"
 +
 +# This is the shared library runtime path variable.
 +runpath_var=LD_RUN_PATH
 +
 +# This is the shared library path variable.
 +shlibpath_var=LD_LIBRARY_PATH
 +
++# Is shlibpath searched before the hard-coded library search path?
++shlibpath_overrides_runpath=no
++
 +# How to hardcode a shared library path into an executable.
 +hardcode_action=immediate
 +
 +# Flag to hardcode $libdir into a binary during linking.
 +# This must work even if $libdir does not exist.
- hardcode_libdir_flag_spec="\${wl}--rpath \${wl}\$libdir"
++hardcode_libdir_flag_spec=""
 +
 +# Whether we need a single -rpath flag with a separated argument.
 +hardcode_libdir_separator=""
 +
 +# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
 +# resulting binary.
 +hardcode_direct=no
 +
 +# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
 +# resulting binary.
 +hardcode_minus_L=no
 +
 +# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
 +# the resulting binary.
 +hardcode_shlibpath_var=unsupported
 +
++# Compile-time system search path for libraries
++sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++
++# Run-time system search path for libraries
++sys_lib_dlsearch_path_spec="/lib /usr/lib"
++
++# Fix the shell variable $srcfile for the compiler.
++fix_srcfile_path=""
++
++# Set to yes if exported symbols are required.
++always_export_symbols=no
++
++# The commands to list exported symbols.
++export_symbols_cmds="\$NM \$libobjs \$convenience | \$global_symbol_pipe | sed 's/.* //' | sort | uniq > \$export_symbols"
++
++# Symbols that should not be listed in the preloaded symbols.
++exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
++
++# Symbols that must always be exported.
++include_expsyms=""
++
++### END LIBTOOL CONFIG
++
 +# ltmain.sh - Provide generalized library-building support services.
 +# NOTE: Changing this file will not affect anything until you rerun ltconfig.
 +#
- # Copyright (C) 1996-1998 Free Software Foundation, Inc.
- # Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
++# Copyright (C) 1996-1999 Free Software Foundation, Inc.
++# Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
 +#
 +# This program is free software; you can redistribute it and/or modify
 +# it under the terms of the GNU General Public License as published by
 +# the Free Software Foundation; either version 2 of the License, or
 +# (at your option) any later version.
 +#
 +# This program is distributed in the hope that it will be useful, but
 +# WITHOUT ANY WARRANTY; without even the implied warranty of
 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 +# General Public License for more details.
 +#
 +# You should have received a copy of the GNU General Public License
 +# along with this program; if not, write to the Free Software
 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 +#
 +# As a special exception to the GNU General Public License, if you
 +# distribute this file as part of a program that contains a
 +# configuration script generated by Autoconf, you may include it under
 +# the same distribution terms that you use for the rest of that program.
 +
++# Check that we have a working $echo.
++if test "X$1" = X--no-reexec; then
++  # Discard the --no-reexec flag, and continue.
++  shift
++elif test "X$1" = X--fallback-echo; then
++  # Avoid inline document here, it may be left over
++  :
++elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
++  # Yippee, $echo works!
++  :
++else
++  # Restart under the correct shell, and then maybe $echo will work.
++  exec $SHELL "$0" --no-reexec ${1+"$@"}
++fi
++
++if test "X$1" = X--fallback-echo; then
++  # used as fallback echo
++  shift
++  cat <<EOF
++$*
++EOF
++  exit 0
++fi
++
 +# The name of this program.
 +progname=`$echo "$0" | sed 's%^.*/%%'`
 +modename="$progname"
 +
 +# Constants.
 +PROGRAM=ltmain.sh
 +PACKAGE=libtool
- VERSION=1.2
++VERSION=1.3.3
++TIMESTAMP=" (1.385.2.181 1999/07/02 15:49:11)"
 +
 +default_mode=
 +help="Try \`$progname --help' for more information."
 +magic="%%%MAGIC variable%%%"
 +mkdir="mkdir"
 +mv="mv -f"
 +rm="rm -f"
 +
 +# Sed substitution that helps us do robust quoting.  It backslashifies
 +# metacharacters that are still active within double-quoted strings.
- Xsed='sed -e s/^X//'
++Xsed='sed -e 1s/^X//'
 +sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
++SP2NL='tr \040 \012'
++NL2SP='tr \015\012 \040\040'
 +
 +# NLS nuisances.
 +# Only set LANG and LC_ALL to C if already set.
 +# These must not be set unconditionally because not all systems understand
 +# e.g. LANG=C (notably SCO).
- if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
- if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
++# We save the old values to restore during execute mode.
++if test "${LC_ALL+set}" = set; then
++  save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
++fi
++if test "${LANG+set}" = set; then
++  save_LANG="$LANG"; LANG=C; export LANG
++fi
 +
 +if test "$LTCONFIG_VERSION" != "$VERSION"; then
 +  echo "$modename: ltconfig version \`$LTCONFIG_VERSION' does not match $PROGRAM version \`$VERSION'" 1>&2
 +  echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
 +  exit 1
 +fi
 +
 +if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
 +  echo "$modename: not configured to build any kind of library" 1>&2
 +  echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
 +  exit 1
 +fi
 +
 +# Global variables.
 +mode=$default_mode
 +nonopt=
 +prev=
 +prevopt=
 +run=
 +show="$echo"
 +show_help=
 +execute_dlfiles=
++lo2o="s/\\.lo\$/.${objext}/"
++o2lo="s/\\.${objext}\$/.lo/"
 +
 +# Parse our command line options once, thoroughly.
 +while test $# -gt 0
 +do
 +  arg="$1"
 +  shift
 +
 +  case "$arg" in
 +  -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
 +  *) optarg= ;;
 +  esac
 +
 +  # If the previous option needs an argument, assign it.
 +  if test -n "$prev"; then
 +    case "$prev" in
 +    execute_dlfiles)
 +      eval "$prev=\"\$$prev \$arg\""
 +      ;;
 +    *)
 +      eval "$prev=\$arg"
 +      ;;
 +    esac
 +
 +    prev=
 +    prevopt=
 +    continue
 +  fi
 +
 +  # Have we seen a non-optional argument yet?
 +  case "$arg" in
 +  --help)
 +    show_help=yes
 +    ;;
 +
 +  --version)
-     echo "$PROGRAM (GNU $PACKAGE) $VERSION"
++    echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
 +    exit 0
 +    ;;
 +
++  --config)
++    sed -e '1,/^### BEGIN LIBTOOL CONFIG/d' -e '/^### END LIBTOOL CONFIG/,$d' $0
++    exit 0
++    ;;
++
++  --debug)
++    echo "$progname: enabling shell trace mode"
++    set -x
++    ;;
++
 +  --dry-run | -n)
 +    run=:
 +    ;;
 +
 +  --features)
 +    echo "host: $host"
 +    if test "$build_libtool_libs" = yes; then
 +      echo "enable shared libraries"
 +    else
 +      echo "disable shared libraries"
 +    fi
 +    if test "$build_old_libs" = yes; then
 +      echo "enable static libraries"
 +    else
 +      echo "disable static libraries"
 +    fi
 +    exit 0
 +    ;;
 +
 +  --finish) mode="finish" ;;
 +
 +  --mode) prevopt="--mode" prev=mode ;;
 +  --mode=*) mode="$optarg" ;;
 +
 +  --quiet | --silent)
 +    show=:
 +    ;;
 +
 +  -dlopen)
 +    prevopt="-dlopen"
 +    prev=execute_dlfiles
 +    ;;
 +
 +  -*)
 +    $echo "$modename: unrecognized option \`$arg'" 1>&2
 +    $echo "$help" 1>&2
 +    exit 1
 +    ;;
 +
 +  *)
 +    nonopt="$arg"
 +    break
 +    ;;
 +  esac
 +done
 +
 +if test -n "$prevopt"; then
 +  $echo "$modename: option \`$prevopt' requires an argument" 1>&2
 +  $echo "$help" 1>&2
 +  exit 1
 +fi
 +
 +if test -z "$show_help"; then
 +
 +  # Infer the operation mode.
 +  if test -z "$mode"; then
 +    case "$nonopt" in
 +    *cc | *++ | gcc* | *-gcc*)
 +      mode=link
 +      for arg
 +      do
-         case "$arg" in
-         -c)
-            mode=compile
-            break
-            ;;
-         esac
++	case "$arg" in
++	-c)
++	   mode=compile
++	   break
++	   ;;
++	esac
 +      done
 +      ;;
-     *db | *dbx)
++    *db | *dbx | *strace | *truss)
 +      mode=execute
 +      ;;
 +    *install*|cp|mv)
 +      mode=install
 +      ;;
 +    *rm)
 +      mode=uninstall
 +      ;;
 +    *)
 +      # If we have no mode, but dlfiles were specified, then do execute mode.
 +      test -n "$execute_dlfiles" && mode=execute
 +
 +      # Just use the default operation mode.
 +      if test -z "$mode"; then
-         if test -n "$nonopt"; then
-           $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2
-         else
-           $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2
-         fi
++	if test -n "$nonopt"; then
++	  $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2
++	else
++	  $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2
++	fi
 +      fi
 +      ;;
 +    esac
 +  fi
 +
 +  # Only execute mode is allowed to have -dlopen flags.
 +  if test -n "$execute_dlfiles" && test "$mode" != execute; then
 +    $echo "$modename: unrecognized option \`-dlopen'" 1>&2
 +    $echo "$help" 1>&2
 +    exit 1
 +  fi
 +
 +  # Change the help message to a mode-specific one.
 +  generic_help="$help"
 +  help="Try \`$modename --help --mode=$mode' for more information."
 +
 +  # These modes are in order of execution frequency so that they run quickly.
 +  case "$mode" in
 +  # libtool compile mode
 +  compile)
 +    modename="$modename: compile"
 +    # Get the compilation command and the source file.
 +    base_compile=
 +    lastarg=
 +    srcfile="$nonopt"
 +    suppress_output=
 +
++    user_target=no
 +    for arg
 +    do
 +      # Accept any command-line options.
 +      case "$arg" in
 +      -o)
- 	$echo "$modename: you cannot specify the output filename with \`-o'" 1>&2
- 	$echo "$help" 1>&2
- 	exit 1
++	if test "$user_target" != "no"; then
++	  $echo "$modename: you cannot specify \`-o' more than once" 1>&2
++	  exit 1
++	fi
++	user_target=next
 +	;;
 +
 +      -static)
- 	build_libtool_libs=no
 +	build_old_libs=yes
 +	continue
 +	;;
 +      esac
 +
++      case "$user_target" in
++      next)
++	# The next one is the -o target name
++	user_target=yes
++	continue
++	;;
++      yes)
++	# We got the output file
++	user_target=set
++	libobj="$arg"
++	continue
++	;;
++      esac
++
 +      # Accept the current argument as the source file.
 +      lastarg="$srcfile"
 +      srcfile="$arg"
 +
 +      # Aesthetically quote the previous argument.
 +
 +      # Backslashify any backslashes, double quotes, and dollar signs.
 +      # These are the only characters that are still specially
 +      # interpreted inside of double-quoted scrings.
 +      lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
 +
 +      # Double-quote args containing other shell metacharacters.
 +      # Many Bourne shells cannot handle close brackets correctly in scan
 +      # sets, so we specify it separately.
 +      case "$lastarg" in
 +      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
 +	lastarg="\"$lastarg\""
 +	;;
 +      esac
 +
 +      # Add the previous argument to base_compile.
 +      if test -z "$base_compile"; then
 +	base_compile="$lastarg"
 +      else
 +	base_compile="$base_compile $lastarg"
 +      fi
 +    done
 +
-     # Get the name of the library object.
-     libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
++    case "$user_target" in
++    set)
++      ;;
++    no)
++      # Get the name of the library object.
++      libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
++      ;;
++    *)
++      $echo "$modename: you must specify a target with \`-o'" 1>&2
++      exit 1
++      ;;
++    esac
 +
 +    # Recognize several different file suffixes.
-     xform='[cCFSfms]'
++    # If the user specifies -o file.o, it is replaced with file.lo
++    xform='[cCFSfmso]'
 +    case "$libobj" in
 +    *.ada) xform=ada ;;
 +    *.adb) xform=adb ;;
 +    *.ads) xform=ads ;;
 +    *.asm) xform=asm ;;
 +    *.c++) xform=c++ ;;
 +    *.cc) xform=cc ;;
 +    *.cpp) xform=cpp ;;
 +    *.cxx) xform=cxx ;;
 +    *.f90) xform=f90 ;;
 +    *.for) xform=for ;;
 +    esac
 +
 +    libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
 +
 +    case "$libobj" in
-     *.lo) obj=`$echo "X$libobj" | $Xsed -e 's/\.lo$/.o/'` ;;
++    *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
 +    *)
-       $echo "$modename: cannot determine name of library object from \`$srcfile'" 1>&2
++      $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
 +      exit 1
 +      ;;
 +    esac
 +
 +    if test -z "$base_compile"; then
 +      $echo "$modename: you must specify a compilation command" 1>&2
 +      $echo "$help" 1>&2
 +      exit 1
 +    fi
 +
 +    # Delete any leftover library objects.
 +    if test "$build_old_libs" = yes; then
-       $run $rm $obj $libobj
-       trap "$run $rm $obj $libobj; exit 1" 1 2 15
++      removelist="$obj $libobj"
++    else
++      removelist="$libobj"
++    fi
++
++    $run $rm $removelist
++    trap "$run $rm $removelist; exit 1" 1 2 15
++
++    # Calculate the filename of the output object if compiler does
++    # not support -o with -c
++    if test "$compiler_c_o" = no; then
++      output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\..*$%%'`.${objext}
++      lockfile="$output_obj.lock"
++      removelist="$removelist $output_obj $lockfile"
++      trap "$run $rm $removelist; exit 1" 1 2 15
 +    else
-       $run $rm $libobj
-       trap "$run $rm $libobj; exit 1" 1 2 15
++      need_locks=no
++      lockfile=
++    fi
++
++    # Lock this critical section if it is needed
++    # We use this script file to make the link, it avoids creating a new file
++    if test "$need_locks" = yes; then
++      until ln "$0" "$lockfile" 2>/dev/null; do
++	$show "Waiting for $lockfile to be removed"
++	sleep 2
++      done
++    elif test "$need_locks" = warn; then
++      if test -f "$lockfile"; then
++	echo "\
++*** ERROR, $lockfile exists and contains:
++`cat $lockfile 2>/dev/null`
++
++This indicates that another process is trying to use the same
++temporary object file, and libtool could not work around it because
++your compiler does not support \`-c' and \`-o' together.  If you
++repeat this compilation, it may succeed, by chance, but you had better
++avoid parallel builds (make -j) in this platform, or get a better
++compiler."
++
++	$run $rm $removelist
++	exit 1
++      fi
++      echo $srcfile > "$lockfile"
++    fi
++
++    if test -n "$fix_srcfile_path"; then
++      eval srcfile=\"$fix_srcfile_path\"
 +    fi
 +
 +    # Only build a PIC object if we are building libtool libraries.
 +    if test "$build_libtool_libs" = yes; then
 +      # Without this assignment, base_compile gets emptied.
 +      fbsd_hideous_sh_bug=$base_compile
 +
 +      # All platforms use -DPIC, to notify preprocessed assembler code.
-       $show "$base_compile$pic_flag -DPIC $srcfile"
-       if $run eval "$base_compile\$pic_flag -DPIC \$srcfile"; then :
++      command="$base_compile $pic_flag -DPIC $srcfile"
++      if test "$build_old_libs" = yes; then
++	lo_libobj="$libobj"
++	dir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'`
++	if test "X$dir" = "X$libobj"; then
++	  dir="$objdir"
++	else
++	  dir="$dir/$objdir"
++	fi
++	libobj="$dir/"`$echo "X$libobj" | $Xsed -e 's%^.*/%%'`
++
++	if test -d "$dir"; then
++	  $show "$rm $libobj"
++	  $run $rm $libobj
++	else
++	  $show "$mkdir $dir"
++	  $run $mkdir $dir
++	  status=$?
++	  if test $status -ne 0 && test ! -d $dir; then
++	    exit $status
++	  fi
++	fi
++      fi
++      if test "$compiler_o_lo" = yes; then
++	output_obj="$libobj"
++	command="$command -o $output_obj"
++      elif test "$compiler_c_o" = yes; then
++	output_obj="$obj"
++	command="$command -o $output_obj"
++      fi
++
++      $run $rm "$output_obj"
++      $show "$command"
++      if $run eval "$command"; then :
 +      else
-         test -n "$obj" && $run $rm $obj
-         exit 1
++	test -n "$output_obj" && $run $rm $removelist
++	exit 1
 +      fi
 +
-       # If we have no pic_flag, then copy the object into place and finish.
-       if test -z "$pic_flag"; then
-         $show "$LN_S $obj $libobj"
-         $run $LN_S $obj $libobj
-         exit $?
++      if test "$need_locks" = warn &&
++	 test x"`cat $lockfile 2>/dev/null`" != x"$srcfile"; then
++	echo "\
++*** ERROR, $lockfile contains:
++`cat $lockfile 2>/dev/null`
++
++but it should contain:
++$srcfile
++
++This indicates that another process is trying to use the same
++temporary object file, and libtool could not work around it because
++your compiler does not support \`-c' and \`-o' together.  If you
++repeat this compilation, it may succeed, by chance, but you had better
++avoid parallel builds (make -j) in this platform, or get a better
++compiler."
++
++	$run $rm $removelist
++	exit 1
 +      fi
 +
-       # Just move the object, then go on to compile the next one
-       $show "$mv $obj $libobj"
-       $run $mv $obj $libobj || exit 1
++      # Just move the object if needed, then go on to compile the next one
++      if test x"$output_obj" != x"$libobj"; then
++	$show "$mv $output_obj $libobj"
++	if $run $mv $output_obj $libobj; then :
++	else
++	  error=$?
++	  $run $rm $removelist
++	  exit $error
++	fi
++      fi
++
++      # If we have no pic_flag, then copy the object into place and finish.
++      if test -z "$pic_flag" && test "$build_old_libs" = yes; then
++	# Rename the .lo from within objdir to obj
++	if test -f $obj; then
++	  $show $rm $obj
++	  $run $rm $obj
++	fi
++
++	$show "$mv $libobj $obj"
++	if $run $mv $libobj $obj; then :
++	else
++	  error=$?
++	  $run $rm $removelist
++	  exit $error
++	fi
++
++	# Now arrange that obj and lo_libobj become the same file
++	$show "$LN_S $obj $lo_libobj"
++	if $run $LN_S $obj $lo_libobj; then
++	  exit 0
++	else
++	  error=$?
++	  $run $rm $removelist
++	  exit $error
++	fi
++      fi
 +
 +      # Allow error messages only from the first compilation.
 +      suppress_output=' >/dev/null 2>&1'
 +    fi
 +
 +    # Only build a position-dependent object if we build old libraries.
 +    if test "$build_old_libs" = yes; then
++      command="$base_compile $srcfile"
++      if test "$compiler_c_o" = yes; then
++	command="$command -o $obj"
++	output_obj="$obj"
++      fi
++
 +      # Suppress compiler output if we already did a PIC compilation.
-       $show "$base_compile $srcfile$suppress_output"
-       if $run eval "$base_compile \$srcfile$suppress_output"; then :
++      command="$command$suppress_output"
++      $run $rm "$output_obj"
++      $show "$command"
++      if $run eval "$command"; then :
++      else
++	$run $rm $removelist
++	exit 1
++      fi
++
++      if test "$need_locks" = warn &&
++	 test x"`cat $lockfile 2>/dev/null`" != x"$srcfile"; then
++	echo "\
++*** ERROR, $lockfile contains:
++`cat $lockfile 2>/dev/null`
++
++but it should contain:
++$srcfile
++
++This indicates that another process is trying to use the same
++temporary object file, and libtool could not work around it because
++your compiler does not support \`-c' and \`-o' together.  If you
++repeat this compilation, it may succeed, by chance, but you had better
++avoid parallel builds (make -j) in this platform, or get a better
++compiler."
++
++	$run $rm $removelist
++	exit 1
++      fi
++
++      # Just move the object if needed
++      if test x"$output_obj" != x"$obj"; then
++	$show "$mv $output_obj $obj"
++	if $run $mv $output_obj $obj; then :
++	else
++	  error=$?
++	  $run $rm $removelist
++	  exit $error
++	fi
++      fi
++
++      # Create an invalid libtool object if no PIC, so that we do not
++      # accidentally link it into a program.
++      if test "$build_libtool_libs" != yes; then
++	$show "echo timestamp > $libobj"
++	$run eval "echo timestamp > \$libobj" || exit $?
 +      else
-         $run $rm $obj $libobj
-         exit 1
++	# Move the .lo from within objdir
++	$show "$mv $libobj $lo_libobj"
++	if $run $mv $libobj $lo_libobj; then :
++	else
++	  error=$?
++	  $run $rm $removelist
++	  exit $error
++	fi
 +      fi
 +    fi
 +
-     # Create an invalid libtool object if no PIC, so that we do not
-     # accidentally link it into a program.
-     if test "$build_libtool_libs" != yes; then
-       $show "echo timestamp > $libobj"
-       $run eval "echo timestamp > \$libobj" || exit $?
++    # Unlock the critical section if it was locked
++    if test "$need_locks" != no; then
++      $rm "$lockfile"
 +    fi
 +
 +    exit 0
 +    ;;
 +
 +  # libtool link mode
 +  link)
 +    modename="$modename: link"
++    C_compiler="$CC" # save it, to compile generated C sources
 +    CC="$nonopt"
-     allow_undefined=yes
++    case "$host" in
++    *-*-cygwin* | *-*-mingw* | *-*-os2*)
++      # It is impossible to link a dll without this setting, and
++      # we shouldn't force the makefile maintainer to figure out
++      # which system we are compiling for in order to pass an extra
++      # flag for every libtool invokation.
++      # allow_undefined=no
++
++      # FIXME: Unfortunately, there are problems with the above when trying
++      # to make a dll which has undefined symbols, in which case not
++      # even a static library is built.  For now, we need to specify
++      # -no-undefined on the libtool link line when we can be certain
++      # that all symbols are satisfied, otherwise we get a static library.
++      allow_undefined=yes
++
++      # This is a source program that is used to create dlls on Windows
++      # Don't remove nor modify the starting and closing comments
++# /* ltdll.c starts here */
++# #define WIN32_LEAN_AND_MEAN
++# #include <windows.h>
++# #undef WIN32_LEAN_AND_MEAN
++# #include <stdio.h>
++#
++# #ifndef __CYGWIN__
++# #  ifdef __CYGWIN32__
++# #    define __CYGWIN__ __CYGWIN32__
++# #  endif
++# #endif
++#
++# #ifdef __cplusplus
++# extern "C" {
++# #endif
++# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
++# #ifdef __cplusplus
++# }
++# #endif
++#
++# #ifdef __CYGWIN__
++# #include <cygwin/cygwin_dll.h>
++# DECLARE_CYGWIN_DLL( DllMain );
++# #endif
++# HINSTANCE __hDllInstance_base;
++#
++# BOOL APIENTRY
++# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
++# {
++#   __hDllInstance_base = hInst;
++#   return TRUE;
++# }
++# /* ltdll.c ends here */
++      # This is a source program that is used to create import libraries
++      # on Windows for dlls which lack them. Don't remove nor modify the
++      # starting and closing comments
++# /* impgen.c starts here */
++# /*   Copyright (C) 1999 Free Software Foundation, Inc.
++# 
++#  This file is part of GNU libtool.
++# 
++#  This program is free software; you can redistribute it and/or modify
++#  it under the terms of the GNU General Public License as published by
++#  the Free Software Foundation; either version 2 of the License, or
++#  (at your option) any later version.
++# 
++#  This program is distributed in the hope that it will be useful,
++#  but WITHOUT ANY WARRANTY; without even the implied warranty of
++#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++#  GNU General Public License for more details.
++# 
++#  You should have received a copy of the GNU General Public License
++#  along with this program; if not, write to the Free Software
++#  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++#  */
++# 
++#  #include <stdio.h>		/* for printf() */
++#  #include <unistd.h>		/* for open(), lseek(), read() */
++#  #include <fcntl.h>		/* for O_RDONLY, O_BINARY */
++#  #include <string.h>		/* for strdup() */
++# 
++#  static unsigned int
++#  pe_get16 (fd, offset)
++#       int fd;
++#       int offset;
++#  {
++#    unsigned char b[2];
++#    lseek (fd, offset, SEEK_SET);
++#    read (fd, b, 2);
++#    return b[0] + (b[1]<<8);
++#  }
++# 
++#  static unsigned int
++#  pe_get32 (fd, offset)
++#      int fd;
++#      int offset;
++#  {
++#    unsigned char b[4];
++#    lseek (fd, offset, SEEK_SET);
++#    read (fd, b, 4);
++#    return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
++#  }
++# 
++#  static unsigned int
++#  pe_as32 (ptr)
++#       void *ptr;
++#  {
++#    unsigned char *b = ptr;
++#    return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
++#  }
++# 
++#  int
++#  main (argc, argv)
++#      int argc;
++#      char *argv[];
++#  {
++#      int dll;
++#      unsigned long pe_header_offset, opthdr_ofs, num_entries, i;
++#      unsigned long export_rva, export_size, nsections, secptr, expptr;
++#      unsigned long name_rvas, nexp;
++#      unsigned char *expdata, *erva;
++#      char *filename, *dll_name;
++# 
++#      filename = argv[1];
++# 
++#      dll = open(filename, O_RDONLY|O_BINARY);
++#      if (!dll)
++#  	return 1;
++# 
++#      dll_name = filename;
++#    
++#      for (i=0; filename[i]; i++)
++#  	if (filename[i] == '/' || filename[i] == '\\'  || filename[i] == ':')
++#  	    dll_name = filename + i +1;
++# 
++#      pe_header_offset = pe_get32 (dll, 0x3c);
++#      opthdr_ofs = pe_header_offset + 4 + 20;
++#      num_entries = pe_get32 (dll, opthdr_ofs + 92);
++# 
++#      if (num_entries < 1) /* no exports */
++#  	return 1;
++# 
++#      export_rva = pe_get32 (dll, opthdr_ofs + 96);
++#      export_size = pe_get32 (dll, opthdr_ofs + 100);
++#      nsections = pe_get16 (dll, pe_header_offset + 4 +2);
++#      secptr = (pe_header_offset + 4 + 20 +
++#  	      pe_get16 (dll, pe_header_offset + 4 + 16));
++# 
++#      expptr = 0;
++#      for (i = 0; i < nsections; i++)
++#      {
++#  	char sname[8];
++#  	unsigned long secptr1 = secptr + 40 * i;
++#  	unsigned long vaddr = pe_get32 (dll, secptr1 + 12);
++#  	unsigned long vsize = pe_get32 (dll, secptr1 + 16);
++#  	unsigned long fptr = pe_get32 (dll, secptr1 + 20);
++#  	lseek(dll, secptr1, SEEK_SET);
++#  	read(dll, sname, 8);
++#  	if (vaddr <= export_rva && vaddr+vsize > export_rva)
++#  	{
++#  	    expptr = fptr + (export_rva - vaddr);
++#  	    if (export_rva + export_size > vaddr + vsize)
++#  		export_size = vsize - (export_rva - vaddr);
++#  	    break;
++#  	}
++#      }
++# 
++#      expdata = (unsigned char*)malloc(export_size);
++#      lseek (dll, expptr, SEEK_SET);
++#      read (dll, expdata, export_size);
++#      erva = expdata - export_rva;
++# 
++#      nexp = pe_as32 (expdata+24);
++#      name_rvas = pe_as32 (expdata+32);
++# 
++#      printf ("EXPORTS\n");
++#      for (i = 0; i<nexp; i++)
++#      {
++#  	unsigned long name_rva = pe_as32 (erva+name_rvas+i*4);
++#  	printf ("\t%s @ %ld ;\n", erva+name_rva, 1+ i);
++#      }
++# 
++#      return 0;
++#  }
++# /* impgen.c ends here */
++      ;;
++    *)
++      allow_undefined=yes
++      ;;
++    esac
 +    compile_command="$CC"
 +    finalize_command="$CC"
 +
++    compile_rpath=
++    finalize_rpath=
 +    compile_shlibpath=
 +    finalize_shlibpath=
++    convenience=
++    old_convenience=
 +    deplibs=
++    linkopts=
++
++    if test -n "$shlibpath_var"; then
++      # get the directories listed in $shlibpath_var
++      eval lib_search_path=\`\$echo \"X \${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
++    else
++      lib_search_path=
++    fi
++    # now prepend the system-specific ones
++    eval lib_search_path=\"$sys_lib_search_path_spec\$lib_search_path\"
++    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
++    
++    avoid_version=no
 +    dlfiles=
 +    dlprefiles=
++    dlself=no
 +    export_dynamic=no
-     hardcode_libdirs=
++    export_symbols=
++    export_symbols_regex=
++    generated=
 +    libobjs=
 +    link_against_libtool_libs=
 +    ltlibs=
++    module=no
 +    objs=
++    prefer_static_libs=no
++    preload=no
 +    prev=
 +    prevarg=
 +    release=
 +    rpath=
++    xrpath=
 +    perm_rpath=
 +    temp_rpath=
++    thread_safe=no
 +    vinfo=
 +
 +    # We need to know -static, to get the right output filenames.
 +    for arg
 +    do
 +      case "$arg" in
 +      -all-static | -static)
-         if test "X$arg" = "X-all-static" && test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
++	if test "X$arg" = "X-all-static"; then
++	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
 +	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
-         fi
-         build_libtool_libs=no
++	  fi
++	  if test -n "$link_static_flag"; then
++	    dlopen_self=$dlopen_self_static
++	  fi
++	else
++	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
++	    dlopen_self=$dlopen_self_static
++	  fi
++	fi
++	build_libtool_libs=no
 +	build_old_libs=yes
-         break
-         ;;
++	prefer_static_libs=yes
++	break
++	;;
 +      esac
 +    done
 +
 +    # See if our shared archives depend on static archives.
 +    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
 +
 +    # Go through the arguments, transforming them on the way.
-     for arg
-     do
++    while test $# -gt 0; do
++      arg="$1"
++      shift
++
 +      # If the previous option needs an argument, assign it.
 +      if test -n "$prev"; then
-         case "$prev" in
-         output)
-           compile_command="$compile_command @OUTPUT@"
-           finalize_command="$finalize_command @OUTPUT@"
-           ;;
-         esac
- 
-         case "$prev" in
-         dlfiles|dlprefiles)
-           case "$arg" in
-           *.la | *.lo) ;;  # We handle these cases below.
-           *)
-             dlprefiles="$dlprefiles $arg"
-             test "$prev" = dlfiles && dlfiles="$dlfiles $arg"
-             prev=
-             ;;
-           esac
-           ;;
++	case "$prev" in
++	output)
++	  compile_command="$compile_command @OUTPUT@"
++	  finalize_command="$finalize_command @OUTPUT@"
++	  ;;
++	esac
++
++	case "$prev" in
++	dlfiles|dlprefiles)
++	  if test "$preload" = no; then
++	    # Add the symbol object into the linking commands.
++	    compile_command="$compile_command @SYMFILE@"
++	    finalize_command="$finalize_command @SYMFILE@"
++	    preload=yes
++	  fi
++	  case "$arg" in
++	  *.la | *.lo) ;;  # We handle these cases below.
++	  force)
++	    if test "$dlself" = no; then
++	      dlself=needless
++	      export_dynamic=yes
++	    fi
++	    prev=
++	    continue
++	    ;;
++	  self)
++	    if test "$prev" = dlprefiles; then
++	      dlself=yes
++	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
++	      dlself=yes
++	    else
++	      dlself=needless
++	      export_dynamic=yes
++	    fi
++	    prev=
++	    continue
++	    ;;
++	  *)
++	    if test "$prev" = dlfiles; then
++	      dlfiles="$dlfiles $arg"
++	    else
++	      dlprefiles="$dlprefiles $arg"
++	    fi
++	    prev=
++	    ;;
++	  esac
++	  ;;
++	expsyms)
++	  export_symbols="$arg"
++	  if test ! -f "$arg"; then
++	    $echo "$modename: symbol file \`$arg' does not exist"
++	    exit 1
++	  fi
++	  prev=
++	  continue
++	  ;;
++	expsyms_regex)
++	  export_symbols_regex="$arg"
++	  prev=
++	  continue
++	  ;;
 +	release)
 +	  release="-$arg"
 +	  prev=
 +	  continue
 +	  ;;
-         rpath)
-           rpath="$rpath $arg"
++	rpath | xrpath)
++	  # We need an absolute path.
++	  case "$arg" in
++	  [\\/]* | [A-Za-z]:[\\/]*) ;;
++	  *)
++	    $echo "$modename: only absolute run-paths are allowed" 1>&2
++	    exit 1
++	    ;;
++	  esac
++	  if test "$prev" = rpath; then
++	    case "$rpath " in
++	    *" $arg "*) ;;
++	    *) rpath="$rpath $arg" ;;
++	    esac
++	  else
++	    case "$xrpath " in
++	    *" $arg "*) ;;
++	    *) xrpath="$xrpath $arg" ;;
++	    esac
++	  fi
++	  prev=
++	  continue
++	  ;;
++	*)
++	  eval "$prev=\"\$arg\""
 +	  prev=
 +	  continue
 +	  ;;
-         *)
-           eval "$prev=\"\$arg\""
-           prev=
-           continue
-           ;;
-         esac
++	esac
 +      fi
 +
 +      prevarg="$arg"
 +
 +      case "$arg" in
 +      -all-static)
 +	if test -n "$link_static_flag"; then
-           compile_command="$compile_command $link_static_flag"
++	  compile_command="$compile_command $link_static_flag"
 +	  finalize_command="$finalize_command $link_static_flag"
-         fi
-         continue
++	fi
++	continue
 +	;;
 +
 +      -allow-undefined)
 +	# FIXME: remove this flag sometime in the future.
 +	$echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2
 +	continue
 +	;;
 +
++      -avoid-version)
++	avoid_version=yes
++	continue
++	;;
++
 +      -dlopen)
-         prev=dlfiles
-         continue
-         ;;
++	prev=dlfiles
++	continue
++	;;
 +
 +      -dlpreopen)
-         prev=dlprefiles
-         continue
-         ;;
++	prev=dlprefiles
++	continue
++	;;
 +
 +      -export-dynamic)
-         if test "$export_dynamic" != yes; then
-           export_dynamic=yes
- 	  if test -n "$export_dynamic_flag_spec"; then
- 	    eval arg=\"$export_dynamic_flag_spec\"
- 	  else
- 	    arg=
- 	  fi
++	export_dynamic=yes
++	continue
++	;;
 +
-           # Add the symbol object into the linking commands.
- 	  compile_command="$compile_command @SYMFILE@"
- 	  finalize_command="$finalize_command @SYMFILE@"
-         fi
-         ;;
++      -export-symbols | -export-symbols-regex)
++	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
++	  $echo "$modename: not more than one -exported-symbols argument allowed"
++	  exit 1
++	fi
++	if test "X$arg" = "X-export-symbols"; then
++	  prev=expsyms
++	else
++	  prev=expsyms_regex
++	fi
++	continue
++	;;
 +
 +      -L*)
-         dir=`$echo "X$arg" | $Xsed -e 's%^-L\(.*\)$%\1%'`
-         case "$dir" in
-         /* | [A-Za-z]:\\*)
- 	  # Add the corresponding hardcode_libdir_flag, if it is not identical.
-           ;;
-         *)
-           $echo "$modename: \`-L$dir' cannot specify a relative directory" 1>&2
-           exit 1
-           ;;
-         esac
-         deplibs="$deplibs $arg"
-         ;;
- 
-       -l*) deplibs="$deplibs $arg" ;;
++	dir=`$echo "X$arg" | $Xsed -e 's/^-L//'`
++	# We need an absolute path.
++	case "$dir" in
++	[\\/]* | [A-Za-z]:[\\/]*) ;;
++	*)
++	  absdir=`cd "$dir" && pwd`
++	  if test -z "$absdir"; then
++	    $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2
++	    $echo "$modename: passing it literally to the linker, although it might fail" 1>&2
++	    absdir="$dir"
++	  fi
++	  dir="$absdir"
++	  ;;
++	esac
++	case " $deplibs " in
++	*" $arg "*) ;;
++	*) deplibs="$deplibs $arg";;
++	esac
++	case " $lib_search_path " in
++	*" $dir "*) ;;
++	*) lib_search_path="$lib_search_path $dir";;
++	esac
++	case "$host" in
++	*-*-cygwin* | *-*-mingw* | *-*-os2*)
++	  dllsearchdir=`cd "$dir" && pwd || echo "$dir"`
++	  case ":$dllsearchpath:" in
++	  ::) dllsearchpath="$dllsearchdir";;
++	  *":$dllsearchdir:"*) ;;
++	  *) dllsearchpath="$dllsearchpath:$dllsearchdir";;
++	  esac
++	  ;;
++	esac
++	;;
++
++      -l*)
++	if test "$arg" = "-lc"; then
++	  case "$host" in
++	  *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
++	    # These systems don't actually have c library (as such)
++	    continue
++	    ;;
++	  esac
++	elif test "$arg" = "-lm"; then
++	  case "$host" in
++	  *-*-cygwin* | *-*-beos*)
++	    # These systems don't actually have math library (as such)
++	    continue
++	    ;;
++	  esac
++	fi
++	deplibs="$deplibs $arg"
++	;;
++
++      -module)
++	module=yes
++	continue
++	;;
 +
 +      -no-undefined)
 +	allow_undefined=no
 +	continue
 +	;;
 +
 +      -o) prev=output ;;
 +
 +      -release)
 +	prev=release
 +	continue
 +	;;
 +
 +      -rpath)
-         prev=rpath
-         continue
-         ;;
- 
-       -static)
- 	# If we have no pic_flag, then this is the same as -all-static.
- 	if test -z "$pic_flag" && test -n "$link_static_flag"; then
-           compile_command="$compile_command $link_static_flag"
- 	  finalize_command="$finalize_command $link_static_flag"
-         fi
++	prev=rpath
 +	continue
 +	;;
 +
-       -version-info)
-         prev=vinfo
-         continue
-         ;;
++      -R)
++	prev=xrpath
++	continue
++	;;
 +
-       # Some other compiler flag.
-       -* | +*)
++      -R*)
++	dir=`$echo "X$arg" | $Xsed -e 's/^-R//'`
++	# We need an absolute path.
++	case "$dir" in
++	[\\/]* | [A-Za-z]:[\\/]*) ;;
++	*)
++	  $echo "$modename: only absolute run-paths are allowed" 1>&2
++	  exit 1
++	  ;;
++	esac
++	case "$xrpath " in
++	*" $dir "*) ;;
++	*) xrpath="$xrpath $dir" ;;
++	esac
++	continue
++	;;
++
++      -static)
++	# If we have no pic_flag, then this is the same as -all-static.
++	if test -z "$pic_flag" && test -n "$link_static_flag"; then
++	  compile_command="$compile_command $link_static_flag"
++	  finalize_command="$finalize_command $link_static_flag"
++	fi
++	continue
++	;;
++
++      -thread-safe)
++	thread_safe=yes
++	continue
++	;;
++
++      -version-info)
++	prev=vinfo
++	continue
++	;;
++
++      # Some other compiler flag.
++      -* | +*)
 +	# Unknown arguments in both finalize_command and compile_command need
 +	# to be aesthetically quoted because they are evaled later.
 +	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
 +	case "$arg" in
 +	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
 +	  arg="\"$arg\""
 +	  ;;
 +	esac
-         ;;
++	;;
 +
-       *.o | *.a)
-         # A standard object.
-         objs="$objs $arg"
-         ;;
++      *.o | *.obj | *.a | *.lib)
++	# A standard object.
++	objs="$objs $arg"
++	;;
 +
 +      *.lo)
-         # A library object.
++	# A library object.
 +	if test "$prev" = dlfiles; then
 +	  dlfiles="$dlfiles $arg"
- 	  if test "$build_libtool_libs" = yes; then
++	  if test "$build_libtool_libs" = yes && test "$dlopen" = yes; then
 +	    prev=
 +	    continue
 +	  else
 +	    # If libtool objects are unsupported, then we need to preload.
 +	    prev=dlprefiles
 +	  fi
 +	fi
 +
 +	if test "$prev" = dlprefiles; then
 +	  # Preload the old-style object.
- 	  dlprefiles="$dlprefiles "`$echo "X$arg" | $Xsed -e 's/\.lo$/\.o/'`
++	  dlprefiles="$dlprefiles "`$echo "X$arg" | $Xsed -e "$lo2o"`
 +	  prev=
 +	fi
 +	libobjs="$libobjs $arg"
-         ;;
++	;;
 +
 +      *.la)
-         # A libtool-controlled library.
- 
-         dlname=
-         libdir=
-         library_names=
-         old_library=
- 
-         # Check to see that this really is a libtool archive.
-         if (sed -e '2q' $arg | egrep '^# Generated by ltmain\.sh') >/dev/null 2>&1; then :
-         else
-           $echo "$modename: \`$arg' is not a valid libtool archive" 1>&2
-           exit 1
-         fi
- 
-         # If there is no directory component, then add one.
-         case "$arg" in
-         */* | *\\*) . $arg ;;
-         *) . ./$arg ;;
-         esac
- 
-         if test -z "$libdir"; then
-           $echo "$modename: \`$arg' contains no -rpath information" 1>&2
-           exit 1
-         fi
- 
-         # Get the name of the library we link against.
-         linklib=
-         for l in $old_library $library_names; do
-           linklib="$l"
-         done
- 
-         if test -z "$linklib"; then
-           $echo "$modename: cannot find name of link library for \`$arg'" 1>&2
-           exit 1
-         fi
- 
-         # Find the relevant object directory and library name.
-         name=`$echo "X$arg" | $Xsed -e 's%^.*/%%' -e 's/\.la$//' -e 's/^lib//'`
-         dir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-         if test "X$dir" = "X$arg"; then
-           dir="$objdir"
-         else
-           dir="$dir/$objdir"
-         fi
- 
-         # This library was specified with -dlopen.
-         if test "$prev" = dlfiles; then
-           dlfiles="$dlfiles $arg"
-           if test -z "$dlname"; then
-             # If there is no dlname, we need to preload.
-             prev=dlprefiles
-           else
-             # We should not create a dependency on this library, but we
++	# A libtool-controlled library.
++
++	dlname=
++	libdir=
++	library_names=
++	old_library=
++
++	# Check to see that this really is a libtool archive.
++	if (sed -e '2q' $arg | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
++	else
++	  $echo "$modename: \`$arg' is not a valid libtool archive" 1>&2
++	  exit 1
++	fi
++
++	# If the library was installed with an old release of libtool,
++	# it will not redefine variable installed.
++	installed=yes
++
++	# Read the .la file
++	# If there is no directory component, then add one.
++	case "$arg" in
++	*/* | *\\*) . $arg ;;
++	*) . ./$arg ;;
++	esac
++
++	# Get the name of the library we link against.
++	linklib=
++	for l in $old_library $library_names; do
++	  linklib="$l"
++	done
++
++	if test -z "$linklib"; then
++	  $echo "$modename: cannot find name of link library for \`$arg'" 1>&2
++	  exit 1
++	fi
++
++	# Find the relevant object directory and library name.
++	name=`$echo "X$arg" | $Xsed -e 's%^.*/%%' -e 's/\.la$//' -e 's/^lib//'`
++
++	if test "X$installed" = Xyes; then
++	  dir="$libdir"
++	else
++	  dir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
++	  if test "X$dir" = "X$arg"; then
++	    dir="$objdir"
++	  else
++	    dir="$dir/$objdir"
++	  fi
++	fi
++
++	if test -n "$dependency_libs"; then
++	  # Extract -R and -L from dependency_libs
++	  temp_deplibs=
++	  for deplib in $dependency_libs; do
++	    case "$deplib" in
++	    -R*) temp_xrpath=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
++		 case " $rpath $xrpath " in
++		 *" $temp_xrpath "*) ;;
++		 *) xrpath="$xrpath $temp_xrpath";;
++		 esac;;
++	    -L*) case "$compile_command $temp_deplibs " in
++		 *" $deplib "*) ;;
++		 *) temp_deplibs="$temp_deplibs $deplib";;
++		 esac
++		 temp_dir=`$echo "X$deplib" | $Xsed -e 's/^-L//'`
++		 case " $lib_search_path " in
++		 *" $temp_dir "*) ;;
++		 *) lib_search_path="$lib_search_path $temp_dir";;
++		 esac
++		 ;;
++	    *) temp_deplibs="$temp_deplibs $deplib";;
++	    esac
++	  done
++	  dependency_libs="$temp_deplibs"
++	fi
++
++	if test -z "$libdir"; then
++	  # It is a libtool convenience library, so add in its objects.
++	  convenience="$convenience $dir/$old_library"
++	  old_convenience="$old_convenience $dir/$old_library"
++	  deplibs="$deplibs$dependency_libs"
++	  compile_command="$compile_command $dir/$old_library$dependency_libs"
++	  finalize_command="$finalize_command $dir/$old_library$dependency_libs"
++	  continue
++	fi
++
++	# This library was specified with -dlopen.
++	if test "$prev" = dlfiles; then
++	  dlfiles="$dlfiles $arg"
++	  if test -z "$dlname" || test "$dlopen" != yes || test "$build_libtool_libs" = no; then
++	    # If there is no dlname, no dlopen support or we're linking statically,
++	    # we need to preload.
++	    prev=dlprefiles
++	  else
++	    # We should not create a dependency on this library, but we
 +	    # may need any libraries it requires.
 +	    compile_command="$compile_command$dependency_libs"
 +	    finalize_command="$finalize_command$dependency_libs"
-             prev=
-             continue
-           fi
-         fi
- 
-         # The library was specified with -dlpreopen.
-         if test "$prev" = dlprefiles; then
-           # Prefer using a static library (so that no silly _DYNAMIC symbols
-           # are required to link).
-           if test -n "$old_library"; then
-             dlprefiles="$dlprefiles $dir/$old_library"
-           else
-             dlprefiles="$dlprefiles $dir/$linklib"
-           fi
-           prev=
-         fi
- 
-         if test "$build_libtool_libs" = yes && test -n "$library_names"; then
-           link_against_libtool_libs="$link_against_libtool_libs $arg"
-           if test -n "$shlibpath_var"; then
-             # Make sure the rpath contains only unique directories.
-             case "$temp_rpath " in
-             *" $dir "*) ;;
-             *) temp_rpath="$temp_rpath $dir" ;;
-             esac
-           fi
++	    prev=
++	    continue
++	  fi
++	fi
++
++	# The library was specified with -dlpreopen.
++	if test "$prev" = dlprefiles; then
++	  # Prefer using a static library (so that no silly _DYNAMIC symbols
++	  # are required to link).
++	  if test -n "$old_library"; then
++	    dlprefiles="$dlprefiles $dir/$old_library"
++	  else
++	    dlprefiles="$dlprefiles $dir/$linklib"
++	  fi
++	  prev=
++	fi
++
++	if test -n "$library_names" &&
++	   { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
++	  link_against_libtool_libs="$link_against_libtool_libs $arg"
++	  if test -n "$shlibpath_var"; then
++	    # Make sure the rpath contains only unique directories.
++	    case "$temp_rpath " in
++	    *" $dir "*) ;;
++	    *) temp_rpath="$temp_rpath $dir" ;;
++	    esac
++	  fi
 +
++	  # We need an absolute path.
++	  case "$dir" in
++	  [\\/] | [A-Za-z]:[\\/]*) absdir="$dir" ;;
++	  *)
++	    absdir=`cd "$dir" && pwd`
++	    if test -z "$absdir"; then
++	      $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2
++	      $echo "$modename: passing it literally to the linker, although it might fail" 1>&2
++	      absdir="$dir"
++	    fi
++	    ;;
++	  esac
++	  
 +	  # This is the magic to use -rpath.
-           if test -n "$hardcode_libdir_flag_spec"; then
-             if test -n "$hardcode_libdir_separator"; then
-               if test -z "$hardcode_libdirs"; then
-                 # Put the magic libdir with the hardcode flag.
-                 hardcode_libdirs="$libdir"
-                 libdir="@HARDCODE_LIBDIRS@"
-               else
-                 # Just accumulate the unique libdirs.
- 		case "$hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator" in
- 		*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
- 		  ;;
- 		*)
- 		  hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
- 		  ;;
- 		esac
-                 libdir=
-               fi
-             fi
- 
-             if test -n "$libdir"; then
-               eval flag=\"$hardcode_libdir_flag_spec\"
- 
-               compile_command="$compile_command $flag"
-               finalize_command="$finalize_command $flag"
-             fi
-           elif test -n "$runpath_var"; then
-             # Do the same for the permanent run path.
-             case "$perm_rpath " in
-             *" $libdir "*) ;;
-             *) perm_rpath="$perm_rpath $libdir" ;;
-             esac
-           fi
- 
- 
-           case "$hardcode_action" in
-           immediate)
-             if test "$hardcode_direct" = no; then
-               compile_command="$compile_command $dir/$linklib"
-             elif test "$hardcode_minus_L" = no; then
-               compile_command="$compile_command -L$dir -l$name"
-             elif test "$hardcode_shlibpath_var" = no; then
-               compile_shlibpath="$compile_shlibpath$dir:"
-               compile_command="$compile_command -l$name"
-             fi
-             ;;
- 
-           relink)
-             # We need an absolute path.
-             case "$dir" in
-             /* | [A-Za-z]:\\*) ;;
-             *)
-               absdir=`cd "$dir" && pwd`
-               if test -z "$absdir"; then
-                 $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
-                 exit 1
-               fi
-               dir="$absdir"
-               ;;
-             esac
- 
-             if test "$hardcode_direct" = yes; then
-               compile_command="$compile_command $dir/$linklib"
-             elif test "$hardcode_minus_L" = yes; then
-               compile_command="$compile_command -L$dir -l$name"
-             elif test "$hardcode_shlibpath_var" = yes; then
-               compile_shlibpath="$compile_shlibpath$dir:"
-               compile_command="$compile_command -l$name"
-             fi
-             ;;
- 
-           *)
-             $echo "$modename: \`$hardcode_action' is an unknown hardcode action" 1>&2
-             exit 1
-             ;;
-           esac
- 
-           # Finalize command for both is simple: just hardcode it.
-           if test "$hardcode_direct" = yes; then
-             finalize_command="$finalize_command $libdir/$linklib"
-           elif test "$hardcode_minus_L" = yes; then
-             finalize_command="$finalize_command -L$libdir -l$name"
-           elif test "$hardcode_shlibpath_var" = yes; then
-             finalize_shlibpath="$finalize_shlibpath$libdir:"
-             finalize_command="$finalize_command -l$name"
-           else
-             # We cannot seem to hardcode it, guess we'll fake it.
-             finalize_command="$finalize_command -L$libdir -l$name"
-           fi
-         else
-           # Transform directly to old archives if we don't build new libraries.
-           if test -n "$pic_flag" && test -z "$old_library"; then
-             $echo "$modename: cannot find static library for \`$arg'" 1>&2
-             exit 1
-           fi
++	  # Skip directories that are in the system default run-time
++	  # search path, unless they have been requested with -R.
++	  case " $sys_lib_dlsearch_path " in
++	  *" $absdir "*) ;;
++	  *)
++	    case "$compile_rpath " in
++	    *" $absdir "*) ;;
++	    *) compile_rpath="$compile_rpath $absdir" 
++	    esac
++	    ;;
++	  esac
++
++	  case " $sys_lib_dlsearch_path " in
++	  *" $libdir "*) ;;
++	  *)
++	    case "$finalize_rpath " in
++	    *" $libdir "*) ;;
++	    *) finalize_rpath="$finalize_rpath $libdir"
++	    esac
++	    ;;
++	  esac
++
++	  lib_linked=yes
++	  case "$hardcode_action" in
++	  immediate | unsupported)
++	    if test "$hardcode_direct" = no; then
++	      compile_command="$compile_command $dir/$linklib"
++	      deplibs="$deplibs $dir/$linklib"
++	      case "$host" in
++	      *-*-cygwin* | *-*-mingw* | *-*-os2*)
++		dllsearchdir=`cd "$dir" && pwd || echo "$dir"`
++		if test -n "$dllsearchpath"; then
++		  dllsearchpath="$dllsearchpath:$dllsearchdir"
++		else
++		  dllsearchpath="$dllsearchdir"
++		fi
++		;;
++	      esac
++	    elif test "$hardcode_minus_L" = no; then
++	      case "$host" in
++	      *-*-sunos*)
++		compile_shlibpath="$compile_shlibpath$dir:"
++		;;
++	      esac
++	      case "$compile_command " in
++	      *" -L$dir "*) ;;
++	      *) compile_command="$compile_command -L$dir";;
++	      esac
++	      compile_command="$compile_command -l$name"
++	      deplibs="$deplibs -L$dir -l$name"
++	    elif test "$hardcode_shlibpath_var" = no; then
++	      case ":$compile_shlibpath:" in
++	      *":$dir:"*) ;;
++	      *) compile_shlibpath="$compile_shlibpath$dir:";;
++	      esac
++	      compile_command="$compile_command -l$name"
++	      deplibs="$deplibs -l$name"
++	    else
++	      lib_linked=no
++	    fi
++	    ;;
++
++	  relink)
++	    if test "$hardcode_direct" = yes; then
++	      compile_command="$compile_command $absdir/$linklib"
++	      deplibs="$deplibs $absdir/$linklib"
++	    elif test "$hardcode_minus_L" = yes; then
++	      case "$compile_command " in
++	      *" -L$absdir "*) ;;
++	      *) compile_command="$compile_command -L$absdir";;
++	      esac
++	      compile_command="$compile_command -l$name"
++	      deplibs="$deplibs -L$absdir -l$name"
++	    elif test "$hardcode_shlibpath_var" = yes; then
++	      case ":$compile_shlibpath:" in
++	      *":$absdir:"*) ;;
++	      *) compile_shlibpath="$compile_shlibpath$absdir:";;
++	      esac
++	      compile_command="$compile_command -l$name"
++	      deplibs="$deplibs -l$name"
++	    else
++	      lib_linked=no
++	    fi
++	    ;;
++
++	  *)
++	    lib_linked=no
++	    ;;
++	  esac
++
++	  if test "$lib_linked" != yes; then
++	    $echo "$modename: configuration error: unsupported hardcode properties"
++	    exit 1
++	  fi
++
++	  # Finalize command for both is simple: just hardcode it.
++	  if test "$hardcode_direct" = yes; then
++	    finalize_command="$finalize_command $libdir/$linklib"
++	  elif test "$hardcode_minus_L" = yes; then
++	    case "$finalize_command " in
++	    *" -L$libdir "*) ;;
++	    *) finalize_command="$finalize_command -L$libdir";;
++	    esac
++	    finalize_command="$finalize_command -l$name"
++	  elif test "$hardcode_shlibpath_var" = yes; then
++	    case ":$finalize_shlibpath:" in
++	    *":$libdir:"*) ;;
++	    *) finalize_shlibpath="$finalize_shlibpath$libdir:";;
++	    esac
++	    finalize_command="$finalize_command -l$name"
++	  else
++	    # We cannot seem to hardcode it, guess we'll fake it.
++	    case "$finalize_command " in
++	    *" -L$dir "*) ;;
++	    *) finalize_command="$finalize_command -L$libdir";;
++	    esac
++	    finalize_command="$finalize_command -l$name"
++	  fi
++	else
++	  # Transform directly to old archives if we don't build new libraries.
++	  if test -n "$pic_flag" && test -z "$old_library"; then
++	    $echo "$modename: cannot find static library for \`$arg'" 1>&2
++	    exit 1
++	  fi
 +
 +	  # Here we assume that one of hardcode_direct or hardcode_minus_L
 +	  # is not unsupported.  This is valid on all known static and
 +	  # shared platforms.
 +	  if test "$hardcode_direct" != unsupported; then
 +	    test -n "$old_library" && linklib="$old_library"
 +	    compile_command="$compile_command $dir/$linklib"
 +	    finalize_command="$finalize_command $dir/$linklib"
 +	  else
- 	    compile_command="$compile_command -L$dir -l$name"
- 	    finalize_command="$finalize_command -L$dir -l$name"
++	    case "$compile_command " in
++	    *" -L$dir "*) ;;
++	    *) compile_command="$compile_command -L$dir";;
++	    esac
++	    compile_command="$compile_command -l$name"
++	    case "$finalize_command " in
++	    *" -L$dir "*) ;;
++	    *) finalize_command="$finalize_command -L$dir";;
++	    esac
++	    finalize_command="$finalize_command -l$name"
 +	  fi
-         fi
++	fi
 +
 +	# Add in any libraries that this one depends upon.
 +	compile_command="$compile_command$dependency_libs"
 +	finalize_command="$finalize_command$dependency_libs"
 +	continue
-         ;;
++	;;
 +
 +      # Some other compiler argument.
 +      *)
 +	# Unknown arguments in both finalize_command and compile_command need
 +	# to be aesthetically quoted because they are evaled later.
 +	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
 +	case "$arg" in
 +	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
 +	  arg="\"$arg\""
 +	  ;;
 +	esac
-         ;;
++	;;
 +      esac
 +
 +      # Now actually substitute the argument into the commands.
 +      if test -n "$arg"; then
 +	compile_command="$compile_command $arg"
 +	finalize_command="$finalize_command $arg"
 +      fi
 +    done
 +
 +    if test -n "$prev"; then
 +      $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
 +      $echo "$help" 1>&2
 +      exit 1
 +    fi
 +
-     if test -n "$vinfo" && test -n "$release"; then
-       $echo "$modename: you cannot specify both \`-version-info' and \`-release'" 1>&2
-       $echo "$help" 1>&2
-       exit 1
++    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
++      eval arg=\"$export_dynamic_flag_spec\"
++      compile_command="$compile_command $arg"
++      finalize_command="$finalize_command $arg"
 +    fi
 +
-     oldlib=
-     oldobjs=
++    oldlibs=
++    # calculate the name of the file, without its directory
++    outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
++    libobjs_save="$libobjs"
++
 +    case "$output" in
 +    "")
 +      $echo "$modename: you must specify an output file" 1>&2
 +      $echo "$help" 1>&2
 +      exit 1
 +      ;;
 +
-     */* | *\\*)
-       $echo "$modename: output file \`$output' must have no directory components" 1>&2
-       exit 1
-       ;;
++    *.a | *.lib)
++      if test -n "$link_against_libtool_libs"; then
++	$echo "$modename: error: cannot link libtool libraries into archives" 1>&2
++	exit 1
++      fi
++
++      if test -n "$deplibs"; then
++	$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
++      fi
++
++      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
++	$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
++      fi
++
++      if test -n "$rpath"; then
++	$echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2
++      fi
++
++      if test -n "$xrpath"; then
++	$echo "$modename: warning: \`-R' is ignored for archives" 1>&2
++      fi
++
++      if test -n "$vinfo"; then
++	$echo "$modename: warning: \`-version-info' is ignored for archives" 1>&2
++      fi
++
++      if test -n "$release"; then
++	$echo "$modename: warning: \`-release' is ignored for archives" 1>&2
++      fi
++
++      if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
++	$echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2
++      fi
 +
-     *.a)
 +      # Now set the variables for building old libraries.
 +      build_libtool_libs=no
-       build_old_libs=yes
-       oldlib="$output"
-       $show "$rm $oldlib"
-       $run $rm $oldlib
++      oldlibs="$output"
 +      ;;
 +
 +    *.la)
 +      # Make sure we only generate libraries of the form `libNAME.la'.
-       case "$output" in
-       lib*) ;;
++      case "$outputname" in
++      lib*)
++	name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
++	eval libname=\"$libname_spec\"
++	;;
 +      *)
- 	$echo "$modename: libtool library \`$arg' must begin with \`lib'" 1>&2
- 	$echo "$help" 1>&2
- 	exit 1
++	if test "$module" = no; then
++	  $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
++	  $echo "$help" 1>&2
++	  exit 1
++	fi
++	if test "$need_lib_prefix" != no; then
++	  # Add the "lib" prefix for modules if required
++	  name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
++	  eval libname=\"$libname_spec\"
++	else
++	  libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
++	fi
 +	;;
 +      esac
 +
-       name=`$echo "X$output" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-       eval libname=\"$libname_spec\"
- 
-       # All the library-specific variables (install_libdir is set above).
-       library_names=
-       old_library=
-       dlname=
-       current=0
-       revision=0
-       age=0
++      output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
++      if test "X$output_objdir" = "X$output"; then
++	output_objdir="$objdir"
++      else
++	output_objdir="$output_objdir/$objdir"
++      fi
 +
 +      if test -n "$objs"; then
-         $echo "$modename: cannot build libtool library \`$output' from non-libtool objects:$objs" 2>&1
-         exit 1
++	$echo "$modename: cannot build libtool library \`$output' from non-libtool objects:$objs" 2>&1
++	exit 1
 +      fi
 +
 +      # How the heck are we supposed to write a wrapper for a shared library?
 +      if test -n "$link_against_libtool_libs"; then
-         $echo "$modename: libtool library \`$output' may not depend on uninstalled libraries:$link_against_libtool_libs" 1>&2
-         exit 1
-       fi
- 
-       if test -n "$dlfiles$dlprefiles"; then
-         $echo "$modename: warning: \`-dlopen' is ignored while creating libtool libraries" 1>&2
-         # Nullify the symbol file.
-         compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
-         finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
++	 $echo "$modename: error: cannot link shared libraries into libtool libraries" 1>&2
++	 exit 1
 +      fi
 +
-       if test -z "$rpath"; then
-         $echo "$modename: you must specify an installation directory with \`-rpath'" 1>&2
- 	$echo "$help" 1>&2
-         exit 1
++      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
++	$echo "$modename: warning: \`-dlopen' is ignored for libtool libraries" 1>&2
 +      fi
 +
 +      set dummy $rpath
 +      if test $# -gt 2; then
 +	$echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
 +      fi
 +      install_libdir="$2"
 +
-       # Parse the version information argument.
-       IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=':'
-       set dummy $vinfo
-       IFS="$save_ifs"
++      oldlibs=
++      if test -z "$rpath"; then
++	if test "$build_libtool_libs" = yes; then
++	  # Building a libtool convenience library.
++	  libext=al
++	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
++	  build_libtool_libs=convenience
++	  build_old_libs=yes
++	fi
++	dependency_libs="$deplibs"
 +
-       if test -n "$5"; then
-         $echo "$modename: too many parameters to \`-version-info'" 1>&2
-         $echo "$help" 1>&2
-         exit 1
-       fi
++	if test -n "$vinfo"; then
++	  $echo "$modename: warning: \`-version-info' is ignored for convenience libraries" 1>&2
++	fi
++
++	if test -n "$release"; then
++	  $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2
++	fi
++      else
 +
-       test -n "$2" && current="$2"
-       test -n "$3" && revision="$3"
-       test -n "$4" && age="$4"
++	# Parse the version information argument.
++	IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=':'
++	set dummy $vinfo 0 0 0
++	IFS="$save_ifs"
 +
-       # Check that each of the things are valid numbers.
-       case "$current" in
-       0 | [1-9] | [1-9][0-9]*) ;;
-       *)
-         $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
-         $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-         exit 1
-         ;;
-       esac
++	if test -n "$8"; then
++	  $echo "$modename: too many parameters to \`-version-info'" 1>&2
++	  $echo "$help" 1>&2
++	  exit 1
++	fi
 +
-       case "$revision" in
-       0 | [1-9] | [1-9][0-9]*) ;;
-       *)
-         $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
-         $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-         exit 1
-         ;;
-       esac
++	current="$2"
++	revision="$3"
++	age="$4"
 +
-       case "$age" in
-       0 | [1-9] | [1-9][0-9]*) ;;
-       *)
-         $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
-         $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-         exit 1
-         ;;
-       esac
++	# Check that each of the things are valid numbers.
++	case "$current" in
++	0 | [1-9] | [1-9][0-9]*) ;;
++	*)
++	  $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
++	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
++	  exit 1
++	  ;;
++	esac
 +
-       if test $age -gt $current; then
-         $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
-         $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-         exit 1
-       fi
- 
-       # Calculate the version variables.
-       version_vars="version_type current age revision"
-       case "$version_type" in
-       none) ;;
- 
-       linux)
-         version_vars="$version_vars major versuffix"
-         major=`expr $current - $age`
-         versuffix="$major.$age.$revision"
-         ;;
- 
-       osf)
-         version_vars="$version_vars versuffix verstring"
-         major=`expr $current - $age`
-         versuffix="$current.$age.$revision"
-         verstring="$versuffix"
- 
-         # Add in all the interfaces that we are compatible with.
-         loop=$age
-         while test $loop != 0; do
-           iface=`expr $current - $loop`
-           loop=`expr $loop - 1`
-           verstring="$verstring:${iface}.0"
-         done
- 
-         # Make executables depend on our current version.
-         verstring="$verstring:${current}.0"
-         ;;
- 
-       sunos)
-         version_vars="$version_vars major versuffix"
-         major="$current"
-         versuffix="$current.$revision"
-         ;;
++	case "$revision" in
++	0 | [1-9] | [1-9][0-9]*) ;;
++	*)
++	  $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
++	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
++	  exit 1
++	  ;;
++	esac
 +
-       *)
-         $echo "$modename: unknown library version type \`$version_type'" 1>&2
-         echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-         exit 1
-         ;;
-       esac
++	case "$age" in
++	0 | [1-9] | [1-9][0-9]*) ;;
++	*)
++	  $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
++	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
++	  exit 1
++	  ;;
++	esac
++
++	if test $age -gt $current; then
++	  $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
++	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
++	  exit 1
++	fi
++
++	# Calculate the version variables.
++	major=
++	versuffix=
++	verstring=
++	case "$version_type" in
++	none) ;;
++
++	irix)
++	  major=`expr $current - $age + 1`
++	  versuffix="$major.$revision"
++	  verstring="sgi$major.$revision"
++
++	  # Add in all the interfaces that we are compatible with.
++	  loop=$revision
++	  while test $loop != 0; do
++	    iface=`expr $revision - $loop`
++	    loop=`expr $loop - 1`
++	    verstring="sgi$major.$iface:$verstring"
++	  done
++	  ;;
++
++	linux)
++	  major=.`expr $current - $age`
++	  versuffix="$major.$age.$revision"
++	  ;;
++
++	osf)
++	  major=`expr $current - $age`
++	  versuffix=".$current.$age.$revision"
++	  verstring="$current.$age.$revision"
++
++	  # Add in all the interfaces that we are compatible with.
++	  loop=$age
++	  while test $loop != 0; do
++	    iface=`expr $current - $loop`
++	    loop=`expr $loop - 1`
++	    verstring="$verstring:${iface}.0"
++	  done
++
++	  # Make executables depend on our current version.
++	  verstring="$verstring:${current}.0"
++	  ;;
++
++	sunos)
++	  major=".$current"
++	  versuffix=".$current.$revision"
++	  ;;
++
++	freebsd-aout)
++	  major=".$current"
++	  versuffix=".$current.$revision";
++	  ;;
++
++	freebsd-elf)
++	  major=".$current"
++	  versuffix=".$current";
++	  ;;
++
++	windows)
++	  # Like Linux, but with '-' rather than '.', since we only
++	  # want one extension on Windows 95.
++	  major=`expr $current - $age`
++	  versuffix="-$major-$age-$revision"
++	  ;;
++
++	*)
++	  $echo "$modename: unknown library version type \`$version_type'" 1>&2
++	  echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
++	  exit 1
++	  ;;
++	esac
++
++	# Clear the version info if we defaulted, and they specified a release.
++	if test -z "$vinfo" && test -n "$release"; then
++	  major=
++	  verstring="0.0"
++	  if test "$need_version" = no; then
++	    versuffix=
++	  else
++	    versuffix=".0.0"
++	  fi
++	fi
++
++	# Remove version info from name if versioning should be avoided
++	if test "$avoid_version" = yes && test "$need_version" = no; then
++	  major=
++	  versuffix=
++	  verstring=""
++	fi
++	
++	# Check to see if the archive will have undefined symbols.
++	if test "$allow_undefined" = yes; then
++	  if test "$allow_undefined_flag" = unsupported; then
++	    $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2
++	    build_libtool_libs=no
++	    build_old_libs=yes
++	  fi
++	else
++	  # Don't allow undefined symbols.
++	  allow_undefined_flag="$no_undefined_flag"
++	fi
++
++	dependency_libs="$deplibs"
++	case "$host" in
++	*-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
++	  # these systems don't actually have a c library (as such)!
++	  ;;
++	*)
++	  # Add libc to deplibs on all other systems.
++	  deplibs="$deplibs -lc"
++	  ;;
++	esac
++      fi
 +
 +      # Create the output directory, or remove our outputs if we need to.
-       if test -d $objdir; then
-         $show "$rm $objdir/$output $objdir/$libname.* $objdir/${libname}${release}.*"
-         $run $rm $objdir/$output $objdir/$libname.* $objdir/${libname}${release}.*
++      if test -d $output_objdir; then
++	$show "${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*"
++	$run ${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*
 +      else
-         $show "$mkdir $objdir"
-         $run $mkdir $objdir
++	$show "$mkdir $output_objdir"
++	$run $mkdir $output_objdir
 +	status=$?
- 	if test $status -eq 0 || test -d $objdir; then :
- 	else
++	if test $status -ne 0 && test ! -d $output_objdir; then
 +	  exit $status
 +	fi
 +      fi
 +
-       # Check to see if the archive will have undefined symbols.
-       if test "$allow_undefined" = yes; then
-         if test "$allow_undefined_flag" = unsupported; then
-           $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2
-           build_libtool_libs=no
- 	  build_old_libs=yes
-         fi
-       else
-         # Don't allow undefined symbols.
-         allow_undefined_flag="$no_undefined_flag"
++      # Now set the variables for building old libraries.
++      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
++	oldlibs="$oldlibs $output_objdir/$libname.$libext"
++
++	# Transform .lo files to .o files.
++	oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
 +      fi
 +
-       # Add libc to deplibs on all systems.
-       dependency_libs="$deplibs"
-       deplibs="$deplibs -lc"
++      if test "$build_libtool_libs" = yes; then
++	# Transform deplibs into only deplibs that can be linked in shared.
++	name_save=$name
++	libname_save=$libname
++	release_save=$release
++	versuffix_save=$versuffix
++	major_save=$major
++	# I'm not sure if I'm treating the release correctly.  I think
++	# release should show up in the -l (ie -lgmp5) so we don't want to
++	# add it in twice.  Is that correct?
++	release=""
++	versuffix=""
++	major=""
++	newdeplibs=
++	droppeddeps=no
++	case "$deplibs_check_method" in
++	pass_all)
++	  # Don't check for shared/static.  Everything works.
++	  # This might be a little naive.  We might want to check
++	  # whether the library exists or not.  But this is on
++	  # osf3 & osf4 and I'm not really sure... Just
++	  # implementing what was already the behaviour.
++	  newdeplibs=$deplibs
++	  ;;
++	test_compile)
++	  # This code stresses the "libraries are programs" paradigm to its
++	  # limits. Maybe even breaks it.  We compile a program, linking it
++	  # against the deplibs as a proxy for the library.  Then we can check
++	  # whether they linked in statically or dynamically with ldd.
++	  $rm conftest.c
++	  cat > conftest.c <<EOF
++	  int main() { return 0; }
++EOF
++	  $rm conftest
++	  $C_compiler -o conftest conftest.c $deplibs
++	  if test $? -eq 0 ; then
++	    ldd_output=`ldd conftest`
++	    for i in $deplibs; do
++	      name="`expr $i : '-l\(.*\)'`"
++	      # If $name is empty we are operating on a -L argument.
++	      if test "$name" != "" ; then
++		libname=`eval \\$echo \"$libname_spec\"`
++		deplib_matches=`eval \\$echo \"$library_names_spec\"`
++		set dummy $deplib_matches
++		deplib_match=$2
++		if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
++		  newdeplibs="$newdeplibs $i"
++		else
++		  droppeddeps=yes
++		  echo
++		  echo "*** Warning: This library needs some functionality provided by $i."
++		  echo "*** I have the capability to make that library automatically link in when"
++		  echo "*** you link to this library.  But I can only do this if you have a"
++		  echo "*** shared version of the library, which you do not appear to have."
++		fi
++	      else
++		newdeplibs="$newdeplibs $i"
++	      fi
++	    done
++	  else
++	    # Error occured in the first compile.  Let's try to salvage the situation:
++	    # Compile a seperate program for each library.
++	    for i in $deplibs; do
++	      name="`expr $i : '-l\(.*\)'`"
++	     # If $name is empty we are operating on a -L argument.
++	      if test "$name" != "" ; then
++		$rm conftest
++		$C_compiler -o conftest conftest.c $i
++		# Did it work?
++		if test $? -eq 0 ; then
++		  ldd_output=`ldd conftest`
++		  libname=`eval \\$echo \"$libname_spec\"`
++		  deplib_matches=`eval \\$echo \"$library_names_spec\"`
++		  set dummy $deplib_matches
++		  deplib_match=$2
++		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
++		    newdeplibs="$newdeplibs $i"
++		  else
++		    droppeddeps=yes
++		    echo
++		    echo "*** Warning: This library needs some functionality provided by $i."
++		    echo "*** I have the capability to make that library automatically link in when"
++		    echo "*** you link to this library.  But I can only do this if you have a"
++		    echo "*** shared version of the library, which you do not appear to have."
++		  fi
++		else
++		  droppeddeps=yes
++		  echo
++		  echo "*** Warning!  Library $i is needed by this library but I was not able to"
++		  echo "***  make it link in!  You will probably need to install it or some"
++		  echo "*** library that it depends on before this library will be fully"
++		  echo "*** functional.  Installing it before continuing would be even better."
++		fi
++	      else
++		newdeplibs="$newdeplibs $i"
++	      fi
++	    done
++	  fi
++	  ;;
++	file_magic*)
++	  set dummy $deplibs_check_method
++	  file_magic_regex="`expr \"$deplibs_check_method\" : \"$2 \(.*\)\"`"
++	  for a_deplib in $deplibs; do
++	    name="`expr $a_deplib : '-l\(.*\)'`"
++	    # If $name is empty we are operating on a -L argument.
++	    if test "$name" != "" ; then
++	      libname=`eval \\$echo \"$libname_spec\"`
++	      for i in $lib_search_path; do
++		    potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
++		    for potent_lib in $potential_libs; do
++		      # Follow soft links.
++		      if ls -lLd "$potent_lib" 2>/dev/null \
++			 | grep " -> " >/dev/null; then
++			continue 
++		      fi
++		      # The statement above tries to avoid entering an
++		      # endless loop below, in case of cyclic links.
++		      # We might still enter an endless loop, since a link
++		      # loop can be closed while we follow links,
++		      # but so what?
++		      potlib="$potent_lib"
++		      while test -h "$potlib" 2>/dev/null; do
++			potliblink=`ls -ld $potlib | sed 's/.* -> //'`
++			case "$potliblink" in
++			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
++			*) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
++			esac
++		      done
++		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
++			 | sed 10q \
++			 | egrep "$file_magic_regex" > /dev/null; then
++			newdeplibs="$newdeplibs $a_deplib"
++			a_deplib=""
++			break 2
++		      fi
++		    done
++	      done
++	      if test -n "$a_deplib" ; then
++		droppeddeps=yes
++		echo
++		echo "*** Warning: This library needs some functionality provided by $a_deplib."
++		echo "*** I have the capability to make that library automatically link in when"
++		echo "*** you link to this library.  But I can only do this if you have a"
++		echo "*** shared version of the library, which you do not appear to have."
++	      fi
++	    else
++	      # Add a -L argument.
++	      newdeplibs="$newdeplibs $a_deplib"
++	    fi
++	  done # Gone through all deplibs.
++	  ;;
++	none | unknown | *)
++	  newdeplibs=""
++	  if $echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
++	       -e 's/ -[LR][^ ]*//g' -e 's/[ 	]//g' |
++	     grep . >/dev/null; then
++	    echo
++	    if test "X$deplibs_check_method" = "Xnone"; then
++	      echo "*** Warning: inter-library dependencies are not supported in this platform."
++	    else
++	      echo "*** Warning: inter-library dependencies are not known to be supported."
++	    fi
++	    echo "*** All declared inter-library dependencies are being dropped."
++	    droppeddeps=yes
++	  fi
++	  ;;
++	esac
++	versuffix=$versuffix_save
++	major=$major_save
++	release=$release_save
++	libname=$libname_save
++	name=$name_save
++
++	if test "$droppeddeps" = yes; then
++	  if test "$module" = yes; then
++	    echo
++	    echo "*** Warning: libtool could not satisfy all declared inter-library"
++	    echo "*** dependencies of module $libname.  Therefore, libtool will create"
++	    echo "*** a static module, that should work as long as the dlopening"
++	    echo "*** application is linked with the -dlopen flag."
++	    if test -z "$global_symbol_pipe"; then
++	      echo
++	      echo "*** However, this would only work if libtool was able to extract symbol"
++	      echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
++	      echo "*** not find such a program.  So, this module is probably useless."
++	      echo "*** \`nm' from GNU binutils and a full rebuild may help."
++	    fi
++	    if test "$build_old_libs" = no; then
++	      oldlibs="$output_objdir/$libname.$libext"
++	      build_libtool_libs=module
++	      build_old_libs=yes
++	    else
++	      build_libtool_libs=no
++	    fi
++	  else
++	    echo "*** The inter-library dependencies that have been dropped here will be"
++	    echo "*** automatically added whenever a program is linked with this library"
++	    echo "*** or is declared to -dlopen it."
++	  fi
++	fi
++	# Done checking deplibs!
++	deplibs=$newdeplibs
++      fi
 +
++      # All the library-specific variables (install_libdir is set above).
++      library_names=
++      old_library=
++      dlname=
++      
++      # Test again, we may have decided not to build it any more
 +      if test "$build_libtool_libs" = yes; then
-         # Get the real and link names of the library.
-         eval library_names=\"$library_names_spec\"
-         set dummy $library_names
-         realname="$2"
-         shift; shift
- 
-         if test -n "$soname_spec"; then
-           eval soname=\"$soname_spec\"
-         else
-           soname="$realname"
-         fi
- 
-         lib="$objdir/$realname"
++	# Get the real and link names of the library.
++	eval library_names=\"$library_names_spec\"
++	set dummy $library_names
++	realname="$2"
++	shift; shift
++
++	if test -n "$soname_spec"; then
++	  eval soname=\"$soname_spec\"
++	else
++	  soname="$realname"
++	fi
++
++	lib="$output_objdir/$realname"
 +	for link
 +	do
 +	  linknames="$linknames $link"
 +	done
 +
-         # Use standard objects if they are PIC.
-         test -z "$pic_flag" && libobjs=`$echo "X$libobjs " | $Xsed -e 's/\.lo /.o /g' -e 's/ $//g'`
++	# Ensure that we have .o objects for linkers which dislike .lo
++	# (e.g. aix) incase we are running --disable-static
++	for obj in $libobjs; do
++	  oldobj=`$echo "X$obj" | $Xsed -e "$lo2o"`
++	  if test ! -f $oldobj; then
++	    $show "${LN_S} $obj $oldobj"
++	    $run ${LN_S} $obj $oldobj || exit $?
++	  fi
++	done
++
++	# Use standard objects if they are pic
++	test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
++
++	# Prepare the list of exported symbols
++	if test -z "$export_symbols"; then
++	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
++	    $show "generating symbol list for \`$libname.la'"
++	    export_symbols="$output_objdir/$libname.exp"
++	    $run $rm $export_symbols
++	    eval cmds=\"$export_symbols_cmds\"
++	    IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
++	    for cmd in $cmds; do
++	      IFS="$save_ifs"
++	      $show "$cmd"
++	      $run eval "$cmd" || exit $?
++	    done
++	    IFS="$save_ifs"
++	    if test -n "$export_symbols_regex"; then
++	      $show "egrep -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
++	      $run eval 'egrep -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
++	      $show "$mv \"${export_symbols}T\" \"$export_symbols\""
++	      $run eval '$mv "${export_symbols}T" "$export_symbols"'
++	    fi
++	  fi
++	fi
++
++	if test -n "$export_symbols" && test -n "$include_expsyms"; then
++	  $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
++	fi
 +
-         # Do each of the archive commands.
-         eval cmds=\"$archive_cmds\"
-         IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=';'
-         for cmd in $cmds; do
-           IFS="$save_ifs"
-           $show "$cmd"
-           $run eval "$cmd" || exit $?
-         done
-         IFS="$save_ifs"
++	if test -n "$convenience"; then
++	  if test -n "$whole_archive_flag_spec"; then
++	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
++	  else
++	    gentop="$output_objdir/${outputname}x"
++	    $show "${rm}r $gentop"
++	    $run ${rm}r "$gentop"
++	    $show "mkdir $gentop"
++	    $run mkdir "$gentop"
++	    status=$?
++	    if test $status -ne 0 && test ! -d "$gentop"; then
++	      exit $status
++	    fi
++	    generated="$generated $gentop"
++
++	    for xlib in $convenience; do
++	      # Extract the objects.
++	      case "$xlib" in
++	      [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
++	      *) xabs=`pwd`"/$xlib" ;;
++	      esac
++	      xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
++	      xdir="$gentop/$xlib"
++
++	      $show "${rm}r $xdir"
++	      $run ${rm}r "$xdir"
++	      $show "mkdir $xdir"
++	      $run mkdir "$xdir"
++	      status=$?
++	      if test $status -ne 0 && test ! -d "$xdir"; then
++		exit $status
++	      fi
++	      $show "(cd $xdir && $AR x $xabs)"
++	      $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
++
++	      libobjs="$libobjs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP`
++	    done
++	  fi
++	fi
 +
-         # Create links to the real library.
-         for linkname in $linknames; do
-           $show "(cd $objdir && $LN_S $realname $linkname)"
-           $run eval '(cd $objdir && $LN_S $realname $linkname)' || exit $?
-         done
++	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
++	  eval flag=\"$thread_safe_flag_spec\"
++	  linkopts="$linkopts $flag"
++	fi
 +
-         # If -export-dynamic was specified, set the dlname.
-         if test "$export_dynamic" = yes; then
-           # On all known operating systems, these are identical.
-           dlname="$soname"
-         fi
-       fi
++	# Do each of the archive commands.
++	if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
++	  eval cmds=\"$archive_expsym_cmds\"
++	else
++	  eval cmds=\"$archive_cmds\"
++	fi
++	IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
++	for cmd in $cmds; do
++	  IFS="$save_ifs"
++	  $show "$cmd"
++	  $run eval "$cmd" || exit $?
++	done
++	IFS="$save_ifs"
 +
-       # Now set the variables for building old libraries.
-       oldlib="$objdir/$libname.a"
++	# Create links to the real library.
++	for linkname in $linknames; do
++	  if test "$realname" != "$linkname"; then
++	    $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)"
++	    $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $?
++	  fi
++	done
++
++	# If -module or -export-dynamic was specified, set the dlname.
++	if test "$module" = yes || test "$export_dynamic" = yes; then
++	  # On all known operating systems, these are identical.
++	  dlname="$soname"
++	fi
++      fi
 +      ;;
 +
-     *.lo | *.o)
++    *.lo | *.o | *.obj)
 +      if test -n "$link_against_libtool_libs"; then
-         $echo "$modename: error: cannot link libtool libraries into reloadable objects" 1>&2
-         exit 1
++	$echo "$modename: error: cannot link libtool libraries into objects" 1>&2
++	exit 1
 +      fi
 +
 +      if test -n "$deplibs"; then
-         $echo "$modename: warning: \`-l' and \`-L' are ignored while creating objects" 1>&2
++	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
 +      fi
 +
-       if test -n "$dlfiles$dlprefiles"; then
-         $echo "$modename: warning: \`-dlopen' is ignored while creating objects" 1>&2
-         # Nullify the symbol file.
-         compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
-         finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
++      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
++	$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
 +      fi
 +
 +      if test -n "$rpath"; then
-         $echo "$modename: warning: \`-rpath' is ignored while creating objects" 1>&2
++	$echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2
++      fi
++
++      if test -n "$xrpath"; then
++	$echo "$modename: warning: \`-R' is ignored for objects" 1>&2
 +      fi
 +
 +      if test -n "$vinfo"; then
-         $echo "$modename: warning: \`-version-info' is ignored while creating objects" 1>&2
++	$echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2
 +      fi
 +
 +      if test -n "$release"; then
-         $echo "$modename: warning: \`-release' is ignored while creating objects" 1>&2
++	$echo "$modename: warning: \`-release' is ignored for objects" 1>&2
 +      fi
 +
 +      case "$output" in
 +      *.lo)
-         if test -n "$objs"; then
-           $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
-           exit 1
-         fi
-         libobj="$output"
-         obj=`$echo "X$output" | $Xsed -e 's/\.lo$/.o/'`
-         ;;
++	if test -n "$objs"; then
++	  $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
++	  exit 1
++	fi
++	libobj="$output"
++	obj=`$echo "X$output" | $Xsed -e "$lo2o"`
++	;;
 +      *)
-         libobj=
-         obj="$output"
-         ;;
++	libobj=
++	obj="$output"
++	;;
 +      esac
 +
 +      # Delete the old objects.
 +      $run $rm $obj $libobj
 +
++      # Objects from convenience libraries.  This assumes
++      # single-version convenience libraries.  Whenever we create
++      # different ones for PIC/non-PIC, this we'll have to duplicate
++      # the extraction.
++      reload_conv_objs=
++      gentop=
++      # reload_cmds runs $LD directly, so let us get rid of
++      # -Wl from whole_archive_flag_spec
++      wl= 
++
++      if test -n "$convenience"; then
++	if test -n "$whole_archive_flag_spec"; then
++	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
++	else
++	  gentop="$output_objdir/${obj}x"
++	  $show "${rm}r $gentop"
++	  $run ${rm}r "$gentop"
++	  $show "mkdir $gentop"
++	  $run mkdir "$gentop"
++	  status=$?
++	  if test $status -ne 0 && test ! -d "$gentop"; then
++	    exit $status
++	  fi
++	  generated="$generated $gentop"
++
++	  for xlib in $convenience; do
++	    # Extract the objects.
++	    case "$xlib" in
++	    [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
++	    *) xabs=`pwd`"/$xlib" ;;
++	    esac
++	    xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
++	    xdir="$gentop/$xlib"
++
++	    $show "${rm}r $xdir"
++	    $run ${rm}r "$xdir"
++	    $show "mkdir $xdir"
++	    $run mkdir "$xdir"
++	    status=$?
++	    if test $status -ne 0 && test ! -d "$xdir"; then
++	      exit $status
++	    fi
++	    $show "(cd $xdir && $AR x $xabs)"
++	    $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
++
++	    reload_conv_objs="$reload_objs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP`
++	  done
++	fi
++      fi
++
 +      # Create the old-style object.
-       reload_objs="$objs"`$echo "X$libobjs " | $Xsed -e 's/[^       ]*\.a //g' -e 's/\.lo /.o /g' -e 's/ $//g'`
++      reload_objs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs"
 +
 +      output="$obj"
 +      eval cmds=\"$reload_cmds\"
-       IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=';'
++      IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
 +      for cmd in $cmds; do
-         IFS="$save_ifs"
-         $show "$cmd"
-         $run eval "$cmd" || exit $?
++	IFS="$save_ifs"
++	$show "$cmd"
++	$run eval "$cmd" || exit $?
 +      done
 +      IFS="$save_ifs"
 +
 +      # Exit if we aren't doing a library object file.
-       test -z "$libobj" && exit 0
++      if test -z "$libobj"; then
++	if test -n "$gentop"; then
++	  $show "${rm}r $gentop"
++	  $run ${rm}r $gentop
++	fi
++
++	exit 0
++      fi
 +
 +      if test "$build_libtool_libs" != yes; then
-         # Create an invalid libtool object if no PIC, so that we don't
-         # accidentally link it into a program.
-         $show "echo timestamp > $libobj"
-         $run eval "echo timestamp > $libobj" || exit $?
-         exit 0
++	if test -n "$gentop"; then
++	  $show "${rm}r $gentop"
++	  $run ${rm}r $gentop
++	fi
++
++	# Create an invalid libtool object if no PIC, so that we don't
++	# accidentally link it into a program.
++	$show "echo timestamp > $libobj"
++	$run eval "echo timestamp > $libobj" || exit $?
++	exit 0
 +      fi
 +
 +      if test -n "$pic_flag"; then
-         # Only do commands if we really have different PIC objects.
-         reload_objs="$libobjs"
-         output="$libobj"
-         eval cmds=\"$reload_cmds\"
-         IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=';'
-         for cmd in $cmds; do
-           IFS="$save_ifs"
-           $show "$cmd"
-           $run eval "$cmd" || exit $?
-         done
-         IFS="$save_ifs"
++	# Only do commands if we really have different PIC objects.
++	reload_objs="$libobjs $reload_conv_objs"
++	output="$libobj"
++	eval cmds=\"$reload_cmds\"
++	IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
++	for cmd in $cmds; do
++	  IFS="$save_ifs"
++	  $show "$cmd"
++	  $run eval "$cmd" || exit $?
++	done
++	IFS="$save_ifs"
 +      else
-         # Just create a symlink.
-         $show "$LN_S $obj $libobj"
-         $run $LN_S $obj $libobj || exit 1
++	# Just create a symlink.
++	$show $rm $libobj
++	$run $rm $libobj
++	$show "$LN_S $obj $libobj"
++	$run $LN_S $obj $libobj || exit $?
++      fi
++
++      if test -n "$gentop"; then
++	$show "${rm}r $gentop"
++	$run ${rm}r $gentop
 +      fi
 +
 +      exit 0
 +      ;;
 +
++    # Anything else should be a program.
 +    *)
 +      if test -n "$vinfo"; then
-         $echo "$modename: warning: \`-version-info' is ignored while linking programs" 1>&2
++	$echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
 +      fi
 +
 +      if test -n "$release"; then
-         $echo "$modename: warning: \`-release' is ignored while creating objects" 1>&2
++	$echo "$modename: warning: \`-release' is ignored for programs" 1>&2
++      fi
++
++      if test "$preload" = yes; then
++	if test "$dlopen" = unknown && test "$dlopen_self" = unknown &&
++	   test "$dlopen_self_static" = unknown; then
++	  $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support."
++	fi 
++      fi
++    
++      if test -n "$rpath$xrpath"; then
++	# If the user specified any rpath flags, then add them.
++	for libdir in $rpath $xrpath; do
++	  # This is the magic to use -rpath.
++	  case "$compile_rpath " in
++	  *" $libdir "*) ;;
++	  *) compile_rpath="$compile_rpath $libdir" ;;
++	  esac
++	  case "$finalize_rpath " in
++	  *" $libdir "*) ;;
++	  *) finalize_rpath="$finalize_rpath $libdir" ;;
++	  esac
++	done
++      fi
++
++      # Now hardcode the library paths
++      rpath=
++      hardcode_libdirs=
++      for libdir in $compile_rpath $finalize_rpath; do
++	if test -n "$hardcode_libdir_flag_spec"; then
++	  if test -n "$hardcode_libdir_separator"; then
++	    if test -z "$hardcode_libdirs"; then
++	      hardcode_libdirs="$libdir"
++	    else
++	      # Just accumulate the unique libdirs.
++	      case "$hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator" in
++	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
++		;;
++	      *)
++		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
++		;;
++	      esac
++	    fi
++	  else
++	    eval flag=\"$hardcode_libdir_flag_spec\"
++	    rpath="$rpath $flag"
++	  fi
++	elif test -n "$runpath_var"; then
++	  case "$perm_rpath " in
++	  *" $libdir "*) ;;
++	  *) perm_rpath="$perm_rpath $libdir" ;;
++	  esac
++	fi
++      done
++      # Substitute the hardcoded libdirs into the rpath.
++      if test -n "$hardcode_libdir_separator" &&
++	 test -n "$hardcode_libdirs"; then
++	libdir="$hardcode_libdirs"
++	eval rpath=\" $hardcode_libdir_flag_spec\"
++      fi
++      compile_rpath="$rpath"
++
++      rpath=
++      hardcode_libdirs=
++      for libdir in $finalize_rpath; do
++	if test -n "$hardcode_libdir_flag_spec"; then
++	  if test -n "$hardcode_libdir_separator"; then
++	    if test -z "$hardcode_libdirs"; then
++	      hardcode_libdirs="$libdir"
++	    else
++	      # Just accumulate the unique libdirs.
++	      case "$hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator" in
++	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
++		;;
++	      *)
++		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
++		;;
++	      esac
++	    fi
++	  else
++	    eval flag=\"$hardcode_libdir_flag_spec\"
++	    rpath="$rpath $flag"
++	  fi
++	elif test -n "$runpath_var"; then
++	  case "$finalize_perm_rpath " in
++	  *" $libdir "*) ;;
++	  *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
++	  esac
++	fi
++      done
++      # Substitute the hardcoded libdirs into the rpath.
++      if test -n "$hardcode_libdir_separator" &&
++	 test -n "$hardcode_libdirs"; then
++	libdir="$hardcode_libdirs"
++	eval rpath=\" $hardcode_libdir_flag_spec\"
 +      fi
++      finalize_rpath="$rpath"
 +
-       if test -n "$rpath"; then
- 	# If the user specified any rpath flags, then add them.
- 	for libdir in $rpath; do
-           if test -n "$hardcode_libdir_flag_spec"; then
-             if test -n "$hardcode_libdir_separator"; then
-               if test -z "$hardcode_libdirs"; then
-                 # Put the magic libdir with the hardcode flag.
-                 hardcode_libdirs="$libdir"
-                 libdir="@HARDCODE_LIBDIRS@"
-               else
-                 # Just accumulate the unique libdirs.
- 		case "$hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator" in
- 		*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
- 		  ;;
- 		*)
- 		  hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
- 		  ;;
- 		esac
-                 libdir=
-               fi
-             fi
- 
-             if test -n "$libdir"; then
-               eval flag=\"$hardcode_libdir_flag_spec\"
- 
-               compile_command="$compile_command $flag"
-               finalize_command="$finalize_command $flag"
-             fi
-           elif test -n "$runpath_var"; then
-             case "$perm_rpath " in
-             *" $libdir "*) ;;
-             *) perm_rpath="$perm_rpath $libdir" ;;
-             esac
-           fi
- 	done
++      output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
++      if test "X$output_objdir" = "X$output"; then
++	output_objdir="$objdir"
++      else
++	output_objdir="$output_objdir/$objdir"
 +      fi
 +
-       # Substitute the hardcoded libdirs into the compile commands.
-       if test -n "$hardcode_libdir_separator"; then
- 	compile_command=`$echo "X$compile_command" | $Xsed -e "s%@HARDCODE_LIBDIRS@%$hardcode_libdirs%g"`
- 	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@HARDCODE_LIBDIRS@%$hardcode_libdirs%g"`
++      # Create the binary in the object directory, then wrap it.
++      if test ! -d $output_objdir; then
++	$show "$mkdir $output_objdir"
++	$run $mkdir $output_objdir
++	status=$?
++	if test $status -ne 0 && test ! -d $output_objdir; then
++	  exit $status
++	fi
 +      fi
 +
 +      if test -n "$libobjs" && test "$build_old_libs" = yes; then
-         # Transform all the library objects into standard objects.
-         compile_command=`$echo "X$compile_command " | $Xsed -e 's/\.lo /.o /g' -e 's/ $//'`
-         finalize_command=`$echo "X$finalize_command " | $Xsed -e 's/\.lo /.o /g' -e 's/ $//'`
-       fi
- 
-       if test "$export_dynamic" = yes && test -n "$NM" && test -n "$global_symbol_pipe"; then
-         dlsyms="${output}S.c"
-       else
-         dlsyms=
++	# Transform all the library objects into standard objects.
++	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
++	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
 +      fi
 +
-       if test -n "$dlsyms"; then
-         # Add our own program objects to the preloaded list.
-         dlprefiles=`$echo "X$objs$dlprefiles " | $Xsed -e 's/\.lo /.o /g' -e 's/ $//'`
- 
- 	# Discover the nlist of each of the dlfiles.
-         nlist="$objdir/${output}.nm"
- 
- 	if test -d $objdir; then
- 	  $show "$rm $nlist ${nlist}T"
- 	  $run $rm "$nlist" "${nlist}T"
++      dlsyms=
++      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
++	if test -n "$NM" && test -n "$global_symbol_pipe"; then
++	  dlsyms="${outputname}S.c"
 +	else
- 	  $show "$mkdir $objdir"
- 	  $run $mkdir $objdir
- 	  status=$?
- 	  if test $status -eq 0 || test -d $objdir; then :
- 	  else
- 	    exit $status
- 	  fi
++	  $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2
 +	fi
++      fi
 +
-         for arg in $dlprefiles; do
- 	  $show "extracting global C symbols from \`$arg'"
- 	  $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
-         done
++      if test -n "$dlsyms"; then
++	case "$dlsyms" in
++	"") ;;
++	*.c)
++	  # Discover the nlist of each of the dlfiles.
++	  nlist="$output_objdir/${outputname}.nm"
 +
-         # Parse the name list into a source file.
-         $show "creating $objdir/$dlsyms"
-         if test -z "$run"; then
- 	  # Make sure we at least have an empty file.
- 	  test -f "$nlist" || : > "$nlist"
++	  $show "$rm $nlist ${nlist}S ${nlist}T"
++	  $run $rm "$nlist" "${nlist}S" "${nlist}T"
 +
- 	  # Try sorting and uniquifying the output.
- 	  if sort "$nlist" | uniq > "$nlist"T; then
- 	    mv -f "$nlist"T "$nlist"
- 	    wcout=`wc "$nlist" 2>/dev/null`
- 	    count=`echo "X$wcout" | $Xsed -e 's/^[ 	]*\([0-9][0-9]*\).*$/\1/'`
- 	    (test "$count" -ge 0) 2>/dev/null || count=-1
- 	  else
- 	    $rm "$nlist"T
- 	    count=-1
- 	  fi
++	  # Parse the name list into a source file.
++	  $show "creating $output_objdir/$dlsyms"
 +
- 	  case "$dlsyms" in
- 	  "") ;;
- 	  *.c)
- 	    $echo > "$objdir/$dlsyms" "\
- /* $dlsyms - symbol resolution table for \`$output' dlsym emulation. */
- /* Generated by $PROGRAM - GNU $PACKAGE $VERSION */
++	  test -z "$run" && $echo > "$output_objdir/$dlsyms" "\
++/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */
++/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */
 +
 +#ifdef __cplusplus
 +extern \"C\" {
 +#endif
 +
 +/* Prevent the only kind of declaration conflicts we can make. */
- #define dld_preloaded_symbol_count some_other_symbol
- #define dld_preloaded_symbols some_other_symbol
++#define lt_preloaded_symbols some_other_symbol
 +
 +/* External symbol declarations for the compiler. */\
 +"
 +
- 	    if test -f "$nlist"; then
- 	      sed -e 's/^.* \(.*\)$/extern char \1;/' < "$nlist" >> "$objdir/$dlsyms"
++	  if test "$dlself" = yes; then
++	    $show "generating symbol list for \`$output'"
++
++	    test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist"
++
++	    # Add our own program objects to the symbol list.
++	    progfiles=`$echo "X$objs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
++	    for arg in $progfiles; do
++	      $show "extracting global C symbols from \`$arg'"
++	      $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
++	    done
++
++	    if test -n "$exclude_expsyms"; then
++	      $run eval 'egrep -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
++	      $run eval '$mv "$nlist"T "$nlist"'
++	    fi
++	    
++	    if test -n "$export_symbols_regex"; then
++	      $run eval 'egrep -e "$export_symbols_regex" "$nlist" > "$nlist"T'
++	      $run eval '$mv "$nlist"T "$nlist"'
++	    fi
++
++	    # Prepare the list of exported symbols
++	    if test -z "$export_symbols"; then
++	      export_symbols="$output_objdir/$output.exp"
++	      $run $rm $export_symbols
++	      $run eval "sed -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
++	    else
++	      $run eval "sed -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
++	      $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
++	      $run eval 'mv "$nlist"T "$nlist"'
++	    fi
++	  fi
++
++	  for arg in $dlprefiles; do
++	    $show "extracting global C symbols from \`$arg'"
++	    name=`echo "$arg" | sed -e 's%^.*/%%'`
++	    $run eval 'echo ": $name " >> "$nlist"'
++	    $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
++	  done
++
++	  if test -z "$run"; then
++	    # Make sure we have at least an empty file.
++	    test -f "$nlist" || : > "$nlist"
++
++	    if test -n "$exclude_expsyms"; then
++	      egrep -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
++	      $mv "$nlist"T "$nlist"
++	    fi
++
++	    # Try sorting and uniquifying the output.
++	    if grep -v "^: " < "$nlist" | sort +2 | uniq > "$nlist"S; then
++	      :
 +	    else
- 	      echo '/* NONE */' >> "$objdir/$dlsyms"
++	      grep -v "^: " < "$nlist" > "$nlist"S
 +	    fi
 +
- 	    $echo >> "$objdir/$dlsyms" "\
++	    if test -f "$nlist"S; then
++	      eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"'
++	    else
++	      echo '/* NONE */' >> "$output_objdir/$dlsyms"
++	    fi
 +
- #undef dld_preloaded_symbol_count
- #undef dld_preloaded_symbols
++	    $echo >> "$output_objdir/$dlsyms" "\
++
++#undef lt_preloaded_symbols
 +
 +#if defined (__STDC__) && __STDC__
- # define __ptr_t void *
++# define lt_ptr_t void *
 +#else
- # define __ptr_t char *
++# define lt_ptr_t char *
++# define const
 +#endif
 +
- /* The number of symbols in dld_preloaded_symbols, -1 if unsorted. */
- int dld_preloaded_symbol_count = $count;
- 
 +/* The mapping between symbol names and symbols. */
- struct {
-   char *name;
-   __ptr_t address;
++const struct {
++  const char *name;
++  lt_ptr_t address;
 +}
- dld_preloaded_symbols[] =
++lt_preloaded_symbols[] =
 +{\
 +"
 +
- 	    if test -f "$nlist"; then
- 	      sed 's/^\(.*\) \(.*\)$/  {"\1", (__ptr_t) \&\2},/' < "$nlist" >> "$objdir/$dlsyms"
- 	    fi
++	    sed -n -e 's/^: \([^ ]*\) $/  {\"\1\", (lt_ptr_t) 0},/p' \
++		-e 's/^. \([^ ]*\) \([^ ]*\)$/  {"\2", (lt_ptr_t) \&\2},/p' \
++		  < "$nlist" >> "$output_objdir/$dlsyms"
 +
- 	    $echo >> "$objdir/$dlsyms" "\
-   {0, (__ptr_t) 0}
++	    $echo >> "$output_objdir/$dlsyms" "\
++  {0, (lt_ptr_t) 0}
 +};
 +
++/* This works around a problem in FreeBSD linker */
++#ifdef FREEBSD_WORKAROUND
++static const void *lt_preloaded_setup() {
++  return lt_preloaded_symbols;
++}
++#endif
++
 +#ifdef __cplusplus
 +}
 +#endif\
 +"
- 	    ;;
++	  fi
 +
- 	  *)
- 	    $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
- 	    exit 1
- 	    ;;
++	  pic_flag_for_symtable=
++	  case "$host" in
++	  # compiling the symbol table file with pic_flag works around
++	  # a FreeBSD bug that causes programs to crash when -lm is
++	  # linked before any other PIC object.  But we must not use
++	  # pic_flag when linking with -static.  The problem exists in
++	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
++	  *-*-freebsd2*|*-*-freebsd3.0*)
++	    case "$compile_command " in
++	    *" -static "*) ;;
++	    *) pic_flag_for_symtable=" $pic_flag -DPIC -DFREEBSD_WORKAROUND";;
++	    esac
 +	  esac
-         fi
 +
-         # Now compile the dynamic symbol file.
-         $show "(cd $objdir && $CC -c$no_builtin_flag \"$dlsyms\")"
-         $run eval '(cd $objdir && $CC -c$no_builtin_flag "$dlsyms")' || exit $?
++	  # Now compile the dynamic symbol file.
++	  $show "(cd $output_objdir && $C_compiler -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
++	  $run eval '(cd $output_objdir && $C_compiler -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
++
++	  # Clean up the generated files.
++	  $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
++	  $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
 +
-         # Transform the symbol file into the correct name.
-         compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$objdir/${output}S.o%"`
-         finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$objdir/${output}S.o%"`
-       elif test "$export_dynamic" != yes; then
-         test -n "$dlfiles$dlprefiles" && $echo "$modename: warning: \`-dlopen' and \`-dlpreopen' are ignored without \`-export-dynamic'" 1>&2
++	  # Transform the symbol file into the correct name.
++	  compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
++	  finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
++	  ;;
++	*)
++	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
++	  exit 1
++	  ;;
++	esac
 +      else
-         # We keep going just in case the user didn't refer to
-         # dld_preloaded_symbols.  The linker will fail if global_symbol_pipe
-         # really was required.
-         $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2
++	# We keep going just in case the user didn't refer to
++	# lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
++	# really was required.
 +
-         # Nullify the symbol file.
-         compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
-         finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
++	# Nullify the symbol file.
++	compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
++	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
 +      fi
 +
 +      if test -z "$link_against_libtool_libs" || test "$build_libtool_libs" != yes; then
-         # Replace the output file specification.
-         compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-         finalize_command=`$echo "X$finalize_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
- 
-         # We have no uninstalled library dependencies, so finalize right now.
-         $show "$compile_command"
-         $run eval "$compile_command"
-         exit $?
-       fi
++	# Replace the output file specification.
++	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
++	link_command="$compile_command$compile_rpath"
 +
-       # Replace the output file specification.
-       compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$objdir/$output"'%g'`
-       finalize_command=`$echo "X$finalize_command" | $Xsed -e 's%@OUTPUT@%'"$objdir/$output"'T%g'`
- 
-       # Create the binary in the object directory, then wrap it.
-       if test -d $objdir; then :
-       else
-         $show "$mkdir $objdir"
- 	$run $mkdir $objdir
++	# We have no uninstalled library dependencies, so finalize right now.
++	$show "$link_command"
++	$run eval "$link_command"
 +	status=$?
- 	if test $status -eq 0 || test -d $objdir; then :
- 	else
- 	  exit $status
++	
++	# Delete the generated files.
++	if test -n "$dlsyms"; then
++	  $show "$rm $output_objdir/${outputname}S.${objext}"
++	  $run $rm "$output_objdir/${outputname}S.${objext}"
 +	fi
++
++	exit $status
 +      fi
 +
 +      if test -n "$shlibpath_var"; then
-         # We should set the shlibpath_var
-         rpath=
-         for dir in $temp_rpath; do
-           case "$dir" in
-           /* | [A-Za-z]:\\*)
-             # Absolute path.
-             rpath="$rpath$dir:"
-             ;;
-           *)
-             # Relative path: add a thisdir entry.
-             rpath="$rpath\$thisdir/$dir:"
-             ;;
-           esac
-         done
-         temp_rpath="$rpath"
-       fi
- 
-       # Delete the old output file.
-       $run $rm $output
- 
-       if test -n "$compile_shlibpath"; then
-         compile_command="$shlibpath_var=\"$compile_shlibpath\$$shlibpath_var\" $compile_command"
++	# We should set the shlibpath_var
++	rpath=
++	for dir in $temp_rpath; do
++	  case "$dir" in
++	  [\\/]* | [A-Za-z]:[\\/]*)
++	    # Absolute path.
++	    rpath="$rpath$dir:"
++	    ;;
++	  *)
++	    # Relative path: add a thisdir entry.
++	    rpath="$rpath\$thisdir/$dir:"
++	    ;;
++	  esac
++	done
++	temp_rpath="$rpath"
++      fi
++
++      if test -n "$compile_shlibpath$finalize_shlibpath"; then
++	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
 +      fi
 +      if test -n "$finalize_shlibpath"; then
-         finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
++	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
++      fi
++
++      compile_var=
++      finalize_var=
++      if test -n "$runpath_var"; then
++	if test -n "$perm_rpath"; then
++	  # We should set the runpath_var.
++	  rpath=
++	  for dir in $perm_rpath; do
++	    rpath="$rpath$dir:"
++	  done
++	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
++	fi
++	if test -n "$finalize_perm_rpath"; then
++	  # We should set the runpath_var.
++	  rpath=
++	  for dir in $finalize_perm_rpath; do
++	    rpath="$rpath$dir:"
++	  done
++	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
++	fi
 +      fi
 +
-       if test -n "$runpath_var" && test -n "$perm_rpath"; then
-         # We should set the runpath_var.
-         rpath=
-         for dir in $perm_rpath; do
-           rpath="$rpath$dir:"
-         done
-         compile_command="$runpath_var=\"$rpath\$$runpath_var\" $compile_command"
-         finalize_command="$runpath_var=\"$rpath\$$runpath_var\" $finalize_command"
++      if test "$hardcode_action" = relink; then
++	# Fast installation is not supported
++	link_command="$compile_var$compile_command$compile_rpath"
++	relink_command="$finalize_var$finalize_command$finalize_rpath"
++	
++	$echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2
++	$echo "$modename: \`$output' will be relinked during installation" 1>&2
++      else
++	if test "$fast_install" != no; then
++	  link_command="$finalize_var$compile_command$finalize_rpath"
++	  if test "$fast_install" = yes; then
++	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
++	  else
++	    # fast_install is set to needless
++	    relink_command=
++	  fi
++	else
++	  link_command="$compile_var$compile_command$compile_rpath"
++	  relink_command="$finalize_var$finalize_command$finalize_rpath"
++	fi
 +      fi
 +
-       case "$hardcode_action" in
-       relink)
-         # AGH! Flame the AIX and HP-UX people for me, will ya?
-         $echo "$modename: warning: using a buggy system linker" 1>&2
-         $echo "$modename: relinking will be required before \`$output' can be installed" 1>&2
-         ;;
-       esac
++      # Replace the output file specification.
++      link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
++      
++      # Delete the old output files.
++      $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname
 +
-       $show "$compile_command"
-       $run eval "$compile_command" || exit $?
++      $show "$link_command"
++      $run eval "$link_command" || exit $?
 +
 +      # Now create the wrapper script.
 +      $show "creating $output"
 +
-       # Quote the finalize command for shipping.
-       finalize_command=`$echo "X$finalize_command" | $Xsed -e "$sed_quote_subst"`
++      # Quote the relink command for shipping.
++      if test -n "$relink_command"; then
++	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
++      fi
 +
 +      # Quote $echo for shipping.
-       qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"`
++      if test "X$echo" = "X$SHELL $0 --fallback-echo"; then
++	case "$0" in
++	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $0 --fallback-echo";;
++	*) qecho="$SHELL `pwd`/$0 --fallback-echo";;
++	esac
++	qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
++      else
++	qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"`
++      fi
 +
 +      # Only actually do things if our run command is non-null.
 +      if test -z "$run"; then
-         $rm $output
-         trap "$rm $output; exit 1" 1 2 15
++	# win32 will think the script is a binary if it has
++	# a .exe suffix, so we strip it off here.
++	case $output in
++	  *.exe) output=`echo $output|sed 's,.exe$,,'` ;;
++	esac
++	$rm $output
++	trap "$rm $output; exit 1" 1 2 15
 +
-         $echo > $output "\
- #! /bin/sh
++	$echo > $output "\
++#! $SHELL
 +
- # $output - temporary wrapper script for $objdir/$output
- # Generated by ltmain.sh - GNU $PACKAGE $VERSION
++# $output - temporary wrapper script for $objdir/$outputname
++# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
 +#
 +# The $output program cannot be directly executed until all the libtool
 +# libraries that it depends on are installed.
 +#
- # This wrapper script should never be moved out of \``pwd`'.
++# This wrapper script should never be moved out of the build directory.
 +# If it is, it will not operate correctly.
 +
 +# Sed substitution that helps us do robust quoting.  It backslashifies
 +# metacharacters that are still active within double-quoted strings.
- Xsed='sed -e s/^X//'
++Xsed='sed -e 1s/^X//'
 +sed_quote_subst='$sed_quote_subst'
 +
 +# The HP-UX ksh and POSIX shell print the target directory to stdout
 +# if CDPATH is set.
 +if test \"\${CDPATH+set}\" = set; then CDPATH=; export CDPATH; fi
 +
++relink_command=\"$relink_command\"
++
 +# This environment variable determines our operation mode.
 +if test \"\$libtool_install_magic\" = \"$magic\"; then
-   # install mode needs the following variables:
++  # install mode needs the following variable:
 +  link_against_libtool_libs='$link_against_libtool_libs'
-   finalize_command=\"$finalize_command\"
 +else
 +  # When we are sourced in execute mode, \$file and \$echo are already set.
-   if test \"\$libtool_execute_magic\" = \"$magic\"; then :
-   else
++  if test \"\$libtool_execute_magic\" != \"$magic\"; then
 +    echo=\"$qecho\"
 +    file=\"\$0\"
++    # Make sure echo works.
++    if test \"X\$1\" = X--no-reexec; then
++      # Discard the --no-reexec flag, and continue.
++      shift
++    elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then
++      # Yippee, \$echo works!
++      :
++    else
++      # Restart under the correct shell, and then maybe \$echo will work.
++      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
++    fi
 +  fi\
 +"
-         $echo >> $output "\
++	$echo >> $output "\
 +
 +  # Find the directory that this script lives in.
 +  thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
 +  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
 +
 +  # Follow symbolic links until we get to the real thisdir.
 +  file=\`ls -ld \"\$file\" | sed -n 's/.*-> //p'\`
 +  while test -n \"\$file\"; do
 +    destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
 +
 +    # If there was a directory component, then change thisdir.
 +    if test \"x\$destdir\" != \"x\$file\"; then
 +      case \"\$destdir\" in
-       /* | [A-Za-z]:\\*) thisdir=\"\$destdir\" ;;
++      [\\/]* | [A-Za-z]:[\\/]*) thisdir=\"\$destdir\" ;;
 +      *) thisdir=\"\$thisdir/\$destdir\" ;;
 +      esac
 +    fi
 +
 +    file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
 +    file=\`ls -ld \"\$thisdir/\$file\" | sed -n 's/.*-> //p'\`
 +  done
 +
 +  # Try to get the absolute directory name.
 +  absdir=\`cd \"\$thisdir\" && pwd\`
 +  test -n \"\$absdir\" && thisdir=\"\$absdir\"
++"
++
++	if test "$fast_install" = yes; then
++	  echo >> $output "\
++  program=lt-'$outputname'
++  progdir=\"\$thisdir/$objdir\"
++  
++  if test ! -f \"\$progdir/\$program\" || \\
++     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | sed 1q\`; \\
++       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
++
++    file=\"\$\$-\$program\"
++
++    if test ! -d \"\$progdir\"; then
++      $mkdir \"\$progdir\"
++    else
++      $rm \"\$progdir/\$file\"
++    fi"
++
++	  echo >> $output "\
++
++    # relink executable if necessary
++    if test -n \"\$relink_command\"; then
++      if (cd \"\$thisdir\" && eval \$relink_command); then :
++      else
++	$rm \"\$progdir/\$file\"
++	exit 1
++      fi
++    fi
 +
++    $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
++    { $rm \"\$progdir/\$program\";
++      $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; }
++    $rm \"\$progdir/\$file\"
++  fi"
++	else
++	  echo >> $output "\
++  program='$outputname$exeext'
 +  progdir=\"\$thisdir/$objdir\"
-   program='$output'
++"
++	fi
++
++	echo >> $output "\
 +
 +  if test -f \"\$progdir/\$program\"; then"
 +
-         # Export our shlibpath_var if we have one.
-         if test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-           $echo >> $output "\
++	# Export our shlibpath_var if we have one.
++	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
++	  $echo >> $output "\
 +    # Add our own library path to $shlibpath_var
 +    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
 +
 +    # Some systems cannot cope with colon-terminated $shlibpath_var
-     $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/:*\$//'\`
++    # The second colon is a workaround for a bug in BeOS R4 sed
++    $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
 +
 +    export $shlibpath_var
 +"
-         fi
++	fi
++
++	# fixup the dll searchpath if we need to.
++	if test -n "$dllsearchpath"; then
++	  $echo >> $output "\
++    # Add the dll search path components to the executable PATH
++    PATH=$dllsearchpath:\$PATH
++"
++	fi
 +
-         $echo >> $output "\
++	$echo >> $output "\
 +    if test \"\$libtool_execute_magic\" != \"$magic\"; then
 +      # Run the actual program with our arguments.
- 
++"
++	case $host in
++	*-*-cygwin* | *-*-mingw | *-*-os2*)
++	  # win32 systems need to use the prog path for dll
++	  # lookup to work
++	  $echo >> $output "\
++      exec \$progdir\\\\\$program \${1+\"\$@\"}
++"
++	  ;;
++	*)
++	  $echo >> $output "\
 +      # Export the path to the program.
 +      PATH=\"\$progdir:\$PATH\"
 +      export PATH
 +
 +      exec \$program \${1+\"\$@\"}
- 
++"
++	  ;;
++	esac
++	$echo >> $output "\
 +      \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
 +      exit 1
 +    fi
 +  else
 +    # The program doesn't exist.
 +    \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2
 +    \$echo \"This script is just a wrapper for \$program.\" 1>&2
 +    echo \"See the $PACKAGE documentation for more information.\" 1>&2
 +    exit 1
 +  fi
 +fi\
 +"
-         chmod +x $output
++	chmod +x $output
 +      fi
 +      exit 0
 +      ;;
 +    esac
 +
 +    # See if we need to build an old-fashioned archive.
-     if test "$build_old_libs" = "yes"; then
-       # Transform .lo files to .o files.
-       oldobjs="$objs"`$echo "X$libobjs " | $Xsed -e 's/[^   ]*\.a //g' -e 's/\.lo /.o /g' -e 's/ $//g'`
++    for oldlib in $oldlibs; do
++
++      if test "$build_libtool_libs" = convenience; then
++	oldobjs="$libobjs_save"
++	addlibs="$convenience"
++	build_libtool_libs=no
++      else
++	if test "$build_libtool_libs" = module; then
++	  oldobjs="$libobjs_save"
++	  build_libtool_libs=no
++	else
++	  oldobjs="$objs "`$echo "X$libobjs_save" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`
++	fi
++	addlibs="$old_convenience"
++      fi
++
++      if test -n "$addlibs"; then
++	gentop="$output_objdir/${outputname}x"
++	$show "${rm}r $gentop"
++	$run ${rm}r "$gentop"
++	$show "mkdir $gentop"
++	$run mkdir "$gentop"
++	status=$?
++	if test $status -ne 0 && test ! -d "$gentop"; then
++	  exit $status
++	fi
++	generated="$generated $gentop"
++	  
++	# Add in members from convenience archives.
++	for xlib in $addlibs; do
++	  # Extract the objects.
++	  case "$xlib" in
++	  [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
++	  *) xabs=`pwd`"/$xlib" ;;
++	  esac
++	  xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
++	  xdir="$gentop/$xlib"
++
++	  $show "${rm}r $xdir"
++	  $run ${rm}r "$xdir"
++	  $show "mkdir $xdir"
++	  $run mkdir "$xdir"
++	  status=$?
++	  if test $status -ne 0 && test ! -d "$xdir"; then
++	    exit $status
++	  fi
++	  $show "(cd $xdir && $AR x $xabs)"
++	  $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
++
++	  oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP`
++	done
++      fi
 +
 +      # Do each command in the archive commands.
 +      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
 +	eval cmds=\"$old_archive_from_new_cmds\"
 +      else
++	# Ensure that we have .o objects in place incase we decided
++	# not to build a shared library, and have fallen back to building
++	# static libs even though --disable-static was passed!
++	for oldobj in $oldobjs; do
++	  if test ! -f $oldobj; then
++	    obj=`$echo "X$oldobj" | $Xsed -e "$o2lo"`
++	    $show "${LN_S} $obj $oldobj"
++	    $run ${LN_S} $obj $oldobj || exit $?
++	  fi
++	done
++
 +	eval cmds=\"$old_archive_cmds\"
 +      fi
-       IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=';'
++      IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
 +      for cmd in $cmds; do
-         IFS="$save_ifs"
-         $show "$cmd"
-         $run eval "$cmd" || exit $?
++	IFS="$save_ifs"
++	$show "$cmd"
++	$run eval "$cmd" || exit $?
 +      done
 +      IFS="$save_ifs"
++    done
++
++    if test -n "$generated"; then
++      $show "${rm}r$generated"
++      $run ${rm}r$generated
 +    fi
 +
 +    # Now create the libtool archive.
 +    case "$output" in
 +    *.la)
 +      old_library=
-       test "$build_old_libs" = yes && old_library="$libname.a"
- 
++      test "$build_old_libs" = yes && old_library="$libname.$libext"
 +      $show "creating $output"
 +
++      if test -n "$xrpath"; then
++	temp_xrpath=
++	for libdir in $xrpath; do
++	  temp_xrpath="$temp_xrpath -R$libdir"
++	done
++	dependency_libs="$temp_xrpath $dependency_libs"
++      fi
++
 +      # Only create the output if not a dry run.
 +      if test -z "$run"; then
-         $echo > $output "\
- # $output - a libtool library file
- # Generated by ltmain.sh - GNU $PACKAGE $VERSION
++	for installed in no yes; do
++	  if test "$installed" = yes; then
++	    if test -z "$install_libdir"; then
++	      break
++	    fi
++	    output="$output_objdir/$outputname"i
++	  fi
++	  $rm $output
++	  $echo > $output "\
++# $outputname - a libtool library file
++# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
++#
++# Please DO NOT delete this file!
++# It is necessary for linking the library.
 +
 +# The name that we can dlopen(3).
 +dlname='$dlname'
 +
 +# Names of this library.
 +library_names='$library_names'
 +
 +# The name of the static archive.
 +old_library='$old_library'
 +
 +# Libraries that this one depends upon.
 +dependency_libs='$dependency_libs'
 +
 +# Version information for $libname.
 +current=$current
 +age=$age
 +revision=$revision
 +
++# Is this an already installed library?
++installed=$installed
++
 +# Directory that this library needs to be installed in:
 +libdir='$install_libdir'\
 +"
++	done
 +      fi
 +
 +      # Do a symbolic link so that the libtool archive can be found in
 +      # LD_LIBRARY_PATH before the program is installed.
-       $show "(cd $objdir && $LN_S ../$output $output)"
-       $run eval "(cd $objdir && $LN_S ../$output $output)" || exit 1
++      $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)"
++      $run eval "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)" || exit $?
 +      ;;
 +    esac
 +    exit 0
 +    ;;
 +
 +  # libtool install mode
 +  install)
 +    modename="$modename: install"
 +
-     # There may be an optional /bin/sh argument at the beginning of
++    # There may be an optional sh(1) argument at the beginning of
 +    # install_prog (especially on Windows NT).
-     if test "$nonopt" = "$SHELL"; then
++    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh; then
 +      # Aesthetically quote it.
 +      arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
 +      case "$arg" in
 +      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
 +	arg="\"$arg\""
 +	;;
 +      esac
 +      install_prog="$arg "
 +      arg="$1"
 +      shift
 +    else
 +      install_prog=
 +      arg="$nonopt"
 +    fi
 +
 +    # The real first argument should be the name of the installation program.
 +    # Aesthetically quote it.
 +    arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
 +    case "$arg" in
 +    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
 +      arg="\"$arg\""
 +      ;;
 +    esac
 +    install_prog="$install_prog$arg"
 +
 +    # We need to accept at least all the BSD install flags.
 +    dest=
 +    files=
 +    opts=
 +    prev=
 +    install_type=
-     isdir=
++    isdir=no
 +    stripme=
 +    for arg
 +    do
 +      if test -n "$dest"; then
-         files="$files $dest"
-         dest="$arg"
-         continue
++	files="$files $dest"
++	dest="$arg"
++	continue
 +      fi
 +
 +      case "$arg" in
 +      -d) isdir=yes ;;
 +      -f) prev="-f" ;;
 +      -g) prev="-g" ;;
 +      -m) prev="-m" ;;
 +      -o) prev="-o" ;;
 +      -s)
-         stripme=" -s"
-         continue
-         ;;
++	stripme=" -s"
++	continue
++	;;
 +      -*) ;;
 +
 +      *)
-         # If the previous option needed an argument, then skip it.
-         if test -n "$prev"; then
-           prev=
-         else
-           dest="$arg"
-           continue
-         fi
-         ;;
++	# If the previous option needed an argument, then skip it.
++	if test -n "$prev"; then
++	  prev=
++	else
++	  dest="$arg"
++	  continue
++	fi
++	;;
 +      esac
 +
 +      # Aesthetically quote the argument.
 +      arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
 +      case "$arg" in
 +      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
 +	arg="\"$arg\""
 +	;;
 +      esac
 +      install_prog="$install_prog $arg"
 +    done
 +
 +    if test -z "$install_prog"; then
 +      $echo "$modename: you must specify an install program" 1>&2
 +      $echo "$help" 1>&2
 +      exit 1
 +    fi
 +
 +    if test -n "$prev"; then
 +      $echo "$modename: the \`$prev' option requires an argument" 1>&2
 +      $echo "$help" 1>&2
 +      exit 1
 +    fi
 +
 +    if test -z "$files"; then
 +      if test -z "$dest"; then
-         $echo "$modename: no file or destination specified" 1>&2
++	$echo "$modename: no file or destination specified" 1>&2
 +      else
-         $echo "$modename: you must specify a destination" 1>&2
++	$echo "$modename: you must specify a destination" 1>&2
 +      fi
 +      $echo "$help" 1>&2
 +      exit 1
 +    fi
 +
 +    # Strip any trailing slash from the destination.
 +    dest=`$echo "X$dest" | $Xsed -e 's%/$%%'`
 +
 +    # Check to see that the destination is a directory.
 +    test -d "$dest" && isdir=yes
-     if test -n "$isdir"; then
++    if test "$isdir" = yes; then
 +      destdir="$dest"
 +      destname=
 +    else
 +      destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'`
 +      test "X$destdir" = "X$dest" && destdir=.
 +      destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'`
 +
 +      # Not a directory, so check to see that there is only one file specified.
 +      set dummy $files
 +      if test $# -gt 2; then
-         $echo "$modename: \`$dest' is not a directory" 1>&2
-         $echo "$help" 1>&2
-         exit 1
++	$echo "$modename: \`$dest' is not a directory" 1>&2
++	$echo "$help" 1>&2
++	exit 1
 +      fi
 +    fi
 +    case "$destdir" in
-     /* | [A-Za-z]:\\*) ;;
++    [\\/]* | [A-Za-z]:[\\/]*) ;;
 +    *)
 +      for file in $files; do
-         case "$file" in
-         *.lo) ;;
-         *)
-           $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
-           $echo "$help" 1>&2
-           exit 1
-           ;;
-         esac
++	case "$file" in
++	*.lo) ;;
++	*)
++	  $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
++	  $echo "$help" 1>&2
++	  exit 1
++	  ;;
++	esac
 +      done
 +      ;;
 +    esac
 +
 +    # This variable tells wrapper scripts just to set variables rather
 +    # than running their programs.
 +    libtool_install_magic="$magic"
 +
 +    staticlibs=
 +    future_libdirs=
 +    current_libdirs=
 +    for file in $files; do
 +
 +      # Do each installation.
 +      case "$file" in
-       *.a)
-         # Do the static libraries later.
-         staticlibs="$staticlibs $file"
-         ;;
++      *.a | *.lib)
++	# Do the static libraries later.
++	staticlibs="$staticlibs $file"
++	;;
 +
 +      *.la)
-         # Check to see that this really is a libtool archive.
-         if (sed -e '2q' $file | egrep '^# Generated by ltmain\.sh') >/dev/null 2>&1; then :
-         else
-           $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
-           $echo "$help" 1>&2
-           exit 1
-         fi
- 
-         library_names=
-         old_library=
-         # If there is no directory component, then add one.
-         case "$file" in
-         */* | *\\*) . $file ;;
-         *) . ./$file ;;
-         esac
- 
-         # Add the libdir to current_libdirs if it is the destination.
-         if test "X$destdir" = "X$libdir"; then
-           case "$current_libdirs " in
-           *" $libdir "*) ;;
-           *) current_libdirs="$current_libdirs $libdir" ;;
-           esac
-         else
-           # Note the libdir as a future libdir.
-           case "$future_libdirs " in
-           *" $libdir "*) ;;
-           *) future_libdirs="$future_libdirs $libdir" ;;
-           esac
-         fi
- 
-         dir="`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/"
-         test "X$dir" = "X$file/" && dir=
-         dir="$dir$objdir"
- 
-         # See the names of the shared library.
-         set dummy $library_names
-         if test -n "$2"; then
-           realname="$2"
-           shift
-           shift
- 
-           # Install the shared library and build the symlinks.
-           $show "$install_prog $dir/$realname $destdir/$realname"
-           $run eval "$install_prog $dir/$realname $destdir/$realname" || exit $?
-           test "X$dlname" = "X$realname" && dlname=
- 
-           if test $# -gt 0; then
-             # Delete the old symlinks.
-             rmcmd="$rm"
-             for linkname
-             do
-               rmcmd="$rmcmd $destdir/$linkname"
-             done
-             $show "$rmcmd"
-             $run $rmcmd
- 
-             # ... and create new ones.
-             for linkname
-             do
-               test "X$dlname" = "X$linkname" && dlname=
-               $show "(cd $destdir && $LN_S $realname $linkname)"
-               $run eval "(cd $destdir && $LN_S $realname $linkname)"
-             done
-           fi
- 
-           if test -n "$dlname"; then
-             # Install the dynamically-loadable library.
-             $show "$install_prog $dir/$dlname $destdir/$dlname"
-             $run eval "$install_prog $dir/$dlname $destdir/$dlname" || exit $?
-           fi
- 
-           # Do each command in the postinstall commands.
-           lib="$destdir/$realname"
-           eval cmds=\"$postinstall_cmds\"
-           IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=';'
-           for cmd in $cmds; do
-             IFS="$save_ifs"
-             $show "$cmd"
-             $run eval "$cmd" || exit $?
-           done
-           IFS="$save_ifs"
-         fi
- 
-         # Install the pseudo-library for information purposes.
-         name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-         $show "$install_prog $file $destdir/$name"
-         $run eval "$install_prog $file $destdir/$name" || exit $?
- 
-         # Maybe install the static library, too.
-         test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
-         ;;
++	# Check to see that this really is a libtool archive.
++	if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
++	else
++	  $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
++	  $echo "$help" 1>&2
++	  exit 1
++	fi
++
++	library_names=
++	old_library=
++	# If there is no directory component, then add one.
++	case "$file" in
++	*/* | *\\*) . $file ;;
++	*) . ./$file ;;
++	esac
++
++	# Add the libdir to current_libdirs if it is the destination.
++	if test "X$destdir" = "X$libdir"; then
++	  case "$current_libdirs " in
++	  *" $libdir "*) ;;
++	  *) current_libdirs="$current_libdirs $libdir" ;;
++	  esac
++	else
++	  # Note the libdir as a future libdir.
++	  case "$future_libdirs " in
++	  *" $libdir "*) ;;
++	  *) future_libdirs="$future_libdirs $libdir" ;;
++	  esac
++	fi
++
++	dir="`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/"
++	test "X$dir" = "X$file/" && dir=
++	dir="$dir$objdir"
++
++	# See the names of the shared library.
++	set dummy $library_names
++	if test -n "$2"; then
++	  realname="$2"
++	  shift
++	  shift
++
++	  # Install the shared library and build the symlinks.
++	  $show "$install_prog $dir/$realname $destdir/$realname"
++	  $run eval "$install_prog $dir/$realname $destdir/$realname" || exit $?
++
++	  if test $# -gt 0; then
++	    # Delete the old symlinks, and create new ones.
++	    for linkname
++	    do
++	      if test "$linkname" != "$realname"; then
++		$show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
++		$run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
++	      fi
++	    done
++	  fi
++
++	  # Do each command in the postinstall commands.
++	  lib="$destdir/$realname"
++	  eval cmds=\"$postinstall_cmds\"
++	  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
++	  for cmd in $cmds; do
++	    IFS="$save_ifs"
++	    $show "$cmd"
++	    $run eval "$cmd" || exit $?
++	  done
++	  IFS="$save_ifs"
++	fi
++
++	# Install the pseudo-library for information purposes.
++	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
++	instname="$dir/$name"i
++	$show "$install_prog $instname $destdir/$name"
++	$run eval "$install_prog $instname $destdir/$name" || exit $?
++
++	# Maybe install the static library, too.
++	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
++	;;
 +
 +      *.lo)
-         # Install (i.e. copy) a libtool object.
- 
-         # Figure out destination file name, if it wasn't already specified.
-         if test -n "$destname"; then
-           destfile="$destdir/$destname"
-         else
-           destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-           destfile="$destdir/$destfile"
-         fi
- 
-         # Deduce the name of the destination old-style object file.
-         case "$destfile" in
-         *.lo)
-           staticdest=`$echo "X$destfile" | $Xsed -e 's/\.lo$/\.o/'`
-           ;;
-         *.o)
-           staticdest="$destfile"
-           destfile=
-           ;;
-         *)
-           $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
-           $echo "$help" 1>&2
-           exit 1
-           ;;
-         esac
- 
-         # Install the libtool object if requested.
-         if test -n "$destfile"; then
-           $show "$install_prog $file $destfile"
-           $run eval "$install_prog $file $destfile" || exit $?
-         fi
- 
-         # Install the old object if enabled.
-         if test "$build_old_libs" = yes; then
-           # Deduce the name of the old-style object file.
-           staticobj=`$echo "X$file" | $Xsed -e 's/\.lo$/\.o/'`
- 
-           $show "$install_prog $staticobj $staticdest"
-           $run eval "$install_prog \$staticobj \$staticdest" || exit $?
-         fi
-         exit 0
-         ;;
++	# Install (i.e. copy) a libtool object.
++
++	# Figure out destination file name, if it wasn't already specified.
++	if test -n "$destname"; then
++	  destfile="$destdir/$destname"
++	else
++	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
++	  destfile="$destdir/$destfile"
++	fi
++
++	# Deduce the name of the destination old-style object file.
++	case "$destfile" in
++	*.lo)
++	  staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"`
++	  ;;
++	*.o | *.obj)
++	  staticdest="$destfile"
++	  destfile=
++	  ;;
++	*)
++	  $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
++	  $echo "$help" 1>&2
++	  exit 1
++	  ;;
++	esac
++
++	# Install the libtool object if requested.
++	if test -n "$destfile"; then
++	  $show "$install_prog $file $destfile"
++	  $run eval "$install_prog $file $destfile" || exit $?
++	fi
++
++	# Install the old object if enabled.
++	if test "$build_old_libs" = yes; then
++	  # Deduce the name of the old-style object file.
++	  staticobj=`$echo "X$file" | $Xsed -e "$lo2o"`
++
++	  $show "$install_prog $staticobj $staticdest"
++	  $run eval "$install_prog \$staticobj \$staticdest" || exit $?
++	fi
++	exit 0
++	;;
 +
 +      *)
-         # Do a test to see if this is really a libtool program.
-         if (sed -e '4q' $file | egrep '^# Generated by ltmain\.sh') >/dev/null 2>&1; then
-           link_against_libtool_libs=
-           finalize_command=
- 
-           # If there is no directory component, then add one.
-           case "$file" in
-           */* | *\\*) . $file ;;
-           *) . ./$file ;;
-           esac
- 
-           # Check the variables that should have been set.
-           if test -z "$link_against_libtool_libs" || test -z "$finalize_command"; then
-             $echo "$modename: invalid libtool wrapper script \`$file'" 1>&2
-             exit 1
-           fi
- 
-           finalize=yes
-           for lib in $link_against_libtool_libs; do
-             # Check to see that each library is installed.
-             libdir=
-             if test -f "$lib"; then
-               # If there is no directory component, then add one.
-               case "$lib" in
-               */* | *\\*) . $lib ;;
-               *) . ./$lib ;;
-               esac
-             fi
-             libfile="$libdir/`$echo "X$lib" | $Xsed -e 's%^.*/%%g'`"
-             if test -z "$libdir"; then
-               $echo "$modename: warning: \`$lib' contains no -rpath information" 1>&2
-             elif test -f "$libfile"; then :
-             else
-               $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
-               finalize=no
-             fi
-           done
- 
-           if test "$hardcode_action" = relink; then
-             if test "$finalize" = yes; then
-               $echo "$modename: warning: relinking \`$file' on behalf of your buggy system linker" 1>&2
-               $show "$finalize_command"
-               if $run eval "$finalize_command"; then :
-               else
-                 $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-                 continue
-               fi
-               file="$objdir/$file"T
-             else
-               $echo "$modename: warning: cannot relink \`$file' on behalf of your buggy system linker" 1>&2
-             fi
-           else
-             # Install the binary that we compiled earlier.
++	# Figure out destination file name, if it wasn't already specified.
++	if test -n "$destname"; then
++	  destfile="$destdir/$destname"
++	else
++	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
++	  destfile="$destdir/$destfile"
++	fi
++
++	# Do a test to see if this is really a libtool program.
++	if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
++	  link_against_libtool_libs=
++	  relink_command=
++
++	  # If there is no directory component, then add one.
++	  case "$file" in
++	  */* | *\\*) . $file ;;
++	  *) . ./$file ;;
++	  esac
++
++	  # Check the variables that should have been set.
++	  if test -z "$link_against_libtool_libs"; then
++	    $echo "$modename: invalid libtool wrapper script \`$file'" 1>&2
++	    exit 1
++	  fi
++
++	  finalize=yes
++	  for lib in $link_against_libtool_libs; do
++	    # Check to see that each library is installed.
++	    libdir=
++	    if test -f "$lib"; then
++	      # If there is no directory component, then add one.
++	      case "$lib" in
++	      */* | *\\*) . $lib ;;
++	      *) . ./$lib ;;
++	      esac
++	    fi
++	    libfile="$libdir/`$echo "X$lib" | $Xsed -e 's%^.*/%%g'`"
++	    if test -n "$libdir" && test ! -f "$libfile"; then
++	      $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
++	      finalize=no
++	    fi
++	  done
++
++	  outputname=
++	  if test "$fast_install" = no && test -n "$relink_command"; then
++	    if test "$finalize" = yes && test -z "$run"; then
++	      tmpdir="/tmp"
++	      test -n "$TMPDIR" && tmpdir="$TMPDIR"
++	      tmpdir="$tmpdir/libtool-$$"
++	      if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then :
++	      else
++		$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
++		continue
++	      fi
++	      outputname="$tmpdir/$file"
++	      # Replace the output file specification.
++	      relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
++
++	      $show "$relink_command"
++	      if $run eval "$relink_command"; then :
++	      else
++		$echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
++		${rm}r "$tmpdir"
++		continue
++	      fi
++	      file="$outputname"
++	    else
++	      $echo "$modename: warning: cannot relink \`$file'" 1>&2
++	    fi
++	  else
++	    # Install the binary that we compiled earlier.
 +	    file=`$echo "X$file" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
-           fi
-         fi
++	  fi
++	fi
 +
-         $show "$install_prog$stripme $file $dest"
-         $run eval "$install_prog\$stripme \$file \$dest" || exit $?
-         ;;
++	$show "$install_prog$stripme $file $destfile"
++	$run eval "$install_prog\$stripme \$file \$destfile" || exit $?
++	test -n "$outputname" && ${rm}r "$tmpdir"
++	;;
 +      esac
 +    done
 +
 +    for file in $staticlibs; do
 +      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
 +
 +      # Set up the ranlib parameters.
 +      oldlib="$destdir/$name"
 +
 +      $show "$install_prog $file $oldlib"
 +      $run eval "$install_prog \$file \$oldlib" || exit $?
 +
 +      # Do each command in the postinstall commands.
 +      eval cmds=\"$old_postinstall_cmds\"
-       IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=';'
++      IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
 +      for cmd in $cmds; do
-         IFS="$save_ifs"
-         $show "$cmd"
-         $run eval "$cmd" || exit $?
++	IFS="$save_ifs"
++	$show "$cmd"
++	$run eval "$cmd" || exit $?
 +      done
 +      IFS="$save_ifs"
 +    done
 +
 +    if test -n "$future_libdirs"; then
 +      $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2
 +    fi
 +
 +    if test -n "$current_libdirs"; then
 +      # Maybe just do a dry run.
 +      test -n "$run" && current_libdirs=" -n$current_libdirs"
 +      exec $SHELL $0 --finish$current_libdirs
 +      exit 1
 +    fi
 +
 +    exit 0
 +    ;;
 +
 +  # libtool finish mode
 +  finish)
 +    modename="$modename: finish"
 +    libdirs="$nonopt"
++    admincmds=
 +
 +    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
 +      for dir
 +      do
-         libdirs="$libdirs $dir"
++	libdirs="$libdirs $dir"
 +      done
 +
 +      for libdir in $libdirs; do
 +	if test -n "$finish_cmds"; then
 +	  # Do each command in the finish commands.
 +	  eval cmds=\"$finish_cmds\"
-           IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=';'
-           for cmd in $cmds; do
-             IFS="$save_ifs"
-             $show "$cmd"
-             $run eval "$cmd"
-           done
-           IFS="$save_ifs"
++	  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
++	  for cmd in $cmds; do
++	    IFS="$save_ifs"
++	    $show "$cmd"
++	    $run eval "$cmd" || admincmds="$admincmds
++       $cmd"
++	  done
++	  IFS="$save_ifs"
 +	fi
 +	if test -n "$finish_eval"; then
 +	  # Do the single finish_eval.
 +	  eval cmds=\"$finish_eval\"
- 	  $run eval "$cmds"
++	  $run eval "$cmds" || admincmds="$admincmds
++       $cmds"
 +	fi
 +      done
 +    fi
 +
-     echo "------------------------------------------------------------------------------"
++    # Exit here if they wanted silent mode.
++    test "$show" = : && exit 0
++
++    echo "----------------------------------------------------------------------"
 +    echo "Libraries have been installed in:"
 +    for libdir in $libdirs; do
 +      echo "   $libdir"
 +    done
 +    echo
-     echo "To link against installed libraries in a given directory, LIBDIR,"
-     echo "you must use the \`-LLIBDIR' flag during linking."
-     echo
-     echo " You will also need to do one of the following:"
++    echo "If you ever happen to want to link against installed libraries"
++    echo "in a given directory, LIBDIR, you must either use libtool, and"
++    echo "specify the full pathname of the library, or use \`-LLIBDIR'"
++    echo "flag during linking and do at least one of the following:"
 +    if test -n "$shlibpath_var"; then
 +      echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
 +      echo "     during execution"
 +    fi
 +    if test -n "$runpath_var"; then
 +      echo "   - add LIBDIR to the \`$runpath_var' environment variable"
 +      echo "     during linking"
 +    fi
 +    if test -n "$hardcode_libdir_flag_spec"; then
 +      libdir=LIBDIR
 +      eval flag=\"$hardcode_libdir_flag_spec\"
 +
 +      echo "   - use the \`$flag' linker flag"
 +    fi
++    if test -n "$admincmds"; then
++      echo "   - have your system administrator run these commands:$admincmds"
++    fi
 +    if test -f /etc/ld.so.conf; then
 +      echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
 +    fi
 +    echo
 +    echo "See any operating system documentation about shared libraries for"
 +    echo "more information, such as the ld(1) and ld.so(8) manual pages."
-     echo "------------------------------------------------------------------------------"
++    echo "----------------------------------------------------------------------"
 +    exit 0
 +    ;;
 +
 +  # libtool execute mode
 +  execute)
 +    modename="$modename: execute"
 +
 +    # The first argument is the command name.
 +    cmd="$nonopt"
 +    if test -z "$cmd"; then
 +      $echo "$modename: you must specify a COMMAND" 1>&2
 +      $echo "$help"
 +      exit 1
 +    fi
 +
 +    # Handle -dlopen flags immediately.
 +    for file in $execute_dlfiles; do
-       if test -f "$file"; then :
-       else
++      if test ! -f "$file"; then
 +	$echo "$modename: \`$file' is not a file" 1>&2
 +	$echo "$help" 1>&2
 +	exit 1
 +      fi
 +
 +      dir=
 +      case "$file" in
 +      *.la)
-         # Check to see that this really is a libtool archive.
-         if (sed -e '2q' $file | egrep '^# Generated by ltmain\.sh') >/dev/null 2>&1; then :
-         else
-           $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-           $echo "$help" 1>&2
-           exit 1
-         fi
++	# Check to see that this really is a libtool archive.
++	if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
++	else
++	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
++	  $echo "$help" 1>&2
++	  exit 1
++	fi
 +
 +	# Read the libtool library.
 +	dlname=
 +	library_names=
 +
-         # If there is no directory component, then add one.
++	# If there is no directory component, then add one.
 +	case "$file" in
 +	*/* | *\\*) . $file ;;
-         *) . ./$file ;;
++	*) . ./$file ;;
 +	esac
 +
 +	# Skip this library if it cannot be dlopened.
 +	if test -z "$dlname"; then
 +	  # Warn if it was a shared library.
 +	  test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'"
 +	  continue
 +	fi
 +
 +	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
 +	test "X$dir" = "X$file" && dir=.
 +
 +	if test -f "$dir/$objdir/$dlname"; then
 +	  dir="$dir/$objdir"
 +	else
 +	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
 +	  exit 1
 +	fi
 +	;;
 +
 +      *.lo)
 +	# Just add the directory containing the .lo file.
 +	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
 +	test "X$dir" = "X$file" && dir=.
 +	;;
 +
 +      *)
 +	$echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2
-         continue
++	continue
 +	;;
 +      esac
 +
 +      # Get the absolute pathname.
 +      absdir=`cd "$dir" && pwd`
 +      test -n "$absdir" && dir="$absdir"
 +
 +      # Now add the directory to shlibpath_var.
 +      if eval "test -z \"\$$shlibpath_var\""; then
 +	eval "$shlibpath_var=\"\$dir\""
 +      else
 +	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
 +      fi
 +    done
 +
 +    # This variable tells wrapper scripts just to set shlibpath_var
 +    # rather than running their programs.
 +    libtool_execute_magic="$magic"
 +
 +    # Check if any of the arguments is a wrapper script.
 +    args=
 +    for file
 +    do
 +      case "$file" in
 +      -*) ;;
 +      *)
-         # Do a test to see if this is really a libtool program.
-         if (sed -e '4q' $file | egrep '^# Generated by ltmain\.sh') >/dev/null 2>&1; then
++	# Do a test to see if this is really a libtool program.
++	if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
 +	  # If there is no directory component, then add one.
 +	  case "$file" in
 +	  */* | *\\*) . $file ;;
 +	  *) . ./$file ;;
 +	  esac
 +
 +	  # Transform arg to wrapped name.
 +	  file="$progdir/$program"
 +	fi
-         ;;
++	;;
 +      esac
 +      # Quote arguments (to preserve shell metacharacters).
 +      file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"`
 +      args="$args \"$file\""
 +    done
 +
 +    if test -z "$run"; then
 +      # Export the shlibpath_var.
 +      eval "export $shlibpath_var"
 +
++      # Restore saved enviroment variables
++      if test "${save_LC_ALL+set}" = set; then
++	LC_ALL="$save_LC_ALL"; export LC_ALL
++      fi
++      if test "${save_LANG+set}" = set; then
++	LANG="$save_LANG"; export LANG
++      fi
++
 +      # Now actually exec the command.
 +      eval "exec \$cmd$args"
 +
 +      $echo "$modename: cannot exec \$cmd$args"
 +      exit 1
 +    else
 +      # Display what would be done.
 +      eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
 +      $echo "export $shlibpath_var"
 +      $echo "$cmd$args"
 +      exit 0
 +    fi
 +    ;;
 +
 +  # libtool uninstall mode
 +  uninstall)
 +    modename="$modename: uninstall"
 +    rm="$nonopt"
 +    files=
 +
 +    for arg
 +    do
 +      case "$arg" in
 +      -*) rm="$rm $arg" ;;
 +      *) files="$files $arg" ;;
 +      esac
 +    done
 +
 +    if test -z "$rm"; then
 +      $echo "$modename: you must specify an RM program" 1>&2
 +      $echo "$help" 1>&2
 +      exit 1
 +    fi
 +
 +    for file in $files; do
 +      dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
 +      test "X$dir" = "X$file" && dir=.
 +      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
 +
 +      rmfiles="$file"
 +
 +      case "$name" in
 +      *.la)
-         # Possibly a libtool archive, so verify it.
-         if (sed -e '2q' $file | egrep '^# Generated by ltmain\.sh') >/dev/null 2>&1; then
-           . $dir/$name
- 
-           # Delete the libtool libraries and symlinks.
-           for n in $library_names; do
-             rmfiles="$rmfiles $dir/$n"
-             test "X$n" = "X$dlname" && dlname=
-           done
-           test -n "$dlname" && rmfiles="$rmfiles $dir/$dlname"
-           test -n "$old_library" && rmfiles="$rmfiles $dir/$old_library"
++	# Possibly a libtool archive, so verify it.
++	if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
++	  . $dir/$name
++
++	  # Delete the libtool libraries and symlinks.
++	  for n in $library_names; do
++	    rmfiles="$rmfiles $dir/$n"
++	  done
++	  test -n "$old_library" && rmfiles="$rmfiles $dir/$old_library"
 +
 +	  $show "$rm $rmfiles"
 +	  $run $rm $rmfiles
 +
 +	  if test -n "$library_names"; then
 +	    # Do each command in the postuninstall commands.
 +	    eval cmds=\"$postuninstall_cmds\"
- 	    IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=';'
++	    IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
 +	    for cmd in $cmds; do
 +	      IFS="$save_ifs"
 +	      $show "$cmd"
 +	      $run eval "$cmd"
 +	    done
 +	    IFS="$save_ifs"
 +	  fi
 +
-           if test -n "$old_library"; then
++	  if test -n "$old_library"; then
 +	    # Do each command in the old_postuninstall commands.
 +	    eval cmds=\"$old_postuninstall_cmds\"
- 	    IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=';'
++	    IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
 +	    for cmd in $cmds; do
 +	      IFS="$save_ifs"
 +	      $show "$cmd"
 +	      $run eval "$cmd"
 +	    done
 +	    IFS="$save_ifs"
 +	  fi
 +
-           # FIXME: should reinstall the best remaining shared library.
-         fi
-         ;;
++	  # FIXME: should reinstall the best remaining shared library.
++	fi
++	;;
 +
 +      *.lo)
-         if test "$build_old_libs" = yes; then
-           oldobj=`$echo "X$name" | $Xsed -e 's/\.lo$/\.o/'`
-           rmfiles="$rmfiles $dir/$oldobj"
-         fi
++	if test "$build_old_libs" = yes; then
++	  oldobj=`$echo "X$name" | $Xsed -e "$lo2o"`
++	  rmfiles="$rmfiles $dir/$oldobj"
++	fi
 +	$show "$rm $rmfiles"
 +	$run $rm $rmfiles
-         ;;
++	;;
 +
 +      *)
-       	$show "$rm $rmfiles"
++	$show "$rm $rmfiles"
 +	$run $rm $rmfiles
 +	;;
 +      esac
 +    done
 +    exit 0
 +    ;;
 +
 +  "")
 +    $echo "$modename: you must specify a MODE" 1>&2
 +    $echo "$generic_help" 1>&2
 +    exit 1
 +    ;;
 +  esac
 +
 +  $echo "$modename: invalid operation mode \`$mode'" 1>&2
 +  $echo "$generic_help" 1>&2
 +  exit 1
 +fi # test -z "$show_help"
 +
 +# We need to display help for each of the modes.
 +case "$mode" in
 +"") $echo \
 +"Usage: $modename [OPTION]... [MODE-ARG]...
 +
 +Provide generalized library-building support services.
 +
++    --config          show all configuration variables
++    --debug           enable verbose shell tracing
 +-n, --dry-run         display commands without modifying any files
-     --features        display configuration information and exit
++    --features        display basic configuration information and exit
 +    --finish          same as \`--mode=finish'
 +    --help            display this help message and exit
 +    --mode=MODE       use operation mode MODE [default=inferred from MODE-ARGS]
 +    --quiet           same as \`--silent'
 +    --silent          don't print informational messages
 +    --version         print version information
 +
 +MODE must be one of the following:
 +
 +      compile         compile a source file into a libtool object
 +      execute         automatically set library path, then run a program
 +      finish          complete the installation of libtool libraries
 +      install         install libraries or executables
 +      link            create a library or an executable
 +      uninstall       remove libraries from an installed directory
 +
 +MODE-ARGS vary depending on the MODE.  Try \`$modename --help --mode=MODE' for
 +a more detailed description of MODE."
 +  exit 0
 +  ;;
 +
 +compile)
 +  $echo \
 +"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
 +
 +Compile a source file into a libtool library object.
 +
++This mode accepts the following additional options:
++
++  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
++  -static           always build a \`.o' file suitable for static linking
++
 +COMPILE-COMMAND is a command to be used in creating a \`standard' object file
 +from the given SOURCEFILE.
 +
 +The output file name is determined by removing the directory component from
 +SOURCEFILE, then substituting the C source code suffix \`.c' with the
 +library object suffix, \`.lo'."
 +  ;;
 +
 +execute)
 +  $echo \
 +"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]...
 +
 +Automatically set library path, then run a program.
 +
 +This mode accepts the following additional options:
 +
 +  -dlopen FILE      add the directory containing FILE to the library path
 +
 +This mode sets the library path environment variable according to \`-dlopen'
 +flags.
 +
 +If any of the ARGS are libtool executable wrappers, then they are translated
 +into their corresponding uninstalled binary, and any of their required library
 +directories are added to the library path.
 +
 +Then, COMMAND is executed, with ARGS as arguments."
 +  ;;
 +
 +finish)
 +  $echo \
 +"Usage: $modename [OPTION]... --mode=finish [LIBDIR]...
 +
 +Complete the installation of libtool libraries.
 +
 +Each LIBDIR is a directory that contains libtool libraries.
 +
 +The commands that this mode executes may require superuser privileges.  Use
 +the \`--dry-run' option if you just want to see what would be executed."
 +  ;;
 +
 +install)
 +  $echo \
 +"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND...
 +
 +Install executables or libraries.
 +
 +INSTALL-COMMAND is the installation command.  The first component should be
 +either the \`install' or \`cp' program.
 +
 +The rest of the components are interpreted as arguments to that command (only
 +BSD-compatible install options are recognized)."
 +  ;;
 +
 +link)
 +  $echo \
 +"Usage: $modename [OPTION]... --mode=link LINK-COMMAND...
 +
 +Link object files or libraries together to form another library, or to
 +create an executable program.
 +
 +LINK-COMMAND is a command using the C compiler that you would use to create
 +a program from several object files.
 +
 +The following components of LINK-COMMAND are treated specially:
 +
 +  -all-static       do not do any dynamic linking at all
++  -avoid-version    do not add a version suffix if possible
 +  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
-   -dlpreopen FILE   link in FILE and add its symbols to dld_preloaded_symbols
++  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
 +  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
++  -export-symbols SYMFILE
++		    try to export only the symbols listed in SYMFILE
++  -export-symbols-regex REGEX
++		    try to export only the symbols matching REGEX
 +  -LLIBDIR          search LIBDIR for required installed libraries
 +  -lNAME            OUTPUT-FILE requires the installed library libNAME
++  -module           build a library that can dlopened
 +  -no-undefined     declare that a library does not refer to external symbols
 +  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
 +  -release RELEASE  specify package release information
 +  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
++  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
 +  -static           do not do any dynamic linking of libtool libraries
 +  -version-info CURRENT[:REVISION[:AGE]]
-                     specify library version info [each variable defaults to 0]
++		    specify library version info [each variable defaults to 0]
 +
 +All other options (arguments beginning with \`-') are ignored.
 +
 +Every other argument is treated as a filename.  Files ending in \`.la' are
 +treated as uninstalled libtool libraries, other files are standard or library
 +object files.
 +
- If the OUTPUT-FILE ends in \`.la', then a libtool library is created, only
- library objects (\`.lo' files) may be specified, and \`-rpath' is required.
++If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
++only library objects (\`.lo' files) may be specified, and \`-rpath' is
++required, except when creating a convenience library.
 +
- If OUTPUT-FILE ends in \`.a', then a standard library is created using \`ar'
- and \`ranlib'.
++If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
++using \`ar' and \`ranlib', or on Windows using \`lib'.
 +
- If OUTPUT-FILE ends in \`.lo' or \`.o', then a reloadable object file is
- created, otherwise an executable program is created."
++If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
++is created, otherwise an executable program is created."
 +  ;;
 +
 +uninstall)
-   $echo
++  $echo \
 +"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
 +
 +Remove libraries from an installation directory.
 +
 +RM is the name of the program to use to delete files associated with each FILE
 +(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
 +to RM.
 +
 +If FILE is a libtool library, all the files associated with it are deleted.
 +Otherwise, only FILE itself is deleted using RM."
 +  ;;
 +
 +*)
 +  $echo "$modename: invalid operation mode \`$mode'" 1>&2
 +  $echo "$help" 1>&2
 +  exit 1
 +  ;;
 +esac
 +
 +echo
 +$echo "Try \`$modename --help' for more information about other modes."
 +
 +exit 0
 +
 +# Local Variables:
 +# mode:shell-script
 +# sh-indentation:2
 +# End:
diff --cc ltconfig
index 23ce23e,65ec6f6..de4d8a4
--- a/ltconfig
+++ b/ltconfig
@@@ -712,20 -1109,144 +1109,144 @@@ cygwin* | mingw*
  esac
  
  ld_shlibs=yes
- if test "$with_gnu_ld" = yes && test "$gnu_ld_acts_native" != yes; then
+ if test "$with_gnu_ld" = yes; then
+   # If archive_cmds runs LD, not CC, wlarc should be empty
+   wlarc='${wl}'
  
    # See if GNU ld supports shared libraries.
-   if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-     archive_cmds='$CC -shared ${wl}-soname $wl$soname -o $lib$libobjs -lc'
-     runpath_var=LD_RUN_PATH
-     ld_shlibs=yes
-   else
+   case "$host_os" in
+   aix3* | aix4*)
+     # On AIX, the GNU linker is very broken
      ld_shlibs=no
-   fi
+     cat <<EOF 1>&2
+ 
+ *** Warning: the GNU linker, at least up to release 2.9.1, is reported
+ *** to be unable to reliably create shared libraries on AIX.
+ *** Therefore, libtool is disabling shared libraries support.  If you
+ *** really care for shared libraries, you may want to modify your PATH
+ *** so that a non-GNU linker is found, and then restart.
+ 
+ EOF
+     ;;
+ 
+   amigaos*)
+     archive_cmds='$rm $objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $objdir/a2ixlibrary.data~$AR cru $lib $libobjs~$RANLIB $lib~(cd $objdir && a2ixlibrary -32)'
+     hardcode_libdir_flag_spec='-L$libdir'
+     hardcode_minus_L=yes
+ 
+     # Samuel A. Falvo II <kc5tja at dolphin.openprojects.net> reports
+     # that the semantics of dynamic libraries on AmigaOS, at least up
+     # to version 4, is to share data among multiple programs linked
+     # with the same dynamic library.  Since this doesn't match the
+     # behavior of shared libraries on other platforms, we can use
+     # them.
+     ld_shlibs=no
+     ;;
+ 
+   beos*)
+     if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+       allow_undefined_flag=unsupported
+       # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
+       # support --undefined.  This deserves some investigation.  FIXME
+       archive_cmds='$CC -nostart $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
+     else
+       ld_shlibs=no
+     fi
+     ;;
+ 
+   cygwin* | mingw*)
+     # hardcode_libdir_flag_spec is actually meaningless, as there is
+     # no search path for DLLs.
+     hardcode_libdir_flag_spec='-L$libdir'
+     allow_undefined_flag=unsupported
+     always_export_symbols=yes
+ 
+     # Extract the symbol export list from an `--export-all' def file,
+     # then regenerate the def file from the symbol export list, so that
+     # the compiled dll only exports the symbol export list.
+     export_symbols_cmds='test -f $objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $0 > $objdir/$soname-ltdll.c~
+       test -f $objdir/$soname-ltdll.$objext || (cd $objdir && $CC -c $soname-ltdll.c)~
+       $DLLTOOL --export-all --exclude-symbols DllMain at 12,_cygwin_dll_entry at 12,_cygwin_noncygwin_dll_entry at 12 --output-def $objdir/$soname-def  $objdir/$soname-ltdll.$objext $libobjs $convenience~
+       sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]* ; *//" < $objdir/$soname-def > $export_symbols'
+ 
+     archive_expsym_cmds='echo EXPORTS > $objdir/$soname-def~
+       _lt_hint=1;
+       for symbol in `cat $export_symbols`; do
+ 	echo "	\$symbol @ \$_lt_hint ; " >> $objdir/$soname-def;
+ 	_lt_hint=`expr 1 + \$_lt_hint`;
+       done~
+       test -f $objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $0 > $objdir/$soname-ltdll.c~
+       test -f $objdir/$soname-ltdll.$objext || (cd $objdir && $CC -c $soname-ltdll.c)~
+       $CC -Wl,--base-file,$objdir/$soname-base -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry at 12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts~
+       $DLLTOOL --as=$AS --dllname $soname --exclude-symbols DllMain at 12,_cygwin_dll_entry at 12,_cygwin_noncygwin_dll_entry at 12 --def $objdir/$soname-def --base-file $objdir/$soname-base --output-exp $objdir/$soname-exp~
+       $CC -Wl,--base-file,$objdir/$soname-base $objdir/$soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry at 12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts~
+       $DLLTOOL --as=$AS --dllname $soname --exclude-symbols DllMain at 12,_cygwin_dll_entry at 12,_cygwin_noncygwin_dll_entry at 12 --def $objdir/$soname-def --base-file $objdir/$soname-base --output-exp $objdir/$soname-exp~
+       $CC $objdir/$soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry at 12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts'
+ 
+       old_archive_from_new_cmds='$DLLTOOL --as=$AS --dllname $soname --def $objdir/$soname-def --output-lib $objdir/$libname.a' 
+     ;;
+ 
+   netbsd*)
+     if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+       archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
+       archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+     else
+       archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
+       # can we support soname and/or expsyms with a.out? -oliva
+     fi
+     ;;
+ 
+   solaris*)
+     if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then
+       ld_shlibs=no
+       cat <<EOF 1>&2
+ 
+ *** Warning: The releases 2.8.* of the GNU linker cannot reliably
+ *** create shared libraries on Solaris systems.  Therefore, libtool
+ *** is disabling shared libraries support.  We urge you to upgrade GNU
+ *** binutils to release 2.9.1 or newer.  Another option is to modify
+ *** your PATH or compiler configuration so that the native linker is
+ *** used, and then restart.
+ 
+ EOF
+     elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+       archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
+       archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+     else
+       ld_shlibs=no
+     fi
+     ;;      
+ 
+   sunos4*)
+     archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linkopts'
+     wlarc=
+     hardcode_direct=yes
+     hardcode_shlibpath_var=no
+     ;;
+ 
+   *)
+     if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+       archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
+       archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+     else
+       ld_shlibs=no
+     fi
+     ;;
+   esac
  
    if test "$ld_shlibs" = yes; then
-     hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
+     runpath_var=LD_RUN_PATH
 -    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
++    hardcode_libdir_flag_spec=''
      export_dynamic_flag_spec='${wl}--export-dynamic'
+     case $host_os in
+     cygwin* | mingw*)
+       # dlltool doesn't understand --whole-archive et. al.
+       whole_archive_flag_spec=
+       ;;
+     *)
+       whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+       ;;
+     esac
    fi
  else
    # PORTME fill in a description of your system's linker (not GNU ld)
diff --cc mpi/Makefile
index fecd0e9,0000000..e288c77
mode 100644,000000..100644
--- a/mpi/Makefile
+++ b/mpi/Makefile
@@@ -1,29 -1,0 +1,453 @@@
- TRANSPOSE_DIR = transpose_mpi
- TRANSPOSE_LIB = $(TRANSPOSE_DIR)/transpose_mpi.o \
-                 $(TRANSPOSE_DIR)/TOMS_transpose.o
++# Generated automatically from Makefile.in by configure.
++# Makefile.in generated automatically by automake 1.4 from Makefile.am
 +
- FFTW_DIR = ../fftw
- FFTW_LIB = $(FFTW_DIR)/.libs/libfftw.a
++# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
++# This Makefile.in is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
 +
- INC = -I$(TRANSPOSE_DIR) -I. -I$(FFTW_DIR)
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++# PARTICULAR PURPOSE.
++
++# The mpi stuff is only compiled if FFTW was configured with
++# the --enable-mpi option.  This requires us to use the combination
++# of foo_* and EXTRA_* variables below.
++
++
++SHELL = /bin/sh
++
++srcdir = .
++top_srcdir = ..
++prefix = /usr
++exec_prefix = ${prefix}
++
++bindir = ${exec_prefix}/bin
++sbindir = ${exec_prefix}/sbin
++libexecdir = ${exec_prefix}/libexec
++datadir = ${prefix}/share
++sysconfdir = ${prefix}/etc
++sharedstatedir = ${prefix}/com
++localstatedir = ${prefix}/var
++libdir = ${exec_prefix}/lib
++infodir = ${prefix}/info
++mandir = ${prefix}/man
++includedir = ${prefix}/include
++oldincludedir = /usr/include
++
++DESTDIR =
++
++pkgdatadir = $(datadir)/fftw
++pkglibdir = $(libdir)/fftw
++pkgincludedir = $(includedir)/fftw
++
++top_builddir = ..
++
++ACLOCAL = aclocal
++AUTOCONF = autoconf
++AUTOMAKE = automake
++
++INSTALL = /usr/bin/install -c
++INSTALL_PROGRAM = ${INSTALL} $(AM_INSTALL_PROGRAM_FLAGS)
++INSTALL_DATA = ${INSTALL} -m 644
++INSTALL_SCRIPT = ${INSTALL_PROGRAM}
++transform = s,x,x,
++
++NORMAL_INSTALL = :
++PRE_INSTALL = :
++POST_INSTALL = :
++NORMAL_UNINSTALL = :
++PRE_UNINSTALL = :
++POST_UNINSTALL = :
++host_alias = i586-pc-linux-gnu
++host_triplet = i586-pc-linux-gnu
++AS = @AS@
++CCthreads = cc
++DLLTOOL = @DLLTOOL@
++F77 = f77
++FFTW_MPI_INCLUDELIST = fftw_mpi.h rfftw_mpi.h
++FFTW_MPI_LIBLIST = libfftw_mpi.la librfftw_mpi.la
++FFTW_MPI_PROGLIST = test_sched test_transpose_mpi fftw_mpi_test rfftw_mpi_test
++FFTW_PREFIX = 
++FFTW_THREADS_INCLUDELIST = fftw_threads.h rfftw_threads.h
++FFTW_THREADS_LIBLIST = libfftw_threads.la librfftw_threads.la
++FFTW_THREADS_PROGLIST = fftw_threads_test rfftw_threads_test
++FLIBS =  -lg2c -lm -L/usr/lib/gcc-lib/i386-linux/2.95.2 -lm
++LD = /usr/bin/ld
++LIBTOOL = $(SHELL) $(top_builddir)/libtool
++LN_S = ln -s
++MAKEINFO = makeinfo
++MPICC = mpicc
++MPILIBS =  
++NM = /usr/bin/nm -B
++OBJDUMP = @OBJDUMP@
++PACKAGE = fftw
++PERL = perl
++RANLIB = ranlib
++SHARED_VERSION = 2.0.5
++SHARED_VERSION_INFO = 2:5:0
++THREADLIBS = -lpthread
++VERSION = 2.1.3
++
++lib_LTLIBRARIES = libfftw_mpi.la librfftw_mpi.la
++include_HEADERS = fftw_mpi.h rfftw_mpi.h
++noinst_PROGRAMS = test_sched test_transpose_mpi fftw_mpi_test rfftw_mpi_test
++
++EXTRA_LTLIBRARIES = libfftw_mpi.la                     librfftw_mpi.la
++
++EXTRA_HEADERS = fftw_mpi.h rfftw_mpi.h 
++EXTRA_PROGRAMS = test_sched test_transpose_mpi fftw_mpi_test rfftw_mpi_test
++EXTRA_DIST = README.f77
 +
- # Solaris:
 +CC = mpicc
- CFLAGS = -native -fast -xO5 -dalign -DSOLARIS $(INC)
 +
- all: test_fftwnd_mpi time_fftwnd_mpi
++FFTWDIR = ../fftw
++RFFTWDIR = ../rfftw
++INCLUDES = -I$(srcdir)/../tests            -I$(srcdir)/$(FFTWDIR) -I$(srcdir)/$(RFFTWDIR) -I$(srcdir)
++
++
++libfftw_mpi_la_SOURCES =                           sched.c sched.h TOMS_transpose.c TOMS_transpose.h                          transpose_mpi.c fftwnd_mpi.c fftw_mpi.c                          fftw_mpi.h 			 fftw_f77_mpi.c fftw_f77_mpi.h
++
++libfftw_mpi_la_LDFLAGS =                           -version-info 2:5:0                          -rpath $(libdir)
++
++
++librfftw_mpi_la_SOURCES =                            rfftwnd_mpi.c rfftw_mpi.h 			  rfftw_f77_mpi.c
++
++librfftw_mpi_la_LDFLAGS =                            -version-info 2:5:0                           -rpath $(libdir)
++
++
++CLEANFILES = xyzfftw_mpi.h xyzrfftw_mpi.h
++
++test_sched_SOURCES = test_sched.c
++test_sched_LDADD = libfftw_mpi.la                    $(FFTWDIR)/libfftw.la  
++
++
++test_transpose_mpi_SOURCES = test_transpose_mpi.c
++test_transpose_mpi_LDADD = libfftw_mpi.la                            $(FFTWDIR)/libfftw.la  
++
++
++fftw_mpi_test_SOURCES = fftw_mpi_test.c
++fftw_mpi_test_LDADD = ../tests/test_main.o                       libfftw_mpi.la                       $(FFTWDIR)/libfftw.la  
++
++
++rfftw_mpi_test_SOURCES = rfftw_mpi_test.c
++rfftw_mpi_test_LDADD = ../tests/test_main.o                        librfftw_mpi.la                        libfftw_mpi.la 		       $(RFFTWDIR)/librfftw.la                        $(FFTWDIR)/libfftw.la                         
++
++
++# for some reason, automake tries to use autoheader in order to
++# generate config.h.in, and fails because config.h.in is GNU-lly
++# incorrect.  Just disable autoheader
++AUTOHEADER = echo
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = ../fftw/config.h ../fftw/fftw.h
++CONFIG_CLEAN_FILES = 
++LTLIBRARIES =  $(lib_LTLIBRARIES)
++
++
++DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir) -I../fftw -I../fftw
++CPPFLAGS = 
++LDFLAGS = 
++LIBS = -lm 
++libfftw_mpi_la_LIBADD = 
++libfftw_mpi_la_OBJECTS =  sched.lo TOMS_transpose.lo \
++transpose_mpi.lo fftwnd_mpi.lo fftw_mpi.lo fftw_f77_mpi.lo
++librfftw_mpi_la_LIBADD = 
++librfftw_mpi_la_OBJECTS =  rfftwnd_mpi.lo \
++rfftw_f77_mpi.lo
++PROGRAMS =  $(noinst_PROGRAMS)
++
++test_sched_OBJECTS =  test_sched.o
++test_sched_DEPENDENCIES =  libfftw_mpi.la \
++$(FFTWDIR)/libfftw.la
++test_sched_LDFLAGS = 
++test_transpose_mpi_OBJECTS =  test_transpose_mpi.o
++test_transpose_mpi_DEPENDENCIES =  libfftw_mpi.la \
++$(FFTWDIR)/libfftw.la
++test_transpose_mpi_LDFLAGS = 
++fftw_mpi_test_OBJECTS =  fftw_mpi_test.o
++fftw_mpi_test_DEPENDENCIES =  ../tests/test_main.o \
++libfftw_mpi.la \
++$(FFTWDIR)/libfftw.la
++fftw_mpi_test_LDFLAGS = 
++rfftw_mpi_test_OBJECTS =  rfftw_mpi_test.o
++rfftw_mpi_test_DEPENDENCIES =  ../tests/test_main.o \
++librfftw_mpi.la libfftw_mpi.la \
++$(RFFTWDIR)/librfftw.la \
++$(FFTWDIR)/libfftw.la
++rfftw_mpi_test_LDFLAGS = 
++CFLAGS = -O6 -fomit-frame-pointer -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align -pedantic -fno-schedule-insns -fschedule-insns2 -malign-double -fstrict-aliasing -mcpu=pentium -mpreferred-stack-boundary=2
++COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
++HEADERS =  $(include_HEADERS)
++
++DIST_COMMON =  Makefile.am Makefile.in
++
++
++DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
++
++TAR = gtar
++GZIP_ENV = --best
++SOURCES = $(libfftw_mpi_la_SOURCES) $(librfftw_mpi_la_SOURCES) $(test_sched_SOURCES) $(test_transpose_mpi_SOURCES) $(fftw_mpi_test_SOURCES) $(rfftw_mpi_test_SOURCES)
++OBJECTS = $(libfftw_mpi_la_OBJECTS) $(librfftw_mpi_la_OBJECTS) $(test_sched_OBJECTS) $(test_transpose_mpi_OBJECTS) $(fftw_mpi_test_OBJECTS) $(rfftw_mpi_test_OBJECTS)
++
++all: all-redirect
++.SUFFIXES:
++.SUFFIXES: .S .c .lo .o .s
++$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
++	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps mpi/Makefile
++
++Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
++	cd $(top_builddir) \
++	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
++
++
++mostlyclean-libLTLIBRARIES:
++
++clean-libLTLIBRARIES:
++	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
++
++distclean-libLTLIBRARIES:
++
++maintainer-clean-libLTLIBRARIES:
++
++install-libLTLIBRARIES: $(lib_LTLIBRARIES)
++	@$(NORMAL_INSTALL)
++	$(mkinstalldirs) $(DESTDIR)$(libdir)
++	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++	  if test -f $$p; then \
++	    echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p"; \
++	    $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p; \
++	  else :; fi; \
++	done
++
++uninstall-libLTLIBRARIES:
++	@$(NORMAL_UNINSTALL)
++	list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
++	done
++
++.c.o:
++	$(COMPILE) -c $<
++
++.s.o:
++	$(COMPILE) -c $<
++
++.S.o:
++	$(COMPILE) -c $<
++
++mostlyclean-compile:
++	-rm -f *.o core *.core
++
++clean-compile:
++
++distclean-compile:
++	-rm -f *.tab.c
++
++maintainer-clean-compile:
++
++.c.lo:
++	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
++
++.s.lo:
++	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
++
++.S.lo:
++	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
++
++mostlyclean-libtool:
++	-rm -f *.lo
++
++clean-libtool:
++	-rm -rf .libs _libs
++
++distclean-libtool:
++
++maintainer-clean-libtool:
++
++libfftw_mpi.la: $(libfftw_mpi_la_OBJECTS) $(libfftw_mpi_la_DEPENDENCIES)
++	$(LINK)  $(libfftw_mpi_la_LDFLAGS) $(libfftw_mpi_la_OBJECTS) $(libfftw_mpi_la_LIBADD) $(LIBS)
++
++librfftw_mpi.la: $(librfftw_mpi_la_OBJECTS) $(librfftw_mpi_la_DEPENDENCIES)
++	$(LINK)  $(librfftw_mpi_la_LDFLAGS) $(librfftw_mpi_la_OBJECTS) $(librfftw_mpi_la_LIBADD) $(LIBS)
++
++mostlyclean-noinstPROGRAMS:
++
++clean-noinstPROGRAMS:
++	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
++
++distclean-noinstPROGRAMS:
++
++maintainer-clean-noinstPROGRAMS:
++
++test_sched: $(test_sched_OBJECTS) $(test_sched_DEPENDENCIES)
++	@rm -f test_sched
++	$(LINK) $(test_sched_LDFLAGS) $(test_sched_OBJECTS) $(test_sched_LDADD) $(LIBS)
++
++test_transpose_mpi: $(test_transpose_mpi_OBJECTS) $(test_transpose_mpi_DEPENDENCIES)
++	@rm -f test_transpose_mpi
++	$(LINK) $(test_transpose_mpi_LDFLAGS) $(test_transpose_mpi_OBJECTS) $(test_transpose_mpi_LDADD) $(LIBS)
++
++fftw_mpi_test: $(fftw_mpi_test_OBJECTS) $(fftw_mpi_test_DEPENDENCIES)
++	@rm -f fftw_mpi_test
++	$(LINK) $(fftw_mpi_test_LDFLAGS) $(fftw_mpi_test_OBJECTS) $(fftw_mpi_test_LDADD) $(LIBS)
++
++rfftw_mpi_test: $(rfftw_mpi_test_OBJECTS) $(rfftw_mpi_test_DEPENDENCIES)
++	@rm -f rfftw_mpi_test
++	$(LINK) $(rfftw_mpi_test_LDFLAGS) $(rfftw_mpi_test_OBJECTS) $(rfftw_mpi_test_LDADD) $(LIBS)
++
++install-includeHEADERS: $(include_HEADERS)
++	@$(NORMAL_INSTALL)
++	$(mkinstalldirs) $(DESTDIR)$(includedir)
++	@list='$(include_HEADERS)'; for p in $$list; do \
++	  if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
++	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$p"; \
++	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$p; \
++	done
++
++uninstall-includeHEADERS:
++	@$(NORMAL_UNINSTALL)
++	list='$(include_HEADERS)'; for p in $$list; do \
++	  rm -f $(DESTDIR)$(includedir)/$$p; \
++	done
++
++tags: TAGS
++
++ID: $(HEADERS) $(SOURCES) $(LISP)
++	list='$(SOURCES) $(HEADERS)'; \
++	unique=`for i in $$list; do echo $$i; done | \
++	  awk '    { files[$$0] = 1; } \
++	       END { for (i in files) print i; }'`; \
++	here=`pwd` && cd $(srcdir) \
++	  && mkid -f$$here/ID $$unique $(LISP)
++
++TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
++	tags=; \
++	here=`pwd`; \
++	list='$(SOURCES) $(HEADERS)'; \
++	unique=`for i in $$list; do echo $$i; done | \
++	  awk '    { files[$$0] = 1; } \
++	       END { for (i in files) print i; }'`; \
++	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
++	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
++
++mostlyclean-tags:
++
++clean-tags:
++
++distclean-tags:
++	-rm -f TAGS ID
++
++maintainer-clean-tags:
++
++distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
++
++subdir = mpi
++
++distdir: $(DISTFILES)
++	@for file in $(DISTFILES); do \
++	  d=$(srcdir); \
++	  if test -d $$d/$$file; then \
++	    cp -pr $$/$$file $(distdir)/$$file; \
++	  else \
++	    test -f $(distdir)/$$file \
++	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
++	    || cp -p $$d/$$file $(distdir)/$$file || :; \
++	  fi; \
++	done
++
++info-am:
++info: info-am
++dvi-am:
++dvi: dvi-am
++check-am: all-am
++check: check-am
++installcheck-am:
++installcheck: installcheck-am
++install-exec-am: install-libLTLIBRARIES
++install-exec: install-exec-am
++
++install-data-am: install-includeHEADERS
++install-data: install-data-am
++
++install-am: all-am
++	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++install: install-am
++uninstall-am: uninstall-libLTLIBRARIES uninstall-includeHEADERS
++uninstall: uninstall-am
++all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
++all-redirect: all-am
++install-strip:
++	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
++installdirs:
++	$(mkinstalldirs)  $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
++
++
++mostlyclean-generic:
++
++clean-generic:
++	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
++
++distclean-generic:
++	-rm -f Makefile $(CONFIG_CLEAN_FILES)
++	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
++
++maintainer-clean-generic:
++mostlyclean-am:  mostlyclean-libLTLIBRARIES mostlyclean-compile \
++		mostlyclean-libtool mostlyclean-noinstPROGRAMS \
++		mostlyclean-tags mostlyclean-generic
++
++mostlyclean: mostlyclean-am
++
++clean-am:  clean-libLTLIBRARIES clean-compile clean-libtool \
++		clean-noinstPROGRAMS clean-tags clean-generic \
++		mostlyclean-am
++
++clean: clean-am
++
++distclean-am:  distclean-libLTLIBRARIES distclean-compile \
++		distclean-libtool distclean-noinstPROGRAMS \
++		distclean-tags distclean-generic clean-am
++	-rm -f libtool
++
++distclean: distclean-am
++
++maintainer-clean-am:  maintainer-clean-libLTLIBRARIES \
++		maintainer-clean-compile maintainer-clean-libtool \
++		maintainer-clean-noinstPROGRAMS maintainer-clean-tags \
++		maintainer-clean-generic distclean-am
++	@echo "This command is intended for maintainers to use;"
++	@echo "it deletes files that may require special tools to rebuild."
++
++maintainer-clean: maintainer-clean-am
++
++.PHONY: mostlyclean-libLTLIBRARIES distclean-libLTLIBRARIES \
++clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \
++uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \
++distclean-compile clean-compile maintainer-clean-compile \
++mostlyclean-libtool distclean-libtool clean-libtool \
++maintainer-clean-libtool mostlyclean-noinstPROGRAMS \
++distclean-noinstPROGRAMS clean-noinstPROGRAMS \
++maintainer-clean-noinstPROGRAMS uninstall-includeHEADERS \
++install-includeHEADERS tags mostlyclean-tags distclean-tags clean-tags \
++maintainer-clean-tags distdir info-am info dvi-am dvi check check-am \
++installcheck-am installcheck install-exec-am install-exec \
++install-data-am install-data install-am install uninstall-am uninstall \
++all-redirect all-am all installdirs mostlyclean-generic \
++distclean-generic clean-generic maintainer-clean-generic clean \
++mostlyclean distclean maintainer-clean
 +
- test_fftwnd_mpi: test_fftwnd_mpi.o fftwnd_mpi.o $(TRANSPOSE_LIB) \
- 			$(FFTW_LIB)
- 	$(CC) $(CFLAGS) test_fftwnd_mpi.o fftwnd_mpi.o $(TRANSPOSE_LIB) \
- 		$(FFTW_LIB) -lm -o test_fftwnd_mpi
 +
- time_fftwnd_mpi: time_fftwnd_mpi.o fftwnd_mpi.o $(TRANSPOSE_LIB) \
- 			$(FFTW_LIB)
- 	$(CC) $(CFLAGS) time_fftwnd_mpi.o fftwnd_mpi.o $(TRANSPOSE_LIB) \
- 		$(FFTW_LIB) -lm -o time_fftwnd_mpi
++xyzfftw_mpi.h: fftw_mpi.h
++	rm -f fftw_mpi.h
++	sed 's/<fftw/<fftw/g;s/<rfftw/<rfftw/g' fftw_mpi.h > fftw_mpi.h
 +
- distclean: clean
++xyzrfftw_mpi.h: rfftw_mpi.h
++	rm -f rfftw_mpi.h
++	sed 's/<fftw/<fftw/g;s/<rfftw/<rfftw/g' rfftw_mpi.h > rfftw_mpi.h
 +
- clean:
- 	rm -f *.o core a.out test_fftwnd_mpi time_fftwnd_mpi *~
++# Tell versions [3.59,3.63) of GNU make to not export all variables.
++# Otherwise a system limit (for SysV at least) may be exceeded.
++.NOEXPORT:
diff --cc mpi/libfftw_mpi.la
index 0000000,0000000..46e973d
new file mode 100644
--- /dev/null
+++ b/mpi/libfftw_mpi.la
@@@ -1,0 -1,0 +1,28 @@@
++# libfftw_mpi.la - a libtool library file
++# Generated by ltmain.sh - GNU libtool 1.3.3 (1.385.2.181 1999/07/02 15:49:11)
++#
++# Please DO NOT delete this file!
++# It is necessary for linking the library.
++
++# The name that we can dlopen(3).
++dlname=''
++
++# Names of this library.
++library_names=''
++
++# The name of the static archive.
++old_library='libfftw_mpi.a'
++
++# Libraries that this one depends upon.
++dependency_libs=' -lm'
++
++# Version information for libfftw_mpi.
++current=2
++age=0
++revision=5
++
++# Is this an already installed library?
++installed=no
++
++# Directory that this library needs to be installed in:
++libdir='/usr/lib'
diff --cc mpi/librfftw_mpi.la
index 0000000,0000000..061205b
new file mode 100644
--- /dev/null
+++ b/mpi/librfftw_mpi.la
@@@ -1,0 -1,0 +1,28 @@@
++# librfftw_mpi.la - a libtool library file
++# Generated by ltmain.sh - GNU libtool 1.3.3 (1.385.2.181 1999/07/02 15:49:11)
++#
++# Please DO NOT delete this file!
++# It is necessary for linking the library.
++
++# The name that we can dlopen(3).
++dlname=''
++
++# Names of this library.
++library_names=''
++
++# The name of the static archive.
++old_library='librfftw_mpi.a'
++
++# Libraries that this one depends upon.
++dependency_libs=' -lm'
++
++# Version information for librfftw_mpi.
++current=2
++age=0
++revision=5
++
++# Is this an already installed library?
++installed=no
++
++# Directory that this library needs to be installed in:
++libdir='/usr/lib'
diff --cc rfftw/Makefile
index eb382fb,0000000..c819edb
mode 100644,000000..100644
--- a/rfftw/Makefile
+++ b/rfftw/Makefile
@@@ -1,334 -1,0 +1,383 @@@
 +# Generated automatically from Makefile.in by configure.
- # Makefile.in generated automatically by automake 1.3 from Makefile.am
++# Makefile.in generated automatically by automake 1.4 from Makefile.am
 +
- # Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 +# This Makefile.in is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
 +# with or without modifications, as long as this notice is preserved.
 +
 +# This program is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
 +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 +# PARTICULAR PURPOSE.
 +
 +# This file was automatically generated
 +# DO NOT EDIT!
 +#
 +
 +
 +SHELL = /bin/sh
 +
 +srcdir = .
 +top_srcdir = ..
 +prefix = /usr
 +exec_prefix = ${prefix}
 +
 +bindir = ${exec_prefix}/bin
 +sbindir = ${exec_prefix}/sbin
 +libexecdir = ${exec_prefix}/libexec
 +datadir = ${prefix}/share
 +sysconfdir = ${prefix}/etc
 +sharedstatedir = ${prefix}/com
 +localstatedir = ${prefix}/var
 +libdir = ${exec_prefix}/lib
 +infodir = ${prefix}/info
 +mandir = ${prefix}/man
 +includedir = ${prefix}/include
 +oldincludedir = /usr/include
 +
- DISTDIR =
++DESTDIR =
 +
 +pkgdatadir = $(datadir)/fftw
 +pkglibdir = $(libdir)/fftw
 +pkgincludedir = $(includedir)/fftw
 +
 +top_builddir = ..
 +
 +ACLOCAL = aclocal
 +AUTOCONF = autoconf
 +AUTOMAKE = automake
 +
 +INSTALL = /usr/bin/install -c
- INSTALL_PROGRAM = ${INSTALL}
++INSTALL_PROGRAM = ${INSTALL} $(AM_INSTALL_PROGRAM_FLAGS)
 +INSTALL_DATA = ${INSTALL} -m 644
 +INSTALL_SCRIPT = ${INSTALL_PROGRAM}
 +transform = s,x,x,
 +
 +NORMAL_INSTALL = :
 +PRE_INSTALL = :
 +POST_INSTALL = :
 +NORMAL_UNINSTALL = :
 +PRE_UNINSTALL = :
 +POST_UNINSTALL = :
 +host_alias = i586-pc-linux-gnu
 +host_triplet = i586-pc-linux-gnu
++AS = @AS@
 +CC = cc
++CCthreads = cc
++DLLTOOL = @DLLTOOL@
++F77 = f77
++FFTW_MPI_INCLUDELIST = fftw_mpi.h rfftw_mpi.h
++FFTW_MPI_LIBLIST = libfftw_mpi.la librfftw_mpi.la
++FFTW_MPI_PROGLIST = test_sched test_transpose_mpi fftw_mpi_test rfftw_mpi_test
++FFTW_PREFIX = 
++FFTW_THREADS_INCLUDELIST = fftw_threads.h rfftw_threads.h
++FFTW_THREADS_LIBLIST = libfftw_threads.la librfftw_threads.la
++FFTW_THREADS_PROGLIST = fftw_threads_test rfftw_threads_test
++FLIBS =  -lg2c -lm -L/usr/lib/gcc-lib/i386-linux/2.95.2 -lm
 +LD = /usr/bin/ld
 +LIBTOOL = $(SHELL) $(top_builddir)/libtool
 +LN_S = ln -s
 +MAKEINFO = makeinfo
++MPICC = mpicc
++MPILIBS =  
 +NM = /usr/bin/nm -B
++OBJDUMP = @OBJDUMP@
 +PACKAGE = fftw
 +PERL = perl
 +RANLIB = ranlib
- SHARED_VERSION_INFO = 2:1:0
- VERSION = 2.0.1
++SHARED_VERSION = 2.0.5
++SHARED_VERSION_INFO = 2:5:0
++THREADLIBS = -lpthread
++VERSION = 2.1.3
 +
 +lib_LTLIBRARIES = librfftw.la
 +include_HEADERS = rfftw.h
 +INCLUDES = -I$(srcdir)/../fftw -I$(srcdir)
 +
- NOTW_CODELETS= frc_1.c frc_2.c frc_3.c frc_4.c frc_5.c frc_6.c frc_7.c frc_8.c frc_9.c frc_10.c frc_11.c frc_12.c frc_13.c frc_14.c frc_15.c frc_16.c frc_32.c frc_64.c frc_128.c
- TWID_CODELETS= fhf_2.c fhf_3.c fhf_4.c fhf_5.c fhf_6.c fhf_7.c fhf_8.c fhf_9.c fhf_10.c fhf_16.c fhf_32.c
- NOTWI_CODELETS= fcr_1.c fcr_2.c fcr_3.c fcr_4.c fcr_5.c fcr_6.c fcr_7.c fcr_8.c fcr_9.c fcr_10.c fcr_11.c fcr_12.c fcr_13.c fcr_14.c fcr_15.c fcr_16.c fcr_32.c fcr_64.c fcr_128.c
- TWIDI_CODELETS= fhb_2.c fhb_3.c fhb_4.c fhb_5.c fhb_6.c fhb_7.c fhb_8.c fhb_9.c fhb_10.c fhb_16.c fhb_32.c
++NOTW_CODELETS = frc_1.c frc_2.c frc_3.c frc_4.c frc_5.c frc_6.c frc_7.c frc_8.c frc_9.c frc_10.c frc_11.c frc_12.c frc_13.c frc_14.c frc_15.c frc_16.c frc_32.c frc_64.c frc_128.c
++TWID_CODELETS = fhf_2.c fhf_3.c fhf_4.c fhf_5.c fhf_6.c fhf_7.c fhf_8.c fhf_9.c fhf_10.c fhf_16.c fhf_32.c
++NOTWI_CODELETS = fcr_1.c fcr_2.c fcr_3.c fcr_4.c fcr_5.c fcr_6.c fcr_7.c fcr_8.c fcr_9.c fcr_10.c fcr_11.c fcr_12.c fcr_13.c fcr_14.c fcr_15.c fcr_16.c fcr_32.c fcr_64.c fcr_128.c
++TWIDI_CODELETS = fhb_2.c fhb_3.c fhb_4.c fhb_5.c fhb_6.c fhb_7.c fhb_8.c fhb_9.c fhb_10.c fhb_16.c fhb_32.c
 +
- CODELETS=$(NOTW_CODELETS) $(TWID_CODELETS) $(NOTWI_CODELETS) $(TWIDI_CODELETS)
- OTHERSRC = rconfig.c rplanner.c rexec.c rexec2.c rfftwnd.c rgeneric.c
++CODELETS = $(NOTW_CODELETS) $(TWID_CODELETS) $(NOTWI_CODELETS) $(TWIDI_CODELETS)
++OTHERSRC = rconfig.c rplanner.c rexec.c rexec2.c rfftwnd.c rgeneric.c            rfftwf77.c
 +
- librfftw_la_SOURCES = $(CODELETS) $(OTHERSRC) rfftw.h
- librfftw_la_LDFLAGS = -version-info 2:1:0
++
++librfftw_la_SOURCES = $(CODELETS) $(OTHERSRC)    					 rfftw.h                   
++
++
++librfftw_la_LDFLAGS = -version-info 2:5:0
 +MAINTAINERCLEANFILES = $(CODELETS) rconfig.c
++DISTCLEANFILES = srfftw.h drfftw.h
++
++CLEANFILES = xyzrfftw.h
 +
 +# for some reason, automake tries to use autoheader in order to
 +# generate config.h.in, and fails because config.h.in is GNU-lly
 +# incorrect.  Just disable autoheader
- AUTOHEADER=echo
++AUTOHEADER = echo
 +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 +CONFIG_HEADER = ../fftw/config.h ../fftw/fftw.h
 +CONFIG_CLEAN_FILES = 
 +LTLIBRARIES =  $(lib_LTLIBRARIES)
 +
 +
 +DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir) -I../fftw -I../fftw
 +CPPFLAGS = 
 +LDFLAGS = 
 +LIBS = -lm 
 +librfftw_la_LIBADD = 
- librfftw_la_OBJECTS =  frc_1.lo frc_2.lo frc_3.lo frc_4.lo frc_5.lo \
- frc_6.lo frc_7.lo frc_8.lo frc_9.lo frc_10.lo frc_11.lo frc_12.lo \
- frc_13.lo frc_14.lo frc_15.lo frc_16.lo frc_32.lo frc_64.lo frc_128.lo \
- fhf_2.lo fhf_3.lo fhf_4.lo fhf_5.lo fhf_6.lo fhf_7.lo fhf_8.lo fhf_9.lo \
- fhf_10.lo fhf_16.lo fhf_32.lo fcr_1.lo fcr_2.lo fcr_3.lo fcr_4.lo \
- fcr_5.lo fcr_6.lo fcr_7.lo fcr_8.lo fcr_9.lo fcr_10.lo fcr_11.lo \
- fcr_12.lo fcr_13.lo fcr_14.lo fcr_15.lo fcr_16.lo fcr_32.lo fcr_64.lo \
- fcr_128.lo fhb_2.lo fhb_3.lo fhb_4.lo fhb_5.lo fhb_6.lo fhb_7.lo \
- fhb_8.lo fhb_9.lo fhb_10.lo fhb_16.lo fhb_32.lo rconfig.lo rplanner.lo \
- rexec.lo rexec2.lo rfftwnd.lo rgeneric.lo
- CFLAGS = -O6 -fomit-frame-pointer -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align -pedantic -malign-double 
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
- LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
++librfftw_la_OBJECTS =  frc_1.lo frc_2.lo frc_3.lo \
++frc_4.lo frc_5.lo frc_6.lo frc_7.lo frc_8.lo frc_9.lo frc_10.lo \
++frc_11.lo frc_12.lo frc_13.lo frc_14.lo frc_15.lo frc_16.lo frc_32.lo \
++frc_64.lo frc_128.lo fhf_2.lo fhf_3.lo fhf_4.lo fhf_5.lo fhf_6.lo \
++fhf_7.lo fhf_8.lo fhf_9.lo fhf_10.lo fhf_16.lo fhf_32.lo fcr_1.lo \
++fcr_2.lo fcr_3.lo fcr_4.lo fcr_5.lo fcr_6.lo fcr_7.lo fcr_8.lo fcr_9.lo \
++fcr_10.lo fcr_11.lo fcr_12.lo fcr_13.lo fcr_14.lo fcr_15.lo fcr_16.lo \
++fcr_32.lo fcr_64.lo fcr_128.lo fhb_2.lo fhb_3.lo fhb_4.lo fhb_5.lo \
++fhb_6.lo fhb_7.lo fhb_8.lo fhb_9.lo fhb_10.lo fhb_16.lo fhb_32.lo \
++rconfig.lo rplanner.lo rexec.lo rexec2.lo rfftwnd.lo rgeneric.lo \
++rfftwf77.lo
++CFLAGS = -O6 -fomit-frame-pointer -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align -pedantic -fno-schedule-insns -fschedule-insns2 -malign-double -fstrict-aliasing -mcpu=pentium -mpreferred-stack-boundary=2
++COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
 +HEADERS =  $(include_HEADERS)
 +
 +DIST_COMMON =  Makefile.am Makefile.in
 +
 +
 +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 +
- TAR = tar
- GZIP = --best
++TAR = gtar
++GZIP_ENV = --best
 +SOURCES = $(librfftw_la_SOURCES)
 +OBJECTS = $(librfftw_la_OBJECTS)
 +
- all: Makefile $(LTLIBRARIES) $(HEADERS)
- 
++all: all-redirect
 +.SUFFIXES:
 +.SUFFIXES: .S .c .lo .o .s
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 +	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps rfftw/Makefile
 +
 +Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 +	cd $(top_builddir) \
 +	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 +
 +
 +mostlyclean-libLTLIBRARIES:
 +
 +clean-libLTLIBRARIES:
 +	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
 +
 +distclean-libLTLIBRARIES:
 +
 +maintainer-clean-libLTLIBRARIES:
 +
 +install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 +	@$(NORMAL_INSTALL)
 +	$(mkinstalldirs) $(DESTDIR)$(libdir)
 +	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 +	  if test -f $$p; then \
- 	    echo "$(LIBTOOL)  --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p"; \
- 	    $(LIBTOOL)  --mode=install $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p; \
++	    echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p"; \
++	    $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p; \
 +	  else :; fi; \
 +	done
 +
 +uninstall-libLTLIBRARIES:
 +	@$(NORMAL_UNINSTALL)
 +	list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 +	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
 +	done
 +
 +.c.o:
 +	$(COMPILE) -c $<
 +
 +.s.o:
 +	$(COMPILE) -c $<
 +
 +.S.o:
 +	$(COMPILE) -c $<
 +
 +mostlyclean-compile:
 +	-rm -f *.o core *.core
 +
 +clean-compile:
 +
 +distclean-compile:
 +	-rm -f *.tab.c
 +
 +maintainer-clean-compile:
 +
 +.c.lo:
 +	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
 +
 +.s.lo:
 +	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
 +
 +.S.lo:
 +	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
 +
 +mostlyclean-libtool:
 +	-rm -f *.lo
 +
 +clean-libtool:
 +	-rm -rf .libs _libs
 +
 +distclean-libtool:
 +
 +maintainer-clean-libtool:
 +
 +librfftw.la: $(librfftw_la_OBJECTS) $(librfftw_la_DEPENDENCIES)
 +	$(LINK) -rpath $(libdir) $(librfftw_la_LDFLAGS) $(librfftw_la_OBJECTS) $(librfftw_la_LIBADD) $(LIBS)
 +
 +install-includeHEADERS: $(include_HEADERS)
 +	@$(NORMAL_INSTALL)
 +	$(mkinstalldirs) $(DESTDIR)$(includedir)
 +	@list='$(include_HEADERS)'; for p in $$list; do \
 +	  if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
 +	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$p"; \
 +	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$p; \
 +	done
 +
 +uninstall-includeHEADERS:
 +	@$(NORMAL_UNINSTALL)
 +	list='$(include_HEADERS)'; for p in $$list; do \
 +	  rm -f $(DESTDIR)$(includedir)/$$p; \
 +	done
 +
 +tags: TAGS
 +
 +ID: $(HEADERS) $(SOURCES) $(LISP)
++	list='$(SOURCES) $(HEADERS)'; \
++	unique=`for i in $$list; do echo $$i; done | \
++	  awk '    { files[$$0] = 1; } \
++	       END { for (i in files) print i; }'`; \
 +	here=`pwd` && cd $(srcdir) \
- 	  && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP)
++	  && mkid -f$$here/ID $$unique $(LISP)
 +
 +TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
 +	tags=; \
 +	here=`pwd`; \
 +	list='$(SOURCES) $(HEADERS)'; \
 +	unique=`for i in $$list; do echo $$i; done | \
 +	  awk '    { files[$$0] = 1; } \
 +	       END { for (i in files) print i; }'`; \
 +	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
 +	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
 +
 +mostlyclean-tags:
 +
 +clean-tags:
 +
 +distclean-tags:
 +	-rm -f TAGS ID
 +
 +maintainer-clean-tags:
 +
 +distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 +
 +subdir = rfftw
 +
 +distdir: $(DISTFILES)
 +	@for file in $(DISTFILES); do \
 +	  d=$(srcdir); \
- 	  test -f $(distdir)/$$file \
- 	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
- 	  || cp -p $$d/$$file $(distdir)/$$file; \
++	  if test -d $$d/$$file; then \
++	    cp -pr $$/$$file $(distdir)/$$file; \
++	  else \
++	    test -f $(distdir)/$$file \
++	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
++	    || cp -p $$d/$$file $(distdir)/$$file || :; \
++	  fi; \
 +	done
 +
- info:
- dvi:
- check: all
- 	$(MAKE)
- installcheck:
- install-exec: install-libLTLIBRARIES
- 	@$(NORMAL_INSTALL)
- 
- install-data: install-includeHEADERS
- 	@$(NORMAL_INSTALL)
- 
- install: install-exec install-data all
- 	@:
- 
- uninstall: uninstall-libLTLIBRARIES uninstall-includeHEADERS
- 
++info-am:
++info: info-am
++dvi-am:
++dvi: dvi-am
++check-am: all-am
++check: check-am
++installcheck-am:
++installcheck: installcheck-am
++install-exec-am: install-libLTLIBRARIES
++install-exec: install-exec-am
++
++install-data-am: install-includeHEADERS
++install-data: install-data-am
++
++install-am: all-am
++	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++install: install-am
++uninstall-am: uninstall-libLTLIBRARIES uninstall-includeHEADERS
++uninstall: uninstall-am
++all-am: Makefile $(LTLIBRARIES) $(HEADERS)
++all-redirect: all-am
 +install-strip:
- 	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
++	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
 +installdirs:
- 	$(mkinstalldirs)  $(DATADIR)$(libdir) $(DATADIR)$(includedir)
++	$(mkinstalldirs)  $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
 +
 +
 +mostlyclean-generic:
- 	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 +
 +clean-generic:
 +	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 +
 +distclean-generic:
- 	-rm -f Makefile $(DISTCLEANFILES)
++	-rm -f Makefile $(CONFIG_CLEAN_FILES)
 +	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
- 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 +
 +maintainer-clean-generic:
 +	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
- 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
- mostlyclean:  mostlyclean-libLTLIBRARIES mostlyclean-compile \
++mostlyclean-am:  mostlyclean-libLTLIBRARIES mostlyclean-compile \
 +		mostlyclean-libtool mostlyclean-tags \
 +		mostlyclean-generic
 +
- clean:  clean-libLTLIBRARIES clean-compile clean-libtool clean-tags \
- 		clean-generic mostlyclean
++mostlyclean: mostlyclean-am
 +
- distclean:  distclean-libLTLIBRARIES distclean-compile distclean-libtool \
- 		distclean-tags distclean-generic clean
- 	-rm -f config.status
++clean-am:  clean-libLTLIBRARIES clean-compile clean-libtool clean-tags \
++		clean-generic mostlyclean-am
++
++clean: clean-am
++
++distclean-am:  distclean-libLTLIBRARIES distclean-compile \
++		distclean-libtool distclean-tags distclean-generic \
++		clean-am
 +	-rm -f libtool
 +
- maintainer-clean:  maintainer-clean-libLTLIBRARIES \
++distclean: distclean-am
++
++maintainer-clean-am:  maintainer-clean-libLTLIBRARIES \
 +		maintainer-clean-compile maintainer-clean-libtool \
 +		maintainer-clean-tags maintainer-clean-generic \
- 		distclean
++		distclean-am
 +	@echo "This command is intended for maintainers to use;"
 +	@echo "it deletes files that may require special tools to rebuild."
 +
++maintainer-clean: maintainer-clean-am
++
 +.PHONY: mostlyclean-libLTLIBRARIES distclean-libLTLIBRARIES \
 +clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \
 +uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \
 +distclean-compile clean-compile maintainer-clean-compile \
 +mostlyclean-libtool distclean-libtool clean-libtool \
 +maintainer-clean-libtool uninstall-includeHEADERS \
 +install-includeHEADERS tags mostlyclean-tags distclean-tags clean-tags \
- maintainer-clean-tags distdir info dvi installcheck install-exec \
- install-data install uninstall all installdirs mostlyclean-generic \
++maintainer-clean-tags distdir info-am info dvi-am dvi check check-am \
++installcheck-am installcheck install-exec-am install-exec \
++install-data-am install-data install-am install uninstall-am uninstall \
++all-redirect all-am all installdirs mostlyclean-generic \
 +distclean-generic clean-generic maintainer-clean-generic clean \
 +mostlyclean distclean maintainer-clean
 +
 +
++xyzrfftw.h: rfftw.h
++	rm -f rfftw.h
++	sed 's/<fftw/<fftw/g;s/<rfftw/<rfftw/g' rfftw.h > rfftw.h
++
 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
diff --cc rfftw/librfftw.la
index f6e8e70,0000000..30129dc
mode 100644,000000..100644
--- a/rfftw/librfftw.la
+++ b/rfftw/librfftw.la
@@@ -1,22 -1,0 +1,28 @@@
 +# librfftw.la - a libtool library file
- # Generated by ltmain.sh - GNU libtool 1.2
++# Generated by ltmain.sh - GNU libtool 1.3.3 (1.385.2.181 1999/07/02 15:49:11)
++#
++# Please DO NOT delete this file!
++# It is necessary for linking the library.
 +
 +# The name that we can dlopen(3).
 +dlname=''
 +
 +# Names of this library.
 +library_names=''
 +
 +# The name of the static archive.
 +old_library='librfftw.a'
 +
 +# Libraries that this one depends upon.
 +dependency_libs=' -lm'
 +
 +# Version information for librfftw.
 +current=2
 +age=0
- revision=1
++revision=5
++
++# Is this an already installed library?
++installed=no
 +
 +# Directory that this library needs to be installed in:
 +libdir='/usr/lib'
diff --cc tests/Makefile
index c2594fd,0000000..42ce4e1
mode 100644,000000..100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@@ -1,309 -1,0 +1,346 @@@
 +# Generated automatically from Makefile.in by configure.
- # Makefile.in generated automatically by automake 1.3 from Makefile.am
++# Makefile.in generated automatically by automake 1.4 from Makefile.am
 +
- # Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 +# This Makefile.in is free software; the Free Software Foundation
 +# gives unlimited permission to copy and/or distribute it,
 +# with or without modifications, as long as this notice is preserved.
 +
 +# This program is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
 +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 +# PARTICULAR PURPOSE.
 +
 +
 +SHELL = /bin/sh
 +
 +srcdir = .
 +top_srcdir = ..
 +prefix = /usr
 +exec_prefix = ${prefix}
 +
 +bindir = ${exec_prefix}/bin
 +sbindir = ${exec_prefix}/sbin
 +libexecdir = ${exec_prefix}/libexec
 +datadir = ${prefix}/share
 +sysconfdir = ${prefix}/etc
 +sharedstatedir = ${prefix}/com
 +localstatedir = ${prefix}/var
 +libdir = ${exec_prefix}/lib
 +infodir = ${prefix}/info
 +mandir = ${prefix}/man
 +includedir = ${prefix}/include
 +oldincludedir = /usr/include
 +
- DISTDIR =
++DESTDIR =
 +
 +pkgdatadir = $(datadir)/fftw
 +pkglibdir = $(libdir)/fftw
 +pkgincludedir = $(includedir)/fftw
 +
 +top_builddir = ..
 +
 +ACLOCAL = aclocal
 +AUTOCONF = autoconf
 +AUTOMAKE = automake
 +AUTOHEADER = autoheader
 +
 +INSTALL = /usr/bin/install -c
- INSTALL_PROGRAM = ${INSTALL}
++INSTALL_PROGRAM = ${INSTALL} $(AM_INSTALL_PROGRAM_FLAGS)
 +INSTALL_DATA = ${INSTALL} -m 644
 +INSTALL_SCRIPT = ${INSTALL_PROGRAM}
 +transform = s,x,x,
 +
 +NORMAL_INSTALL = :
 +PRE_INSTALL = :
 +POST_INSTALL = :
 +NORMAL_UNINSTALL = :
 +PRE_UNINSTALL = :
 +POST_UNINSTALL = :
 +host_alias = i586-pc-linux-gnu
 +host_triplet = i586-pc-linux-gnu
++AS = @AS@
 +CC = cc
++CCthreads = cc
++DLLTOOL = @DLLTOOL@
++F77 = f77
++FFTW_MPI_INCLUDELIST = fftw_mpi.h rfftw_mpi.h
++FFTW_MPI_LIBLIST = libfftw_mpi.la librfftw_mpi.la
++FFTW_MPI_PROGLIST = test_sched test_transpose_mpi fftw_mpi_test rfftw_mpi_test
++FFTW_PREFIX = 
++FFTW_THREADS_INCLUDELIST = fftw_threads.h rfftw_threads.h
++FFTW_THREADS_LIBLIST = libfftw_threads.la librfftw_threads.la
++FFTW_THREADS_PROGLIST = fftw_threads_test rfftw_threads_test
++FLIBS =  -lg2c -lm -L/usr/lib/gcc-lib/i386-linux/2.95.2 -lm
 +LD = /usr/bin/ld
 +LIBTOOL = $(SHELL) $(top_builddir)/libtool
 +LN_S = ln -s
 +MAKEINFO = makeinfo
++MPICC = mpicc
++MPILIBS =  
 +NM = /usr/bin/nm -B
++OBJDUMP = @OBJDUMP@
 +PACKAGE = fftw
 +PERL = perl
 +RANLIB = ranlib
- SHARED_VERSION_INFO = 2:1:0
- VERSION = 2.0.1
++SHARED_VERSION = 2.0.5
++SHARED_VERSION_INFO = 2:5:0
++THREADLIBS = -lpthread
++VERSION = 2.1.3
 +
 +noinst_PROGRAMS = fftw_test rfftw_test
 +noinst_HEADERS = test_main.h
 +
- FFTWDIR=../fftw
- RFFTWDIR=../rfftw
++FFTWDIR = ../fftw
++RFFTWDIR = ../rfftw
 +INCLUDES = -I$(srcdir)/$(FFTWDIR) -I$(srcdir)/$(RFFTWDIR)
 +
 +fftw_test_SOURCES = fftw_test.c test_main.c
- fftw_test_LDADD = $(FFTWDIR)/libfftw.la -lm
++fftw_test_LDADD = $(FFTWDIR)/libfftw.la
 +
 +rfftw_test_SOURCES = rfftw_test.c test_main.c
- rfftw_test_LDADD = $(FFTWDIR)/libfftw.la $(RFFTWDIR)/librfftw.la -lm
++rfftw_test_LDADD = $(RFFTWDIR)/librfftw.la                    $(FFTWDIR)/libfftw.la
++
 +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 +CONFIG_HEADER = ../fftw/config.h ../fftw/fftw.h
 +CONFIG_CLEAN_FILES = 
 +PROGRAMS =  $(noinst_PROGRAMS)
 +
 +
 +DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir) -I../fftw -I../fftw
 +CPPFLAGS = 
 +LDFLAGS = 
 +LIBS = -lm 
 +fftw_test_OBJECTS =  fftw_test.o test_main.o
 +fftw_test_DEPENDENCIES =  $(FFTWDIR)/libfftw.la
 +fftw_test_LDFLAGS = 
 +rfftw_test_OBJECTS =  rfftw_test.o test_main.o
- rfftw_test_DEPENDENCIES =  $(FFTWDIR)/libfftw.la $(RFFTWDIR)/librfftw.la
++rfftw_test_DEPENDENCIES =  $(RFFTWDIR)/librfftw.la \
++$(FFTWDIR)/libfftw.la
 +rfftw_test_LDFLAGS = 
- CFLAGS = -O6 -fomit-frame-pointer -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align -pedantic -malign-double 
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
- LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
++CFLAGS = -O6 -fomit-frame-pointer -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align -pedantic -fno-schedule-insns -fschedule-insns2 -malign-double -fstrict-aliasing -mcpu=pentium -mpreferred-stack-boundary=2
++COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
 +HEADERS =  $(noinst_HEADERS)
 +
 +DIST_COMMON =  README Makefile.am Makefile.in
 +
 +
 +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 +
- TAR = tar
- GZIP = --best
++TAR = gtar
++GZIP_ENV = --best
 +SOURCES = $(fftw_test_SOURCES) $(rfftw_test_SOURCES)
 +OBJECTS = $(fftw_test_OBJECTS) $(rfftw_test_OBJECTS)
 +
- all: Makefile $(PROGRAMS) $(HEADERS)
- 
++all: all-redirect
 +.SUFFIXES:
 +.SUFFIXES: .S .c .lo .o .s
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
++$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 +	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps tests/Makefile
 +
 +Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 +	cd $(top_builddir) \
 +	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 +
 +
 +mostlyclean-noinstPROGRAMS:
 +
 +clean-noinstPROGRAMS:
 +	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
 +
 +distclean-noinstPROGRAMS:
 +
 +maintainer-clean-noinstPROGRAMS:
 +
 +.c.o:
 +	$(COMPILE) -c $<
 +
 +.s.o:
 +	$(COMPILE) -c $<
 +
 +.S.o:
 +	$(COMPILE) -c $<
 +
 +mostlyclean-compile:
 +	-rm -f *.o core *.core
 +
 +clean-compile:
 +
 +distclean-compile:
 +	-rm -f *.tab.c
 +
 +maintainer-clean-compile:
 +
 +.c.lo:
 +	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
 +
 +.s.lo:
 +	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
 +
 +.S.lo:
 +	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
 +
 +mostlyclean-libtool:
 +	-rm -f *.lo
 +
 +clean-libtool:
 +	-rm -rf .libs _libs
 +
 +distclean-libtool:
 +
 +maintainer-clean-libtool:
 +
 +fftw_test: $(fftw_test_OBJECTS) $(fftw_test_DEPENDENCIES)
 +	@rm -f fftw_test
 +	$(LINK) $(fftw_test_LDFLAGS) $(fftw_test_OBJECTS) $(fftw_test_LDADD) $(LIBS)
 +
 +rfftw_test: $(rfftw_test_OBJECTS) $(rfftw_test_DEPENDENCIES)
 +	@rm -f rfftw_test
 +	$(LINK) $(rfftw_test_LDFLAGS) $(rfftw_test_OBJECTS) $(rfftw_test_LDADD) $(LIBS)
 +
 +tags: TAGS
 +
 +ID: $(HEADERS) $(SOURCES) $(LISP)
++	list='$(SOURCES) $(HEADERS)'; \
++	unique=`for i in $$list; do echo $$i; done | \
++	  awk '    { files[$$0] = 1; } \
++	       END { for (i in files) print i; }'`; \
 +	here=`pwd` && cd $(srcdir) \
- 	  && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP)
++	  && mkid -f$$here/ID $$unique $(LISP)
 +
 +TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
 +	tags=; \
 +	here=`pwd`; \
 +	list='$(SOURCES) $(HEADERS)'; \
 +	unique=`for i in $$list; do echo $$i; done | \
 +	  awk '    { files[$$0] = 1; } \
 +	       END { for (i in files) print i; }'`; \
 +	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
 +	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
 +
 +mostlyclean-tags:
 +
 +clean-tags:
 +
 +distclean-tags:
 +	-rm -f TAGS ID
 +
 +maintainer-clean-tags:
 +
 +distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 +
 +subdir = tests
 +
 +distdir: $(DISTFILES)
 +	@for file in $(DISTFILES); do \
 +	  d=$(srcdir); \
- 	  test -f $(distdir)/$$file \
- 	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
- 	  || cp -p $$d/$$file $(distdir)/$$file; \
++	  if test -d $$d/$$file; then \
++	    cp -pr $$/$$file $(distdir)/$$file; \
++	  else \
++	    test -f $(distdir)/$$file \
++	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
++	    || cp -p $$d/$$file $(distdir)/$$file || :; \
++	  fi; \
 +	done
 +
- info:
- dvi:
- check: all
- 	$(MAKE)
- installcheck:
- install-exec: 
- 	@$(NORMAL_INSTALL)
- 
- install-data: 
- 	@$(NORMAL_INSTALL)
- 
- install: install-exec install-data all
- 	@:
- 
- uninstall: 
- 
++info-am:
++info: info-am
++dvi-am:
++dvi: dvi-am
++check-am: all-am
++check: check-am
++installcheck-am:
++installcheck: installcheck-am
++install-exec-am:
++install-exec: install-exec-am
++
++install-data-am:
++install-data: install-data-am
++
++install-am: all-am
++	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++install: install-am
++uninstall-am:
++uninstall: uninstall-am
++all-am: Makefile $(PROGRAMS) $(HEADERS)
++all-redirect: all-am
 +install-strip:
- 	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
++	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
 +installdirs:
 +
 +
 +mostlyclean-generic:
- 	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 +
 +clean-generic:
- 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 +
 +distclean-generic:
- 	-rm -f Makefile $(DISTCLEANFILES)
++	-rm -f Makefile $(CONFIG_CLEAN_FILES)
 +	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
- 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 +
 +maintainer-clean-generic:
- 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
- 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
- mostlyclean:  mostlyclean-noinstPROGRAMS mostlyclean-compile \
++mostlyclean-am:  mostlyclean-noinstPROGRAMS mostlyclean-compile \
 +		mostlyclean-libtool mostlyclean-tags \
 +		mostlyclean-generic
 +
- clean:  clean-noinstPROGRAMS clean-compile clean-libtool clean-tags \
- 		clean-generic mostlyclean
++mostlyclean: mostlyclean-am
++
++clean-am:  clean-noinstPROGRAMS clean-compile clean-libtool clean-tags \
++		clean-generic mostlyclean-am
 +
- distclean:  distclean-noinstPROGRAMS distclean-compile distclean-libtool \
- 		distclean-tags distclean-generic clean
- 	-rm -f config.status
++clean: clean-am
++
++distclean-am:  distclean-noinstPROGRAMS distclean-compile \
++		distclean-libtool distclean-tags distclean-generic \
++		clean-am
 +	-rm -f libtool
 +
- maintainer-clean:  maintainer-clean-noinstPROGRAMS \
++distclean: distclean-am
++
++maintainer-clean-am:  maintainer-clean-noinstPROGRAMS \
 +		maintainer-clean-compile maintainer-clean-libtool \
 +		maintainer-clean-tags maintainer-clean-generic \
- 		distclean
++		distclean-am
 +	@echo "This command is intended for maintainers to use;"
 +	@echo "it deletes files that may require special tools to rebuild."
 +
++maintainer-clean: maintainer-clean-am
++
 +.PHONY: mostlyclean-noinstPROGRAMS distclean-noinstPROGRAMS \
 +clean-noinstPROGRAMS maintainer-clean-noinstPROGRAMS \
 +mostlyclean-compile distclean-compile clean-compile \
 +maintainer-clean-compile mostlyclean-libtool distclean-libtool \
 +clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
- distclean-tags clean-tags maintainer-clean-tags distdir info dvi \
- installcheck install-exec install-data install uninstall all \
- installdirs mostlyclean-generic distclean-generic clean-generic \
++distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
++dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
++install-exec install-data-am install-data install-am install \
++uninstall-am uninstall all-redirect all-am all installdirs \
++mostlyclean-generic distclean-generic clean-generic \
 +maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 +
 +
 +check: fftw-tests rfftw-tests 
 +
 +fftw-tests: fftw_test
- 	./fftw_test -p
- 	./fftw_test -x 128 -a
- 	./fftw_test -x 32 -d 2 -a
- 	./fftw_test -x 100 -r
++	./fftw_test -p 0
++	./fftw_test -x 128 -a 0
++	./fftw_test -x 32 -a 2
++	./fftw_test -x 100 -r 0
 +	@echo "--------------------------------------------------------------"
 +	@echo "         FFTW complex-complex transforms passed tests!"
 +	@echo "--------------------------------------------------------------"
 +
 +rfftw-tests: rfftw_test
- 	./rfftw_test -p
- 	./rfftw_test -x 128 -a
- 	./rfftw_test -x 32 -d 2 -a
- 	./rfftw_test -x 100 -r
++	./rfftw_test -p 0
++	./rfftw_test -x 128 -a 0
++	./rfftw_test -x 32 -a 2
++	./rfftw_test -x 100 -r 0
 +	@echo "--------------------------------------------------------------"
 +	@echo "          RFFTW real-complex transforms passed tests!"
 +	@echo "--------------------------------------------------------------"
 +
 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
diff --cc threads/Makefile
index 42e97c2,0000000..246ed9c
mode 100644,000000..100644
--- a/threads/Makefile
+++ b/threads/Makefile
@@@ -1,96 -1,0 +1,457 @@@
- FFTWDIR = ../fftw
- FFTW_INCLUDE = -I$(FFTWDIR)
- FFTW_LIB = $(FFTWDIR)/.libs/libfftw.a
++# Generated automatically from Makefile.in by configure.
++# Makefile.in generated automatically by automake 1.4 from Makefile.am
++
++# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
++# This Makefile.in is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++# PARTICULAR PURPOSE.
++
++# The threads stuff is only compiled if FFTW was configured with
++# the --enable-threads option.  This requires us to use the combination
++# of foo_* and EXTRA_* variables below.
++
 +
- LIBFFTW_THREADS = libfftw_threads.a
++SHELL = /bin/sh
 +
- # Set where you want to install the library for "make install"
- prefix = /usr/local
- LIBDIR = $(prefix)/lib
- INCLUDEDIR = $(prefix)/include
++srcdir = .
++top_srcdir = ..
++prefix = /usr
++exec_prefix = ${prefix}
 +
- ##### Set the thread library that is used #####
++bindir = ${exec_prefix}/bin
++sbindir = ${exec_prefix}/sbin
++libexecdir = ${exec_prefix}/libexec
++datadir = ${prefix}/share
++sysconfdir = ${prefix}/etc
++sharedstatedir = ${prefix}/com
++localstatedir = ${prefix}/var
++libdir = ${exec_prefix}/lib
++infodir = ${prefix}/info
++mandir = ${prefix}/man
++includedir = ${prefix}/include
++oldincludedir = /usr/include
 +
- # POSIX threads:
- FFTW_THREADS = FFTW_USING_POSIX_THREADS  # the default
- FFTW_THREADLIB = -lpthread
++DESTDIR =
 +
- # Solaris threads:
- # FFTW_THREADS = FFTW_USING_SOLARIS_THREADS
- # FFTW_THREADLIB = -lthread
++pkgdatadir = $(datadir)/fftw
++pkglibdir = $(libdir)/fftw
++pkgincludedir = $(includedir)/fftw
 +
- # BeOS threads: (tested for DR8.2)
- # FFTW_THREADS = FFTW_USING_BEOS_THREADS
- # FFTW_THREADLIB =   # ...add any libraries here that need to be linked in
++top_builddir = ..
 +
- # Win32 threads: (reported by users as working in NT with MS compilers)
- # FFTW_THREADS = FFTW_USING_WIN32_THREADS
- # FFTW_THREADLIB =   # ...add any libraries here that need to be linked in
++ACLOCAL = aclocal
++AUTOCONF = autoconf
++AUTOMAKE = automake
 +
- ##### Defining the compilers used, etc.   #####
++INSTALL = /usr/bin/install -c
++INSTALL_PROGRAM = ${INSTALL} $(AM_INSTALL_PROGRAM_FLAGS)
++INSTALL_DATA = ${INSTALL} -m 644
++INSTALL_SCRIPT = ${INSTALL_PROGRAM}
++transform = s,x,x,
 +
- # On systems that have ranlib:
++NORMAL_INSTALL = :
++PRE_INSTALL = :
++POST_INSTALL = :
++NORMAL_UNINSTALL = :
++PRE_UNINSTALL = :
++POST_UNINSTALL = :
++host_alias = i586-pc-linux-gnu
++host_triplet = i586-pc-linux-gnu
++AS = @AS@
++CC = cc
++CCthreads = cc
++DLLTOOL = @DLLTOOL@
++F77 = f77
++FFTW_MPI_INCLUDELIST = fftw_mpi.h rfftw_mpi.h
++FFTW_MPI_LIBLIST = libfftw_mpi.la librfftw_mpi.la
++FFTW_MPI_PROGLIST = test_sched test_transpose_mpi fftw_mpi_test rfftw_mpi_test
++FFTW_PREFIX = 
++FFTW_THREADS_INCLUDELIST = fftw_threads.h rfftw_threads.h
++FFTW_THREADS_LIBLIST = libfftw_threads.la librfftw_threads.la
++FFTW_THREADS_PROGLIST = fftw_threads_test rfftw_threads_test
++FLIBS =  -lg2c -lm -L/usr/lib/gcc-lib/i386-linux/2.95.2 -lm
++LD = /usr/bin/ld
++LIBTOOL = $(SHELL) $(top_builddir)/libtool
++LN_S = ln -s
++MAKEINFO = makeinfo
++MPICC = mpicc
++MPILIBS =  
++NM = /usr/bin/nm -B
++OBJDUMP = @OBJDUMP@
++PACKAGE = fftw
++PERL = perl
 +RANLIB = ranlib
++SHARED_VERSION = 2.0.5
++SHARED_VERSION_INFO = 2:5:0
++THREADLIBS = -lpthread
++VERSION = 2.1.3
++
++lib_LTLIBRARIES = libfftw_threads.la librfftw_threads.la
++include_HEADERS = fftw_threads.h rfftw_threads.h
++noinst_PROGRAMS = fftw_threads_test rfftw_threads_test
++
++EXTRA_LTLIBRARIES = libfftw_threads.la                     librfftw_threads.la
++
++EXTRA_HEADERS = fftw_threads.h                 rfftw_threads.h
++
++EXTRA_PROGRAMS = fftw_threads_test rfftw_threads_test
++
++FFTWDIR = ../fftw
++RFFTWDIR = ../rfftw
++INCLUDES = -I$(srcdir)/../tests            -I$(srcdir)/$(FFTWDIR) -I$(srcdir)/$(RFFTWDIR) -I$(srcdir)
++
++
++libfftw_threads_la_SOURCES =                               executor_threads.c fftw_threads.c                              fftwnd_threads.c                              fftw_f77_threads.c 	                     fftw_threads.h                              fftw_threads-int.h
++
++libfftw_threads_la_LDFLAGS =                               -version-info 2:5:0                              -rpath $(libdir)
++
++
++fftw_threads_test_SOURCES = fftw_threads_test.c
++fftw_threads_test_LDADD = ../tests/test_main.o 	                  libfftw_threads.la                           $(FFTWDIR)/libfftw.la 	 		  -lpthread
++
++
++librfftw_threads_la_SOURCES =                                rexec_threads.c rexec2_threads.c     	                      rfftwnd_threads.c                               rfftw_f77_threads.c 	                      fftw_threads.h                               fftw_threads-int.h                               rfftw_threads.h
++
++librfftw_threads_la_LDFLAGS =                                -version-info 2:5:0                               -rpath $(libdir)
++
++
++CLEANFILES = xyzfftw_threads.h              xyzrfftw_threads.h
++
++
++rfftw_threads_test_SOURCES = rfftw_threads_test.c
++rfftw_threads_test_LDADD = ../tests/test_main.o 	                  librfftw_threads.la                           libfftw_threads.la                           $(RFFTWDIR)/librfftw.la                           $(FFTWDIR)/libfftw.la 			  -lpthread
++
++
++# for some reason, automake tries to use autoheader in order to
++# generate config.h.in, and fails because config.h.in is GNU-lly
++# incorrect.  Just disable autoheader
++AUTOHEADER = echo
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = ../fftw/config.h ../fftw/fftw.h
++CONFIG_CLEAN_FILES = 
++LTLIBRARIES =  $(lib_LTLIBRARIES)
++
++
++DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir) -I../fftw -I../fftw
++CPPFLAGS = 
++LDFLAGS = 
++LIBS = -lm 
++libfftw_threads_la_LIBADD = 
++libfftw_threads_la_OBJECTS =  executor_threads.lo \
++fftw_threads.lo fftwnd_threads.lo fftw_f77_threads.lo
++librfftw_threads_la_LIBADD = 
++librfftw_threads_la_OBJECTS =  rexec_threads.lo \
++rexec2_threads.lo rfftwnd_threads.lo rfftw_f77_threads.lo
++PROGRAMS =  $(noinst_PROGRAMS)
++
++fftw_threads_test_OBJECTS =  fftw_threads_test.o
++fftw_threads_test_DEPENDENCIES =  ../tests/test_main.o \
++libfftw_threads.la \
++$(FFTWDIR)/libfftw.la
++fftw_threads_test_LDFLAGS = 
++rfftw_threads_test_OBJECTS =  rfftw_threads_test.o
++rfftw_threads_test_DEPENDENCIES =  ../tests/test_main.o \
++librfftw_threads.la \
++libfftw_threads.la \
++$(RFFTWDIR)/librfftw.la \
++$(FFTWDIR)/libfftw.la
++rfftw_threads_test_LDFLAGS = 
++CFLAGS = -O6 -fomit-frame-pointer -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align -pedantic -fno-schedule-insns -fschedule-insns2 -malign-double -fstrict-aliasing -mcpu=pentium -mpreferred-stack-boundary=2
++COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
++HEADERS =  $(include_HEADERS)
++
++DIST_COMMON =  Makefile.am Makefile.in
++
++
++DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
++
++TAR = gtar
++GZIP_ENV = --best
++SOURCES = $(libfftw_threads_la_SOURCES) $(librfftw_threads_la_SOURCES) $(fftw_threads_test_SOURCES) $(rfftw_threads_test_SOURCES)
++OBJECTS = $(libfftw_threads_la_OBJECTS) $(librfftw_threads_la_OBJECTS) $(fftw_threads_test_OBJECTS) $(rfftw_threads_test_OBJECTS)
++
++all: all-redirect
++.SUFFIXES:
++.SUFFIXES: .S .c .lo .o .s
++$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
++	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps threads/Makefile
++
++Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
++	cd $(top_builddir) \
++	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
++
++
++mostlyclean-libLTLIBRARIES:
++
++clean-libLTLIBRARIES:
++	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
++
++distclean-libLTLIBRARIES:
++
++maintainer-clean-libLTLIBRARIES:
++
++install-libLTLIBRARIES: $(lib_LTLIBRARIES)
++	@$(NORMAL_INSTALL)
++	$(mkinstalldirs) $(DESTDIR)$(libdir)
++	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++	  if test -f $$p; then \
++	    echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p"; \
++	    $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p; \
++	  else :; fi; \
++	done
++
++uninstall-libLTLIBRARIES:
++	@$(NORMAL_UNINSTALL)
++	list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
++	done
++
++.c.o:
++	$(COMPILE) -c $<
++
++.s.o:
++	$(COMPILE) -c $<
++
++.S.o:
++	$(COMPILE) -c $<
++
++mostlyclean-compile:
++	-rm -f *.o core *.core
++
++clean-compile:
++
++distclean-compile:
++	-rm -f *.tab.c
++
++maintainer-clean-compile:
++
++.c.lo:
++	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
++
++.s.lo:
++	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
++
++.S.lo:
++	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
++
++mostlyclean-libtool:
++	-rm -f *.lo
++
++clean-libtool:
++	-rm -rf .libs _libs
++
++distclean-libtool:
++
++maintainer-clean-libtool:
++
++libfftw_threads.la: $(libfftw_threads_la_OBJECTS) $(libfftw_threads_la_DEPENDENCIES)
++	$(LINK)  $(libfftw_threads_la_LDFLAGS) $(libfftw_threads_la_OBJECTS) $(libfftw_threads_la_LIBADD) $(LIBS)
++
++librfftw_threads.la: $(librfftw_threads_la_OBJECTS) $(librfftw_threads_la_DEPENDENCIES)
++	$(LINK)  $(librfftw_threads_la_LDFLAGS) $(librfftw_threads_la_OBJECTS) $(librfftw_threads_la_LIBADD) $(LIBS)
++
++mostlyclean-noinstPROGRAMS:
++
++clean-noinstPROGRAMS:
++	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
++
++distclean-noinstPROGRAMS:
++
++maintainer-clean-noinstPROGRAMS:
++
++fftw_threads_test: $(fftw_threads_test_OBJECTS) $(fftw_threads_test_DEPENDENCIES)
++	@rm -f fftw_threads_test
++	$(LINK) $(fftw_threads_test_LDFLAGS) $(fftw_threads_test_OBJECTS) $(fftw_threads_test_LDADD) $(LIBS)
++
++rfftw_threads_test: $(rfftw_threads_test_OBJECTS) $(rfftw_threads_test_DEPENDENCIES)
++	@rm -f rfftw_threads_test
++	$(LINK) $(rfftw_threads_test_LDFLAGS) $(rfftw_threads_test_OBJECTS) $(rfftw_threads_test_LDADD) $(LIBS)
++
++install-includeHEADERS: $(include_HEADERS)
++	@$(NORMAL_INSTALL)
++	$(mkinstalldirs) $(DESTDIR)$(includedir)
++	@list='$(include_HEADERS)'; for p in $$list; do \
++	  if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
++	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$p"; \
++	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$p; \
++	done
++
++uninstall-includeHEADERS:
++	@$(NORMAL_UNINSTALL)
++	list='$(include_HEADERS)'; for p in $$list; do \
++	  rm -f $(DESTDIR)$(includedir)/$$p; \
++	done
++
++tags: TAGS
++
++ID: $(HEADERS) $(SOURCES) $(LISP)
++	list='$(SOURCES) $(HEADERS)'; \
++	unique=`for i in $$list; do echo $$i; done | \
++	  awk '    { files[$$0] = 1; } \
++	       END { for (i in files) print i; }'`; \
++	here=`pwd` && cd $(srcdir) \
++	  && mkid -f$$here/ID $$unique $(LISP)
++
++TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
++	tags=; \
++	here=`pwd`; \
++	list='$(SOURCES) $(HEADERS)'; \
++	unique=`for i in $$list; do echo $$i; done | \
++	  awk '    { files[$$0] = 1; } \
++	       END { for (i in files) print i; }'`; \
++	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
++	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
++
++mostlyclean-tags:
++
++clean-tags:
++
++distclean-tags:
++	-rm -f TAGS ID
++
++maintainer-clean-tags:
++
++distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
++
++subdir = threads
++
++distdir: $(DISTFILES)
++	@for file in $(DISTFILES); do \
++	  d=$(srcdir); \
++	  if test -d $$d/$$file; then \
++	    cp -pr $$/$$file $(distdir)/$$file; \
++	  else \
++	    test -f $(distdir)/$$file \
++	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
++	    || cp -p $$d/$$file $(distdir)/$$file || :; \
++	  fi; \
++	done
++
++info-am:
++info: info-am
++dvi-am:
++dvi: dvi-am
++check-am: all-am
++check: check-am
++installcheck-am:
++installcheck: installcheck-am
++install-exec-am: install-libLTLIBRARIES
++install-exec: install-exec-am
++
++install-data-am: install-includeHEADERS
++install-data: install-data-am
++
++install-am: all-am
++	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++install: install-am
++uninstall-am: uninstall-libLTLIBRARIES uninstall-includeHEADERS
++uninstall: uninstall-am
++all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
++all-redirect: all-am
++install-strip:
++	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
++installdirs:
++	$(mkinstalldirs)  $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
 +
- # On systems that don't have ranlib
- # RANLIB = echo ranlib
 +
- RM = rm
++mostlyclean-generic:
 +
- # Generic gcc
- CC = gcc
- CFLAGS = -pedantic -ansi -O6 -fomit-frame-pointer -Wall $(INCLUDE) \
-          -D$(FFTW_THREADS) -D_POSIX_C_SOURCE
++clean-generic:
++	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 +
- # Solaris:
- # CC = cc
- # CFLAGS = -DSOLARIS -native -fast -xO5 -dalign $(INCLUDE) -D$(FFTW_THREADS)
++distclean-generic:
++	-rm -f Makefile $(CONFIG_CLEAN_FILES)
++	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
 +
- # IBM RS/6000:
- # CC=cc
- # CFLAGS = -O3 -qarch=pwrx -qtune=pwrx $(INCLUDE) -D$(FFTW_THREADS)
++maintainer-clean-generic:
++mostlyclean-am:  mostlyclean-libLTLIBRARIES mostlyclean-compile \
++		mostlyclean-libtool mostlyclean-noinstPROGRAMS \
++		mostlyclean-tags mostlyclean-generic
 +
- # SGI Onyx
- # CC=cc
- # CFLAGS=-64 -r10000 -OPT:fold_arith_limit=10000 -O3 $(INCLUDE) -D$(FFTW_THREADS)
++mostlyclean: mostlyclean-am
 +
++clean-am:  clean-libLTLIBRARIES clean-compile clean-libtool \
++		clean-noinstPROGRAMS clean-tags clean-generic \
++		mostlyclean-am
 +
- ###################### Building fftw_threads #######################
++clean: clean-am
 +
- INCLUDE = $(FFTW_INCLUDE) -I.
- HEADERS = $(FFTWDIR)/fftw.h fftw_threads.h
- LIBS = $(FFTW_LIB) $(FFTW_THREADLIB) -lm
++distclean-am:  distclean-libLTLIBRARIES distclean-compile \
++		distclean-libtool distclean-noinstPROGRAMS \
++		distclean-tags distclean-generic clean-am
++	-rm -f libtool
 +
- LIBFFTW_THREADS_OBJ = executor_threads.o fftwnd_threads.o fftw_threads.o
++distclean: distclean-am
 +
- all:	$(LIBFFTW_THREADS) tests
++maintainer-clean-am:  maintainer-clean-libLTLIBRARIES \
++		maintainer-clean-compile maintainer-clean-libtool \
++		maintainer-clean-noinstPROGRAMS maintainer-clean-tags \
++		maintainer-clean-generic distclean-am
++	@echo "This command is intended for maintainers to use;"
++	@echo "it deletes files that may require special tools to rebuild."
 +
- tests: test_threads time_threads
++maintainer-clean: maintainer-clean-am
 +
- clean:	
- 	$(RM) -f *.o core a.out *~ *.s *.bak
++.PHONY: mostlyclean-libLTLIBRARIES distclean-libLTLIBRARIES \
++clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \
++uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \
++distclean-compile clean-compile maintainer-clean-compile \
++mostlyclean-libtool distclean-libtool clean-libtool \
++maintainer-clean-libtool mostlyclean-noinstPROGRAMS \
++distclean-noinstPROGRAMS clean-noinstPROGRAMS \
++maintainer-clean-noinstPROGRAMS uninstall-includeHEADERS \
++install-includeHEADERS tags mostlyclean-tags distclean-tags clean-tags \
++maintainer-clean-tags distdir info-am info dvi-am dvi check check-am \
++installcheck-am installcheck install-exec-am install-exec \
++install-data-am install-data install-am install uninstall-am uninstall \
++all-redirect all-am all installdirs mostlyclean-generic \
++distclean-generic clean-generic maintainer-clean-generic clean \
++mostlyclean distclean maintainer-clean
 +
- distclean: clean
- 	$(RM) -f $(LIBFFTW_THREADS) test_threads time_threads *.out
 +
- %.o:	%.c $(HEADERS)
- 	$(CC) $(CFLAGS) -c $< -o $@
++xyzfftw_threads.h: fftw_threads.h
++	rm -f fftw_threads.h
++	sed 's/<fftw/<fftw/g;s/<rfftw/<rfftw/g' fftw_threads.h > fftw_threads.h
 +
- $(LIBFFTW_THREADS): $(LIBFFTW_THREADS_OBJ)
- 	$(RM) -f $(LIBFFTW_THREADS)
- 	$(AR) rv $(LIBFFTW_THREADS) $(LIBFFTW_THREADS_OBJ)
- 	$(RANLIB) $(LIBFFTW_THREADS)
++xyzrfftw_threads.h: rfftw_threads.h
++	rm -f rfftw_threads.h
++	sed 's/<fftw/<fftw/g;s/<rfftw/<rfftw/g' rfftw_threads.h > rfftw_threads.h
 +
- install: $(LIBFFTW_THREADS)
- 	$(CP) $(LIBFFTW_THREADS) $(LIBDIR)
- 	$(RANLIB) $(LIBDIR)/$(LIBFFTW_THREADS)
- 	$(CP) fftw_threads.h $(INCLUDEDIR)
++check: fftw_threads_test rfftw_threads_test
++	@set fnord $(MAKEFLAGS); amf=$$2; \
++        list='fftw_threads_test rfftw_threads_test'; for prog in $$list; do \
++          target="$$prog""-check"; \
++          echo "Making $$target"; \
++          ($(MAKE) $$target) \
++           || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++        done && test -z "$$fail"
 +
- test_threads: test_threads.o $(LIBFFTW_THREADS)
- 	$(CC) $(LDFLAGS) test_threads.o \
-               $(LIBFFTW_THREADS) $(LIBS) -o test_threads
++fftw_threads_test-check: fftw_threads_test
++	./fftw_threads_test 1 -x 100 -r 0
++	./fftw_threads_test 2 -x 100 -r 0
++	./fftw_threads_test 3 -x 100 -r 0
++	./fftw_threads_test 10 -x 100 -r 0
++	@echo "--------------------------------------------------------------"
++	@echo "    FFTW complex-complex threads transforms passed tests!"
++	@echo "--------------------------------------------------------------"
 +
- time_threads: time_threads.o $(LIBFFTW_THREADS)
- 	$(CC) $(LDFLAGS) time_threads.o \
-               $(LIBFFTW_THREADS) $(LIBS) -o time_threads
++rfftw_threads_test-check: rfftw_threads_test
++	./rfftw_threads_test 1 -x 100 -r 0
++	./rfftw_threads_test 2 -x 100 -r 0
++	./rfftw_threads_test 3 -x 100 -r 0
++	./rfftw_threads_test 10 -x 100 -r 0
++	@echo "--------------------------------------------------------------"
++	@echo "     RFFTW real-complex threads transforms passed tests!"
++	@echo "--------------------------------------------------------------"
 +
++# Tell versions [3.59,3.63) of GNU make to not export all variables.
++# Otherwise a system limit (for SysV at least) may be exceeded.
++.NOEXPORT:
diff --cc threads/libfftw_threads.la
index 0000000,0000000..5bb9180
new file mode 100644
--- /dev/null
+++ b/threads/libfftw_threads.la
@@@ -1,0 -1,0 +1,28 @@@
++# libfftw_threads.la - a libtool library file
++# Generated by ltmain.sh - GNU libtool 1.3.3 (1.385.2.181 1999/07/02 15:49:11)
++#
++# Please DO NOT delete this file!
++# It is necessary for linking the library.
++
++# The name that we can dlopen(3).
++dlname=''
++
++# Names of this library.
++library_names=''
++
++# The name of the static archive.
++old_library='libfftw_threads.a'
++
++# Libraries that this one depends upon.
++dependency_libs=' -lm'
++
++# Version information for libfftw_threads.
++current=2
++age=0
++revision=5
++
++# Is this an already installed library?
++installed=no
++
++# Directory that this library needs to be installed in:
++libdir='/usr/lib'
diff --cc threads/librfftw_threads.la
index 0000000,0000000..d6e912b
new file mode 100644
--- /dev/null
+++ b/threads/librfftw_threads.la
@@@ -1,0 -1,0 +1,28 @@@
++# librfftw_threads.la - a libtool library file
++# Generated by ltmain.sh - GNU libtool 1.3.3 (1.385.2.181 1999/07/02 15:49:11)
++#
++# Please DO NOT delete this file!
++# It is necessary for linking the library.
++
++# The name that we can dlopen(3).
++dlname=''
++
++# Names of this library.
++library_names=''
++
++# The name of the static archive.
++old_library='librfftw_threads.a'
++
++# Libraries that this one depends upon.
++dependency_libs=' -lm'
++
++# Version information for librfftw_threads.
++current=2
++age=0
++revision=5
++
++# Is this an already installed library?
++installed=no
++
++# Directory that this library needs to be installed in:
++libdir='/usr/lib'

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/fftw.git



More information about the debian-science-commits mailing list