-add missing USE_FORTRAN

-minor patches to allow the package to correctly build with either g77 or
 f2c.

6 files changed, 1433 insertions, 2 deletions

diff --git a/benchmarks/benchfft/Makefile b/benchmarks/benchfft/Makefile
index b36ca6a92af..7665de13f2d 100644
--- a/benchmarks/benchfft/Makefile
+++ b/benchmarks/benchfft/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2000/03/16 12:16:49 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2000/05/13 14:51:11 dmcmahill Exp $
 
 DISTNAME=		benchfft-2.0
 CATEGORIES=		benchmarks math
@@ -10,6 +10,7 @@ HOMEPAGE=		http://theory.lcs.mit.edu/~benchfft/download.html
 
 GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
+USE_FORTRAN=		yes
 
 do-configure:
 	(cd ${WRKDIR}/fftw-2.0.1 && ./configure)
diff --git a/benchmarks/benchfft/files/patch-sum b/benchmarks/benchfft/files/patch-sum
index 491e7289d9c..6e6f9245378 100644
--- a/benchmarks/benchfft/files/patch-sum
+++ b/benchmarks/benchfft/files/patch-sum
@@ -1,3 +1,7 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:50:17 agc Exp $
+$NetBSD: patch-sum,v 1.2 2000/05/13 14:51:12 dmcmahill Exp $
 
 MD5 (patch-aa) = b6792e6966cef606b722e10e6dadc5f4
+MD5 (patch-ab) = 46906259830a688e37b668b5c66d3e83
+MD5 (patch-ac) = bdf13303af810fc9bc8bee190aea4462
+MD5 (patch-ad) = 2ba9ee47246802c02e949392c01ba318
+MD5 (patch-ae) = b85f592ec4f82d259735249ecf9d50ad
diff --git a/benchmarks/benchfft/patches/patch-ab b/benchmarks/benchfft/patches/patch-ab
new file mode 100644
index 00000000000..27a0ca60d73
--- /dev/null
+++ b/benchmarks/benchfft/patches/patch-ab
@@ -0,0 +1,73 @@
+$NetBSD: patch-ab,v 1.1 2000/05/13 14:51:12 dmcmahill Exp $
+
+"D" is not recognized by f2c as a comment.
+
+--- f_source/harmd.f.orig	Tue Oct 20 12:42:44 1998
++++ f_source/harmd.f	Fri Apr 21 15:00:54 2000
+@@ -98,5 +98,5 @@
+       DIMENSION INV(*),S(*)
+       EQUIVALENCE (N1,N(1)),(N2,N(2)),(N3,N(3))
+-D     DOUBLE PRECISION TIME1,TIME2,TIME3,TIME4,TIME5,TIME6,TIME7
++CD     DOUBLE PRECISION TIME1,TIME2,TIME3,TIME4,TIME5,TIME6,TIME7
+   869 FORMAT(1H ,E13.4)
+   879 FORMAT(1H ,6I5)
+@@ -148,5 +148,5 @@
+    40 KBIT=KBIT/2
+       KL=KBIT-2
+-D      CALL CLOCK(TIME1)
++CD      CALL CLOCK(TIME1)
+       DO 50 I=1,IL1,IDIF
+       KLAST=KL+I
+@@ -193,5 +193,5 @@
+ C
+ C     DO FOR J=0
+-D      CALL CLOCK(TIME1)
++CD      CALL CLOCK(TIME1)
+       DO 80 I=1,IL1,IDIF
+       KLAST=I+KL
+@@ -256,7 +256,7 @@
+       A(K3+1)=AK2_1-AK3_0
+    80 continue
+-D      CALL CLOCK(TIME2)
+-D      WRITE(6,2000)TIME2-TIME1
+-D2000 FORMAT(' AT 2 ',E12.5)
++CD      CALL CLOCK(TIME2)
++CD      WRITE(6,2000)TIME2-TIME1
++CD2000 FORMAT(' AT 2 ',E12.5)
+       IF (JLAST) 235,235,82
+    82 JJ=JJDIF   +1
+@@ -264,5 +264,5 @@
+ C     DO FOR J=1
+       ILAST= IL +JJ
+-D     CALL CLOCK(TIME1)
++CD     CALL CLOCK(TIME1)
+       DO 85 I = JJ,ILAST,IDIF
+       KLAST = KL+I
+@@ -323,12 +323,12 @@
+       A(K3+1)=AK2_1-AK3_0
+    85 continue
+-D      CALL CLOCK(TIME2)
+-D      WRITE(6,3000)TIME2-TIME1
+-D3000 FORMAT(' AT 3 ',E12.5)
++CD      CALL CLOCK(TIME2)
++CD      WRITE(6,3000)TIME2-TIME1
++CD3000 FORMAT(' AT 3 ',E12.5)
+       IF(JLAST-1) 235,235,90
+    90 JJ= JJ + JJDIF
+ C
+ C     NOW DO THE REMAINING J@S
+-D     CALL CLOCK(TIME1)
++CD     CALL CLOCK(TIME1)
+       DO 230 J=2,JLAST
+ C     THIS EQUIVALENCE FORCES SOME VARIABLES INTO PERMANENT REGISTER
+@@ -447,7 +447,7 @@
+ C
+   230 JJ=JJDIF+JJ
+-D      CALL CLOCK(TIME2)
+-D      WRITE(6,4000)TIME2-TIME1
+-D4000 FORMAT(' AT 4 ',E12.5)
++CD      CALL CLOCK(TIME2)
++CD      WRITE(6,4000)TIME2-TIME1
++CD4000 FORMAT(' AT 4 ',E12.5)
+ C     END OF J-LOOP
+ C
diff --git a/benchmarks/benchfft/patches/patch-ac b/benchmarks/benchfft/patches/patch-ac
new file mode 100644
index 00000000000..447734f6de6
--- /dev/null
+++ b/benchmarks/benchfft/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2000/05/13 14:51:12 dmcmahill Exp $
+
+need to be able to link with -lf2c when using f2c or -lg2c when using
+g77.
+
+--- configure.in.orig	Tue Oct 20 12:42:05 1998
++++ configure.in	Fri May 12 17:10:03 2000
+@@ -59,4 +59,5 @@
+ 	USE_F77=" "
+ 	AC_DEFINE(HAVE_F77)
++        AC_F77_LIBRARY_LDFLAGS
+ fi
+ 
diff --git a/benchmarks/benchfft/patches/patch-ad b/benchmarks/benchfft/patches/patch-ad
new file mode 100644
index 00000000000..a58e4420c94
--- /dev/null
+++ b/benchmarks/benchfft/patches/patch-ad
@@ -0,0 +1,19 @@
+$NetBSD: patch-ad,v 1.1 2000/05/13 14:51:12 dmcmahill Exp $
+
+link required fortran library
+
+--- Makefile.in.orig	Tue Oct 20 12:42:00 1998
++++ Makefile.in	Fri May 12 17:11:17 2000
+@@ -377,4 +377,5 @@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
++FLIBS = @FLIBS@
+ F90 = @F90@
+ F90FLAGS = @FFLAGS@
+@@ -496,5 +497,5 @@
+ 
+ bench: $(OBJECTS)
+-	$(CC) $(CFLAGS) $(OBJECTS) $(LIBRARIES) -o $@
++	$(CC) $(CFLAGS) $(OBJECTS) $(LIBRARIES) $(FLIBS) -o $@
+ 
+ submit: bench
diff --git a/benchmarks/benchfft/patches/patch-ae b/benchmarks/benchfft/patches/patch-ae
new file mode 100644
index 00000000000..32b1da73a8c
--- /dev/null
+++ b/benchmarks/benchfft/patches/patch-ae
@@ -0,0 +1,1321 @@
+$NetBSD: patch-ae,v 1.1 2000/05/13 14:51:13 dmcmahill Exp $
+
+note, this was generated by running autoconf on the patched configure.in
+no additional changes were made.
+
+--- configure.orig	Tue Oct 20 12:43:39 1998
++++ configure	Fri May 12 17:58:39 2000
+@@ -2,5 +2,5 @@
+ 
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated automatically using autoconf version 2.12 
++# Generated automatically using autoconf version 2.13 
+ # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
+ #
+@@ -56,4 +56,5 @@
+ subdirs=
+ MFLAGS= MAKEFLAGS=
++SHELL=${CONFIG_SHELL-/bin/sh}
+ # Maximum number of lines to put in a shell here document.
+ ac_max_here_lines=12
+@@ -339,5 +340,5 @@
+ 
+   -version | --version | --versio | --versi | --vers)
+-    echo "configure generated by autoconf version 2.12"
++    echo "configure generated by autoconf version 2.13"
+     exit 0 ;;
+ 
+@@ -509,7 +510,9 @@
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
++ac_exeext=
++ac_objext=o
+ if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
+   # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
+@@ -541,5 +544,5 @@
+ 
+ echo $ac_n "checking for location of FFTW directory""... $ac_c" 1>&6
+-echo "configure:544: checking for location of FFTW directory" >&5
++echo "configure:547: checking for location of FFTW directory" >&5
+ if test '!' '(' -n "$FFTWDIR" ')'; then
+ 	if test -r ../fftw; then
+@@ -567,9 +570,9 @@
+ # Use native cc if present
+ echo $ac_n "checking for vendor's cc to be used instead of gcc""... $ac_c" 1>&6
+-echo "configure:570: checking for vendor's cc to be used instead of gcc" >&5
++echo "configure:573: checking for vendor's cc to be used instead of gcc" >&5
+ # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:574: checking for $ac_word" >&5
++echo "configure:577: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -578,6 +581,7 @@
+   ac_cv_prog_CC="$CC" # Let the user override the test.
+ else
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+-  for ac_dir in $PATH; do
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do
+     test -z "$ac_dir" && ac_dir=.
+     if test -f $ac_dir/$ac_word; then
+@@ -604,5 +608,5 @@
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:607: checking for $ac_word" >&5
++echo "configure:611: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_F77'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -611,6 +615,7 @@
+   ac_cv_prog_F77="$F77" # Let the user override the test.
+ else
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+-  for ac_dir in $PATH; do
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do
+     test -z "$ac_dir" && ac_dir=.
+     if test -f $ac_dir/$ac_word; then
+@@ -638,5 +643,5 @@
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:641: checking for $ac_word" >&5
++echo "configure:646: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_F90'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -645,6 +650,7 @@
+   ac_cv_prog_F90="$F90" # Let the user override the test.
+ else
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+-  for ac_dir in $PATH; do
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do
+     test -z "$ac_dir" && ac_dir=.
+     if test -f $ac_dir/$ac_word; then
+@@ -701,4 +707,342 @@
+ EOF
+ 
++        ac_aux_dir=
++for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
++  if test -f $ac_dir/install-sh; then
++    ac_aux_dir=$ac_dir
++    ac_install_sh="$ac_aux_dir/install-sh -c"
++    break
++  elif test -f $ac_dir/install.sh; then
++    ac_aux_dir=$ac_dir
++    ac_install_sh="$ac_aux_dir/install.sh -c"
++    break
++  fi
++done
++if test -z "$ac_aux_dir"; then
++  { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
++fi
++ac_config_guess=$ac_aux_dir/config.guess
++ac_config_sub=$ac_aux_dir/config.sub
++ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
++
++if test -z "$F77"; then
++  for ac_prog in g77 f77 f2c
++do
++# Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:735: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_F77'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  if test -n "$F77"; then
++  ac_cv_prog_F77="$F77" # Let the user override the test.
++else
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$ac_word; then
++      ac_cv_prog_F77="$ac_prog"
++      break
++    fi
++  done
++  IFS="$ac_save_ifs"
++fi
++fi
++F77="$ac_cv_prog_F77"
++if test -n "$F77"; then
++  echo "$ac_t""$F77" 1>&6
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++test -n "$F77" && break
++done
++
++    test -z "$F77" && { echo "configure: error: no acceptable Fortran 77 compiler found in \$PATH" 1>&2; exit 1; }
++fi
++
++echo $ac_n "checking whether the Fortran 77 compiler ($F77 $FFLAGS $LDFLAGS) works""... $ac_c" 1>&6
++echo "configure:768: checking whether the Fortran 77 compiler ($F77 $FFLAGS $LDFLAGS) works" >&5
++
++ac_ext=f
++ac_compile='${F77-f77} -c $FFLAGS conftest.$ac_ext 1>&5'
++ac_link='${F77-f77} -o conftest${ac_exeext} $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++cross_compiling=$ac_cv_prog_f77_cross
++
++cat > conftest.$ac_ext << EOF
++
++      program conftest
++      end
++
++EOF
++if { (eval echo configure:781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  ac_cv_prog_f77_works=yes
++  # If we can't run a trivial program, we are probably using a cross compiler.
++  if (./conftest; exit) 2>/dev/null; then
++    ac_cv_prog_f77_cross=no
++  else
++    ac_cv_prog_f77_cross=yes
++  fi
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  ac_cv_prog_f77_works=no
++fi
++rm -fr conftest*
++ac_ext=c
++# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
++ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++cross_compiling=$ac_cv_prog_cc_cross
++
++echo "$ac_t""$ac_cv_prog_f77_works" 1>&6
++if test $ac_cv_prog_f77_works = no; then
++  { echo "configure: error: installation or configuration problem: Fortran 77 compiler cannot create executables." 1>&2; exit 1; }
++fi
++echo $ac_n "checking whether the Fortran 77 compiler ($F77 $FFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
++echo "configure:807: checking whether the Fortran 77 compiler ($F77 $FFLAGS $LDFLAGS) is a cross-compiler" >&5
++echo "$ac_t""$ac_cv_prog_f77_cross" 1>&6
++cross_compiling=$ac_cv_prog_f77_cross
++
++echo $ac_n "checking whether we are using GNU Fortran 77""... $ac_c" 1>&6
++echo "configure:812: checking whether we are using GNU Fortran 77" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_g77'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.fpp <<EOF
++#ifdef __GNUC__
++  yes
++#endif
++EOF
++if { ac_try='$F77 -E conftest.fpp'; { (eval echo configure:821: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
++  ac_cv_prog_g77=yes
++else
++  ac_cv_prog_g77=no
++fi
++fi
++
++echo "$ac_t""$ac_cv_prog_g77" 1>&6
++
++if test $ac_cv_prog_g77 = yes; then
++  G77=yes
++  ac_test_FFLAGS="${FFLAGS+set}"
++  ac_save_FFLAGS="$FFLAGS"
++  FFLAGS=
++  echo $ac_n "checking whether $F77 accepts -g""... $ac_c" 1>&6
++echo "configure:836: checking whether $F77 accepts -g" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_f77_g'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.f << EOF
++       program conftest
++       end
++EOF
++if test -z "`$F77 -g -c conftest.f 2>&1`"; then
++  ac_cv_prog_f77_g=yes
++else
++  ac_cv_prog_f77_g=no
++fi
++rm -f conftest*
++
++fi
++
++echo "$ac_t""$ac_cv_prog_f77_g" 1>&6
++  if test "$ac_test_FFLAGS" = set; then
++    FFLAGS="$ac_save_FFLAGS"
++  elif test $ac_cv_prog_f77_g = yes; then
++    FFLAGS="-g -O2"
++  else
++    FFLAGS="-O2"
++  fi
++else
++  G77=
++  test "${FFLAGS+set}" = set || FFLAGS="-g"
++fi
++
++
++# Make sure we can run config.sub.
++if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
++else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
++fi
++
++echo $ac_n "checking host system type""... $ac_c" 1>&6
++echo "configure:873: checking host system type" >&5
++
++host_alias=$host
++case "$host_alias" in
++NONE)
++  case $nonopt in
++  NONE)
++    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
++    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
++    fi ;;
++  *) host_alias=$nonopt ;;
++  esac ;;
++esac
++
++host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
++host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
++host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
++host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
++echo "$ac_t""$host" 1>&6
++
++echo $ac_n "checking for Fortran 77 libraries""... $ac_c" 1>&6
++echo "configure:894: checking for Fortran 77 libraries" >&5
++
++
++if eval "test \"`echo '$''{'ac_cv_flibs'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  echo "      END" > conftest.f
++foutput=`${F77} -v -o conftest conftest.f 2>&1`
++xlf_p=`echo $foutput | grep xlfentry`
++if test -n "$xlf_p"; then
++  foutput=`echo $foutput | sed 's/,/ /g'`
++fi
++ld_run_path=`echo $foutput | \
++  sed -n -e 's/^.*LD_RUN_PATH *= *\([^ ]*\).*/\1/p'`
++case "$ld_run_path" in
++  /*)
++    if test "$ac_cv_prog_gcc" = yes; then
++      ld_run_path="-Xlinker -R -Xlinker $ld_run_path"
++    else
++      ld_run_path="-R $ld_run_path"
++    fi
++  ;;
++  *)
++    ld_run_path=
++  ;;
++esac
++flibs=
++lflags=
++want_arg=
++for arg in $foutput; do
++  old_want_arg=$want_arg
++  want_arg=
++  if test -n "$old_want_arg"; then
++    case "$arg" in
++      -*)
++        old_want_arg=
++      ;;
++    esac
++  fi
++  case "$old_want_arg" in
++    '')
++      case $arg in
++        /*.a)
++          exists=false
++          for f in $lflags; do
++            if test x$arg = x$f; then
++              exists=true
++            fi
++          done
++          if $exists; then
++            arg=
++          else
++            lflags="$lflags $arg"
++          fi
++        ;;
++        -bI:*)
++          exists=false
++          for f in $lflags; do
++            if test x$arg = x$f; then
++              exists=true
++            fi
++          done
++          if $exists; then
++            arg=
++          else
++            if test "$ac_cv_prog_gcc" = yes; then
++              lflags="$lflags -Xlinker $arg"
++            else
++              lflags="$lflags $arg"
++            fi
++          fi
++        ;;
++        -lang* | -lcrt0.o | -lc | -lgcc)
++          arg=
++        ;;
++        -[lLR])
++          want_arg=$arg
++          arg=
++        ;;
++        -[lLR]*)
++          exists=false
++          for f in $lflags; do
++            if test x$arg = x$f; then
++              exists=true
++            fi
++          done
++          if $exists; then
++            arg=
++          else
++            case "$arg" in
++              -lkernel32)
++                case "$canonical_host_type" in
++                  *-*-cygwin*)
++                    arg=
++                  ;;
++                  *)
++                    lflags="$lflags $arg"
++                  ;;
++                esac
++              ;;
++              -lm)
++              ;;
++              *)
++                lflags="$lflags $arg"
++              ;;
++            esac
++          fi
++        ;;
++        -u)
++          want_arg=$arg
++          arg=
++        ;;
++        -Y)
++          want_arg=$arg
++          arg=
++        ;;
++        *)
++          arg=
++        ;;
++      esac
++    ;;
++    -[lLR])
++      arg="$old_want_arg $arg"
++    ;;
++    -u)
++      arg="-u $arg"
++    ;;
++    -Y)
++      arg=`echo $arg | sed -e 's%^P,%%'`
++      SAVE_IFS=$IFS
++      IFS=:
++      list=
++      for elt in $arg; do
++        list="$list -L$elt"
++      done
++      IFS=$SAVE_IFS
++      arg="$list"
++    ;;
++  esac
++  if test -n "$arg"; then
++    flibs="$flibs $arg"
++  fi
++done
++if test -n "$ld_run_path"; then
++  flibs_result="$ld_run_path $flibs"
++else
++  flibs_result="$flibs"
++fi
++ac_cv_flibs="$flibs_result"
++fi
++
++FLIBS="$ac_cv_flibs"
++echo "$ac_t""$FLIBS" 1>&6
++
+ fi
+ 
+@@ -720,5 +1064,5 @@
+ set dummy gcc; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:723: checking for $ac_word" >&5
++echo "configure:1067: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -727,6 +1071,7 @@
+   ac_cv_prog_CC="$CC" # Let the user override the test.
+ else
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+-  for ac_dir in $PATH; do
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do
+     test -z "$ac_dir" && ac_dir=.
+     if test -f $ac_dir/$ac_word; then
+@@ -749,5 +1094,5 @@
+ set dummy cc; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:752: checking for $ac_word" >&5
++echo "configure:1097: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -756,7 +1101,8 @@
+   ac_cv_prog_CC="$CC" # Let the user override the test.
+ else
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_prog_rejected=no
+-  for ac_dir in $PATH; do
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do
+     test -z "$ac_dir" && ac_dir=.
+     if test -f $ac_dir/$ac_word; then
+@@ -793,9 +1139,43 @@
+ fi
+ 
++  if test -z "$CC"; then
++    case "`uname -s`" in
++    *win32* | *WIN32*)
++      # Extract the first word of "cl", so it can be a program name with args.
++set dummy cl; ac_word=$2
++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:1148: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  if test -n "$CC"; then
++  ac_cv_prog_CC="$CC" # Let the user override the test.
++else
++  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
++  ac_dummy="$PATH"
++  for ac_dir in $ac_dummy; do
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$ac_word; then
++      ac_cv_prog_CC="cl"
++      break
++    fi
++  done
++  IFS="$ac_save_ifs"
++fi
++fi
++CC="$ac_cv_prog_CC"
++if test -n "$CC"; then
++  echo "$ac_t""$CC" 1>&6
++else
++  echo "$ac_t""no" 1>&6
++fi
++ ;;
++    esac
++  fi
+   test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
+ fi
+ 
+ echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+-echo "configure:800: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
++echo "configure:1180: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+ 
+ ac_ext=c
+@@ -803,13 +1183,15 @@
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
+-cat > conftest.$ac_ext <<EOF
+-#line 810 "configure"
++cat > conftest.$ac_ext << EOF
++
++#line 1191 "configure"
+ #include "confdefs.h"
++
+ main(){return(0);}
+ EOF
+-if { (eval echo configure:814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:1196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   ac_cv_prog_cc_works=yes
+   # If we can't run a trivial program, we are probably using a cross compiler.
+@@ -825,4 +1207,10 @@
+ fi
+ rm -fr conftest*
++ac_ext=c
++# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
++ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++cross_compiling=$ac_cv_prog_cc_cross
+ 
+ echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
+@@ -831,10 +1219,10 @@
+ fi
+ echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+-echo "configure:834: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
++echo "configure:1222: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+ echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
+ cross_compiling=$ac_cv_prog_cc_cross
+ 
+ echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
+-echo "configure:839: checking whether we are using GNU C" >&5
++echo "configure:1227: checking whether we are using GNU C" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -845,5 +1233,5 @@
+ #endif
+ EOF
+-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:848: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
++if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1236: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+   ac_cv_prog_gcc=yes
+ else
+@@ -856,9 +1244,13 @@
+ if test $ac_cv_prog_gcc = yes; then
+   GCC=yes
+-  ac_test_CFLAGS="${CFLAGS+set}"
+-  ac_save_CFLAGS="$CFLAGS"
+-  CFLAGS=
+-  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+-echo "configure:863: checking whether ${CC-cc} accepts -g" >&5
++else
++  GCC=
++fi
++
++ac_test_CFLAGS="${CFLAGS+set}"
++ac_save_CFLAGS="$CFLAGS"
++CFLAGS=
++echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
++echo "configure:1255: checking whether ${CC-cc} accepts -g" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -875,18 +1267,22 @@
+ 
+ echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
+-  if test "$ac_test_CFLAGS" = set; then
+-    CFLAGS="$ac_save_CFLAGS"
+-  elif test $ac_cv_prog_cc_g = yes; then
++if test "$ac_test_CFLAGS" = set; then
++  CFLAGS="$ac_save_CFLAGS"
++elif test $ac_cv_prog_cc_g = yes; then
++  if test "$GCC" = yes; then
+     CFLAGS="-g -O2"
+   else
+-    CFLAGS="-O2"
++    CFLAGS="-g"
+   fi
+ else
+-  GCC=
+-  test "${CFLAGS+set}" = set || CFLAGS="-g"
++  if test "$GCC" = yes; then
++    CFLAGS="-O2"
++  else
++    CFLAGS=
++  fi
+ fi
+ 
+ echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
+-echo "configure:891: checking whether ${MAKE-make} sets \${MAKE}" >&5
++echo "configure:1287: checking whether ${MAKE-make} sets \${MAKE}" >&5
+ set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
+@@ -915,31 +1311,12 @@
+ 
+ 
+-ac_aux_dir=
+-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
+-  if test -f $ac_dir/install-sh; then
+-    ac_aux_dir=$ac_dir
+-    ac_install_sh="$ac_aux_dir/install-sh -c"
+-    break
+-  elif test -f $ac_dir/install.sh; then
+-    ac_aux_dir=$ac_dir
+-    ac_install_sh="$ac_aux_dir/install.sh -c"
+-    break
+-  fi
+-done
+-if test -z "$ac_aux_dir"; then
+-  { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
+-fi
+-ac_config_guess=$ac_aux_dir/config.guess
+-ac_config_sub=$ac_aux_dir/config.sub
+-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
+-
+ 
+ # Make sure we can run config.sub.
+-if $ac_config_sub sun4 >/dev/null 2>&1; then :
++if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
+ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
+ fi
+ 
+ echo $ac_n "checking host system type""... $ac_c" 1>&6
+-echo "configure:944: checking host system type" >&5
++echo "configure:1321: checking host system type" >&5
+ 
+ host_alias=$host
+@@ -948,5 +1325,5 @@
+   case $nonopt in
+   NONE)
+-    if host_alias=`$ac_config_guess`; then :
++    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
+     else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
+     fi ;;
+@@ -955,5 +1332,5 @@
+ esac
+ 
+-host=`$ac_config_sub $host_alias`
++host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
+ host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+@@ -995,5 +1372,5 @@
+ 	
+ echo $ac_n "checking for sqrt in -lm""... $ac_c" 1>&6
+-echo "configure:998: checking for sqrt in -lm" >&5
++echo "configure:1375: checking for sqrt in -lm" >&5
+ ac_lib_var=`echo m'_'sqrt | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+@@ -1003,5 +1380,5 @@
+ LIBS="-lm  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1006 "configure"
++#line 1383 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -1014,5 +1391,5 @@
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:1394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+@@ -1043,5 +1420,5 @@
+ 
+ echo $ac_n "checking for sqrt in -lxlf90""... $ac_c" 1>&6
+-echo "configure:1046: checking for sqrt in -lxlf90" >&5
++echo "configure:1423: checking for sqrt in -lxlf90" >&5
+ ac_lib_var=`echo xlf90'_'sqrt | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+@@ -1051,5 +1428,5 @@
+ LIBS="-lxlf90  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1054 "configure"
++#line 1431 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -1062,5 +1439,5 @@
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:1442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+@@ -1090,5 +1467,5 @@
+ 
+ echo $ac_n "checking for sqrt in -lxlf""... $ac_c" 1>&6
+-echo "configure:1093: checking for sqrt in -lxlf" >&5
++echo "configure:1470: checking for sqrt in -lxlf" >&5
+ ac_lib_var=`echo xlf'_'sqrt | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+@@ -1098,5 +1475,5 @@
+ LIBS="-lxlf  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1101 "configure"
++#line 1478 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -1109,5 +1486,5 @@
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:1489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+@@ -1137,5 +1514,5 @@
+ 
+ echo $ac_n "checking for dcft in -lessl""... $ac_c" 1>&6
+-echo "configure:1140: checking for dcft in -lessl" >&5
++echo "configure:1517: checking for dcft in -lessl" >&5
+ ac_lib_var=`echo essl'_'dcft | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+@@ -1145,5 +1522,5 @@
+ LIBS="-lessl  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1148 "configure"
++#line 1525 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -1156,5 +1533,5 @@
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:1536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+@@ -1185,5 +1562,5 @@
+ 
+ echo $ac_n "checking for zfft_apply_ in -ldxml""... $ac_c" 1>&6
+-echo "configure:1188: checking for zfft_apply_ in -ldxml" >&5
++echo "configure:1565: checking for zfft_apply_ in -ldxml" >&5
+ ac_lib_var=`echo dxml'_'zfft_apply_ | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+@@ -1193,5 +1570,5 @@
+ LIBS="-ldxml  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1196 "configure"
++#line 1573 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -1204,5 +1581,5 @@
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:1584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+@@ -1232,5 +1609,5 @@
+ 
+ echo $ac_n "checking for for_stop in -lfor""... $ac_c" 1>&6
+-echo "configure:1235: checking for for_stop in -lfor" >&5
++echo "configure:1612: checking for for_stop in -lfor" >&5
+ ac_lib_var=`echo for'_'for_stop | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+@@ -1240,5 +1617,5 @@
+ LIBS="-lfor  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1243 "configure"
++#line 1620 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -1251,5 +1628,5 @@
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:1631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+@@ -1280,5 +1657,5 @@
+ 
+ echo $ac_n "checking for __lsp_rethread_mn_ph_ in -lSUNWPro_lic""... $ac_c" 1>&6
+-echo "configure:1283: checking for __lsp_rethread_mn_ph_ in -lSUNWPro_lic" >&5
++echo "configure:1660: checking for __lsp_rethread_mn_ph_ in -lSUNWPro_lic" >&5
+ ac_lib_var=`echo SUNWPro_lic'_'__lsp_rethread_mn_ph_ | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+@@ -1288,5 +1665,5 @@
+ LIBS="-lSUNWPro_lic  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1291 "configure"
++#line 1668 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -1299,5 +1676,5 @@
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:1679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+@@ -1327,5 +1704,5 @@
+ 
+ echo $ac_n "checking for acosp in -lsunmath""... $ac_c" 1>&6
+-echo "configure:1330: checking for acosp in -lsunmath" >&5
++echo "configure:1707: checking for acosp in -lsunmath" >&5
+ ac_lib_var=`echo sunmath'_'acosp | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+@@ -1335,5 +1712,5 @@
+ LIBS="-lsunmath  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1338 "configure"
++#line 1715 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -1346,5 +1723,5 @@
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:1726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+@@ -1374,5 +1751,5 @@
+ 
+ echo $ac_n "checking for ishft_ in -lF77""... $ac_c" 1>&6
+-echo "configure:1377: checking for ishft_ in -lF77" >&5
++echo "configure:1754: checking for ishft_ in -lF77" >&5
+ ac_lib_var=`echo F77'_'ishft_ | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+@@ -1382,5 +1759,5 @@
+ LIBS="-lF77  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1385 "configure"
++#line 1762 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -1393,5 +1770,5 @@
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:1773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+@@ -1421,5 +1798,5 @@
+ 
+ echo $ac_n "checking for _F90_STOP in -lf90""... $ac_c" 1>&6
+-echo "configure:1424: checking for _F90_STOP in -lf90" >&5
++echo "configure:1801: checking for _F90_STOP in -lf90" >&5
+ ac_lib_var=`echo f90'_'_F90_STOP | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+@@ -1429,5 +1806,5 @@
+ LIBS="-lf90  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1432 "configure"
++#line 1809 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -1440,5 +1817,5 @@
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:1820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+@@ -1468,5 +1845,5 @@
+ 
+ echo $ac_n "checking for cfftf_ in -lsunperf""... $ac_c" 1>&6
+-echo "configure:1471: checking for cfftf_ in -lsunperf" >&5
++echo "configure:1848: checking for cfftf_ in -lsunperf" >&5
+ ac_lib_var=`echo sunperf'_'cfftf_ | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+@@ -1476,5 +1853,5 @@
+ LIBS="-lsunperf  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1479 "configure"
++#line 1856 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -1487,5 +1864,5 @@
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:1867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+@@ -1515,5 +1892,5 @@
+ 
+ echo $ac_n "checking for __pow_ri in -lM77""... $ac_c" 1>&6
+-echo "configure:1518: checking for __pow_ri in -lM77" >&5
++echo "configure:1895: checking for __pow_ri in -lM77" >&5
+ ac_lib_var=`echo M77'_'__pow_ri | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+@@ -1523,5 +1900,5 @@
+ LIBS="-lM77  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1526 "configure"
++#line 1903 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -1534,5 +1911,5 @@
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:1914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+@@ -1563,5 +1940,5 @@
+ 
+ echo $ac_n "checking for zfft1d in -lcomplib.sgimath""... $ac_c" 1>&6
+-echo "configure:1566: checking for zfft1d in -lcomplib.sgimath" >&5
++echo "configure:1943: checking for zfft1d in -lcomplib.sgimath" >&5
+ ac_lib_var=`echo complib.sgimath'_'zfft1d | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+@@ -1571,5 +1948,5 @@
+ LIBS="-lcomplib.sgimath  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1574 "configure"
++#line 1951 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -1582,5 +1959,5 @@
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:1962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+@@ -1611,5 +1988,5 @@
+ 
+ echo $ac_n "checking for zzfft in -lscs""... $ac_c" 1>&6
+-echo "configure:1614: checking for zzfft in -lscs" >&5
++echo "configure:1991: checking for zzfft in -lscs" >&5
+ ac_lib_var=`echo scs'_'zzfft | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+@@ -1619,5 +1996,5 @@
+ LIBS="-lscs  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1622 "configure"
++#line 1999 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -1630,5 +2007,5 @@
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:2010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+@@ -1659,5 +2036,5 @@
+ 
+ echo $ac_n "checking for CCFFT in -lsci""... $ac_c" 1>&6
+-echo "configure:1662: checking for CCFFT in -lsci" >&5
++echo "configure:2039: checking for CCFFT in -lsci" >&5
+ ac_lib_var=`echo sci'_'CCFFT | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+@@ -1667,5 +2044,5 @@
+ LIBS="-lsci  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1670 "configure"
++#line 2047 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -1678,5 +2055,5 @@
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:2058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+@@ -1707,5 +2084,5 @@
+ 
+ echo $ac_n "checking for imsl_fftf in -limsl""... $ac_c" 1>&6
+-echo "configure:1710: checking for imsl_fftf in -limsl" >&5
++echo "configure:2087: checking for imsl_fftf in -limsl" >&5
+ ac_lib_var=`echo imsl'_'imsl_fftf | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+@@ -1715,5 +2092,5 @@
+ LIBS="-limsl  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1718 "configure"
++#line 2095 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -1726,5 +2103,5 @@
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:2106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+@@ -1755,5 +2132,5 @@
+ 
+ echo $ac_n "checking for c06fcf in -lnag""... $ac_c" 1>&6
+-echo "configure:1758: checking for c06fcf in -lnag" >&5
++echo "configure:2135: checking for c06fcf in -lnag" >&5
+ ac_lib_var=`echo nag'_'c06fcf | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+@@ -1763,5 +2140,5 @@
+ LIBS="-lnag  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1766 "configure"
++#line 2143 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -1774,5 +2151,5 @@
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:2154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+@@ -1803,5 +2180,5 @@
+ 
+ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+-echo "configure:1806: checking how to run the C preprocessor" >&5
++echo "configure:2183: checking how to run the C preprocessor" >&5
+ # On Suns, sometimes $CPP names a directory.
+ if test -n "$CPP" && test -d "$CPP"; then
+@@ -1818,5 +2195,5 @@
+   # not just through cpp.
+   cat > conftest.$ac_ext <<EOF
+-#line 1821 "configure"
++#line 2198 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+@@ -1824,6 +2201,6 @@
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1827: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out`
++{ (eval echo configure:2204: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   :
+@@ -1835,5 +2212,5 @@
+   CPP="${CC-cc} -E -traditional-cpp"
+   cat > conftest.$ac_ext <<EOF
+-#line 1838 "configure"
++#line 2215 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+@@ -1841,6 +2218,23 @@
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1844: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out`
++{ (eval echo configure:2221: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++if test -z "$ac_err"; then
++  :
++else
++  echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  CPP="${CC-cc} -nologo -E"
++  cat > conftest.$ac_ext <<EOF
++#line 2232 "configure"
++#include "confdefs.h"
++#include <assert.h>
++Syntax Error
++EOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:2238: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   :
+@@ -1855,4 +2249,6 @@
+ fi
+ rm -f conftest*
++fi
++rm -f conftest*
+   ac_cv_prog_CPP="$CPP"
+ fi
+@@ -1864,10 +2260,10 @@
+ 
+ echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
+-echo "configure:1867: checking for ANSI C header files" >&5
++echo "configure:2263: checking for ANSI C header files" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1872 "configure"
++#line 2268 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+@@ -1877,6 +2273,6 @@
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1880: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out`
++{ (eval echo configure:2276: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -1894,5 +2290,5 @@
+   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+ cat > conftest.$ac_ext <<EOF
+-#line 1897 "configure"
++#line 2293 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+@@ -1912,5 +2308,5 @@
+   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+ cat > conftest.$ac_ext <<EOF
+-#line 1915 "configure"
++#line 2311 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+@@ -1933,5 +2329,5 @@
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1936 "configure"
++#line 2332 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+@@ -1944,5 +2340,5 @@
+ 
+ EOF
+-if { (eval echo configure:1947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:2343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   :
+@@ -1971,16 +2367,16 @@
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:1974: checking for $ac_hdr" >&5
++echo "configure:2370: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1979 "configure"
++#line 2375 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1984: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out`
++{ (eval echo configure:2380: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -2009,10 +2405,10 @@
+ 
+ echo $ac_n "checking for working const""... $ac_c" 1>&6
+-echo "configure:2012: checking for working const" >&5
++echo "configure:2408: checking for working const" >&5
+ if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2017 "configure"
++#line 2413 "configure"
+ #include "confdefs.h"
+ 
+@@ -2063,5 +2459,5 @@
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2066: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2462: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_c_const=yes
+@@ -2084,5 +2480,5 @@
+ 
+ echo $ac_n "checking for inline""... $ac_c" 1>&6
+-echo "configure:2087: checking for inline" >&5
++echo "configure:2483: checking for inline" >&5
+ if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2091,5 +2487,5 @@
+ for ac_kw in inline __inline__ __inline; do
+   cat > conftest.$ac_ext <<EOF
+-#line 2094 "configure"
++#line 2490 "configure"
+ #include "confdefs.h"
+ 
+@@ -2098,5 +2494,5 @@
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2101: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2497: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_c_inline=$ac_kw; break
+@@ -2124,10 +2520,10 @@
+ 
+ echo $ac_n "checking for size_t""... $ac_c" 1>&6
+-echo "configure:2127: checking for size_t" >&5
++echo "configure:2523: checking for size_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2132 "configure"
++#line 2528 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+@@ -2138,5 +2534,5 @@
+ EOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  egrep "size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
++  egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+   rm -rf conftest*
+   ac_cv_type_size_t=yes
+@@ -2160,10 +2556,10 @@
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:2163: checking for $ac_func" >&5
++echo "configure:2559: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2168 "configure"
++#line 2564 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+@@ -2188,5 +2584,5 @@
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2191: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++if { (eval echo configure:2587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+@@ -2214,5 +2610,5 @@
+ 
+ echo $ac_n "checking for location of rfftw""... $ac_c" 1>&6
+-echo "configure:2217: checking for location of rfftw" >&5
++echo "configure:2613: checking for location of rfftw" >&5
+ if test -r $FFTWDIR/rfftw/.libs/librfftw.a; then
+         RFFTWLIB="-lrfftw"
+@@ -2226,5 +2622,5 @@
+ 
+ echo $ac_n "checking for Numerical Recipes in C""... $ac_c" 1>&6
+-echo "configure:2229: checking for Numerical Recipes in C" >&5
++echo "configure:2625: checking for Numerical Recipes in C" >&5
+ if test -r extras/nr/four1.c && test -r extras/nr/fourn.c && test -r extras/nr/realft.c; then
+ 	USE_NRC=" "
+@@ -2241,5 +2637,5 @@
+ 
+ echo $ac_n "checking for Numerical Recipes in Fortran""... $ac_c" 1>&6
+-echo "configure:2244: checking for Numerical Recipes in Fortran" >&5
++echo "configure:2640: checking for Numerical Recipes in Fortran" >&5
+ if test -r extras/nr/four1.f && test -r extras/nr/fourn.f && test -r extras/nr/realft.f && test -r extras/nr/rlft3.f; then
+ 	USE_NRF=" "
+@@ -2256,5 +2652,5 @@
+ 
+ echo $ac_n "checking for Bernstein djbfft""... $ac_c" 1>&6
+-echo "configure:2259: checking for Bernstein djbfft" >&5
++echo "configure:2655: checking for Bernstein djbfft" >&5
+ if test -r extras/djbfft-0.60/fft.c; then
+ 	USE_BERNSTEIN=" "
+@@ -2271,5 +2667,5 @@
+ 
+ echo $ac_n "checking to see if MFFT compiles""... $ac_c" 1>&6
+-echo "configure:2274: checking to see if MFFT compiles" >&5
++echo "configure:2670: checking to see if MFFT compiles" >&5
+ $F77 $FFLAGS -c f_source/mfft/c2fft.f -o c2fft.o >/dev/null 2>&1
+ if test -s c2fft.o; then
+@@ -2311,5 +2707,5 @@
+ # and sets the high bit in the cache file unless we assign to the vars.
+ (set) 2>&1 |
+-  case `(ac_space=' '; set) 2>&1` in
++  case `(ac_space=' '; set | grep ac_space) 2>&1` in
+   *ac_space=\ *)
+     # `set' does not quote correctly, so add quotes (double-quote substitution
+@@ -2378,5 +2774,5 @@
+     exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --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)
+@@ -2397,7 +2793,9 @@
+ $ac_vpsub
+ $extrasub
++s%@SHELL@%$SHELL%g
+ s%@CFLAGS@%$CFLAGS%g
+ s%@CPPFLAGS@%$CPPFLAGS%g
+ s%@CXXFLAGS@%$CXXFLAGS%g
++s%@FFLAGS@%$FFLAGS%g
+ s%@DEFS@%$DEFS%g
+ s%@LDFLAGS@%$LDFLAGS%g
+@@ -2422,8 +2820,4 @@
+ s%@F77@%$F77%g
+ s%@F90@%$F90%g
+-s%@USE_F77@%$USE_F77%g
+-s%@USE_F90@%$USE_F90%g
+-s%@FFLAGS@%$FFLAGS%g
+-s%@SET_MAKE@%$SET_MAKE%g
+ s%@host@%$host%g
+ s%@host_alias@%$host_alias%g
+@@ -2431,4 +2825,8 @@
+ s%@host_vendor@%$host_vendor%g
+ s%@host_os@%$host_os%g
++s%@FLIBS@%$FLIBS%g
++s%@USE_F77@%$USE_F77%g
++s%@USE_F90@%$USE_F90%g
++s%@SET_MAKE@%$SET_MAKE%g
+ s%@CPP@%$CPP%g
+ s%@RFFTWLIB@%$RFFTWLIB%g