diff options
-rw-r--r-- | benchmarks/benchfft/Makefile | 7 | ||||
-rw-r--r-- | benchmarks/benchfft/distinfo | 10 | ||||
-rw-r--r-- | benchmarks/benchfft/patches/patch-ac | 22 | ||||
-rw-r--r-- | benchmarks/benchfft/patches/patch-ad | 19 | ||||
-rw-r--r-- | benchmarks/benchfft/patches/patch-ae | 752 | ||||
-rw-r--r-- | benchmarks/benchfft/patches/patch-af | 13 | ||||
-rw-r--r-- | benchmarks/benchfft/patches/patch-ag | 13 |
7 files changed, 147 insertions, 689 deletions
diff --git a/benchmarks/benchfft/Makefile b/benchmarks/benchfft/Makefile index eca78221249..45ce3f3a649 100644 --- a/benchmarks/benchfft/Makefile +++ b/benchmarks/benchfft/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/05/22 20:07:40 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2005/11/05 21:04:36 joerg Exp $ DISTNAME= benchfft-2.0 PKGREVISION= 1 @@ -21,12 +21,11 @@ USE_LIBTOOL= yes LTCONFIG_OVERRIDE= ${WRKDIR}/fftw-2.0.1/ltconfig CONFIG_GUESS_OVERRIDE= config.guess ../fftw-*/config.guess CONFIG_SUB_OVERRIDE= config.sub ../fftw-*/config.sub +CONFIG_STATUS_OVERRIDE= config.status ../fftw-*/config.status INSTALLATION_DIRS= bin -pre-configure: - CONFIGURE_DIRS=${WRKDIR}/fftw-2.0.1 ${MAKE} ${MAKEFLAGS} do-configure - BUILD_DIRS=${WRKDIR}/fftw-2.0.1 ${MAKE} ${MAKEFLAGS} do-build +CONFIGURE_DIRS= ${WRKDIR}/fftw-2.0.1 ${WRKSRC} do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bench ${PREFIX}/bin/bench-fft diff --git a/benchmarks/benchfft/distinfo b/benchmarks/benchfft/distinfo index cc58fc1ed87..a15e6374b42 100644 --- a/benchmarks/benchfft/distinfo +++ b/benchmarks/benchfft/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2005/02/22 21:16:35 agc Exp $ +$NetBSD: distinfo,v 1.5 2005/11/05 21:04:36 joerg Exp $ SHA1 (benchfft-2.0.tar.gz) = b49cbad9d390e54d3afe661d51d3dce7b3d6435e RMD160 (benchfft-2.0.tar.gz) = bd9ef45e633b8384c836e32e1e1cee877495bb26 @@ -8,8 +8,6 @@ RMD160 (fftw-2.0.1.tar.gz) = ad28a3fd1e17de6d5158f50ad286887c5f886492 Size (fftw-2.0.1.tar.gz) = 894543 bytes SHA1 (patch-aa) = 11c7d759af18a51da99231c964a079147656c9cc SHA1 (patch-ab) = 1c1be2e043ea9280f70dddd8082d20e929ea9d49 -SHA1 (patch-ac) = 91214ddd89c6eed3ff3b172e02bab720afc84b52 -SHA1 (patch-ad) = 6a40bc4f223029a5c654f6e8cbf4e476d40a6e56 -SHA1 (patch-ae) = 15985b9db54402feeddbcde1e74b9fc8c4320018 -SHA1 (patch-af) = 7275eb82bc58ed656e70f3aabec7dd393655b553 -SHA1 (patch-ag) = 6016462040b0052cd33a0a313ce24381c6eb802c +SHA1 (patch-ac) = 24a1f01426f7e905f5033202b075786f2a632aa4 +SHA1 (patch-ad) = af0b491821b32d4039dd5bc17613b2a0872d13c0 +SHA1 (patch-ae) = ea3cc3719931d2d99484b5291e878a289565174f diff --git a/benchmarks/benchfft/patches/patch-ac b/benchmarks/benchfft/patches/patch-ac index 447734f6de6..4c68919af7f 100644 --- a/benchmarks/benchfft/patches/patch-ac +++ b/benchmarks/benchfft/patches/patch-ac @@ -1,13 +1,31 @@ -$NetBSD: patch-ac,v 1.1 2000/05/13 14:51:12 dmcmahill Exp $ +$NetBSD: patch-ac,v 1.2 2005/11/05 21:04:36 joerg 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 @@ +@@ -58,6 +58,7 @@ if test $F77 = echo; then + else USE_F77=" " AC_DEFINE(HAVE_F77) + AC_F77_LIBRARY_LDFLAGS fi + if test $F90 = echo; then +@@ -158,13 +159,8 @@ AC_CHECK_FUNCS(dcft3) + + dnl Check for librfftw.a (in rfftw 2.0+) + AC_MSG_CHECKING(for location of rfftw) +-if test -r $FFTWDIR/rfftw/.libs/librfftw.a; then +- RFFTWLIB="-lrfftw" +- AC_MSG_RESULT(found librfftw.a) +-else +- RFFTWLIB="$FFTWDIR/rfftw/rfftw.o $FFTWDIR/rfftw/rfftwnd.o" +- AC_MSG_RESULT(using rfftw object code) +-fi ++RFFTWLIB="$FFTWDIR/rfftw/.libs/librfftw.a" ++AC_MSG_RESULT(found librfftw.a) + AC_SUBST(RFFTWLIB) + + dnl Check for Numerical Recipes code: diff --git a/benchmarks/benchfft/patches/patch-ad b/benchmarks/benchfft/patches/patch-ad index 341d9d334c8..41ab8d137ef 100644 --- a/benchmarks/benchfft/patches/patch-ad +++ b/benchmarks/benchfft/patches/patch-ad @@ -1,19 +1,32 @@ -$NetBSD: patch-ad,v 1.4 2001/04/15 02:20:06 dmcmahill Exp $ +$NetBSD: patch-ad,v 1.5 2005/11/05 21:04:36 joerg 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 @@ +@@ -365,7 +365,7 @@ LIBPATHS = -L$(FFTWDIR)/fftw/.libs -L$(F + INCLUDE_FLAGS = -I. -I$(FFTWDIR)/fftw -I$(FFTWDIR)/src -I$(FFTWDIR)/rfftw + + # Put libraries that you need to link in here: +-LIBRARIES = $(LIBPATHS) -lfftw @RFFTWLIB@ @LIBS@ ++LIBRARIES = $(LIBPATHS) ../fftw-2.0.1/fftw/.libs/libfftw.a @RFFTWLIB@ @LIBS@ + + ########################################################################### + +@@ -376,6 +376,7 @@ CC = @CC@ + CFLAGS = @CFLAGS@ F77 = @F77@ FFLAGS = @FFLAGS@ +FLIBS = @FLIBS@ F90 = @F90@ F90FLAGS = @FFLAGS@ -@@ -496,5 +497,5 @@ + +@@ -495,7 +496,7 @@ bench_utils.o: bench_utils.h bench-confi + bench.o: bench_utils.h bench-config.h bench: $(OBJECTS) - $(CC) $(CFLAGS) $(OBJECTS) $(LIBRARIES) -o $@ + $(CC) $(CFLAGS) $(OBJECTS) $(LIBRARIES) $(FLIBS) -u _MAIN__ -u MAIN__ -o $@ submit: bench + ./submit-script diff --git a/benchmarks/benchfft/patches/patch-ae b/benchmarks/benchfft/patches/patch-ae index 32b1da73a8c..03fe915a70a 100644 --- a/benchmarks/benchfft/patches/patch-ae +++ b/benchmarks/benchfft/patches/patch-ae @@ -1,31 +1,38 @@ -$NetBSD: patch-ae,v 1.1 2000/05/13 14:51:13 dmcmahill Exp $ +$NetBSD: patch-ae,v 1.2 2005/11/05 21:04:36 joerg 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 @@ +--- configure.orig 1998-10-20 18:43:39.000000000 +0200 ++++ configure +@@ -1,7 +1,7 @@ + #! /bin/sh # 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 @@ + # This configure script is free software; the Free Software Foundation +@@ -55,6 +55,7 @@ mandir='${prefix}/man' + # Initialize some other variables. 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 @@ + +@@ -338,7 +339,7 @@ EOF + verbose=yes ;; -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 @@ + -with-* | --with-*) +@@ -508,9 +509,11 @@ 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 $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' @@ -36,26 +43,9 @@ no additional changes were made. +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 @@ + if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then +@@ -577,8 +580,9 @@ 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="${IFS}:" @@ -65,14 +55,9 @@ no additional changes were made. + 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_CC="cc" +@@ -610,8 +614,9 @@ 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="${IFS}:" @@ -82,14 +67,9 @@ no additional changes were made. + 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_F77="$ac_prog" +@@ -644,8 +649,9 @@ else + if test -n "$F90"; then ac_cv_prog_F90="$F90" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" @@ -99,7 +79,9 @@ no additional changes were made. + 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 @@ + ac_cv_prog_F90="$ac_prog" +@@ -700,6 +706,344 @@ else + #define HAVE_F77 1 EOF + ac_aux_dir= @@ -442,14 +424,9 @@ no additional changes were made. + 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 @@ + if test $F90 = echo; then +@@ -726,8 +1070,9 @@ 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="${IFS}:" @@ -459,14 +436,9 @@ no additional changes were made. + 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="gcc" +@@ -755,9 +1100,10 @@ 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="${IFS}:" @@ -477,7 +449,9 @@ no additional changes were made. + 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 @@ + if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then +@@ -792,6 +1138,40 @@ else + echo "$ac_t""no" 1>&6 fi + if test -z "$CC"; then @@ -517,12 +491,8 @@ no additional changes were made. 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 @@ +@@ -802,15 +1182,17 @@ 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 $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' @@ -542,7 +512,9 @@ no additional changes were made. +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 @@ + if (./conftest; exit) 2>/dev/null; then +@@ -824,6 +1206,12 @@ else + ac_cv_prog_cc_works=no fi rm -fr conftest* +ac_ext=c @@ -553,27 +525,9 @@ no additional changes were made. +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 + if test $ac_cv_prog_cc_works = no; then +@@ -855,11 +1243,15 @@ echo "$ac_t""$ac_cv_prog_gcc" 1>&6 - 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}" @@ -592,7 +546,9 @@ no additional changes were made. +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 @@ + else +@@ -874,16 +1266,20 @@ rm -f conftest* + fi echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 - if test "$ac_test_CFLAGS" = set; then @@ -618,11 +574,8 @@ no additional changes were made. 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 @@ +@@ -914,28 +1310,9 @@ else + fi -ac_aux_dir= @@ -651,397 +604,25 @@ no additional changes were made. 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 @@ +@@ -947,14 +1324,14 @@ case "$host_alias" in + NONE) 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 @@ + *) host_alias=$nonopt ;; + esac ;; 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 @@ + host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +@@ -1823,8 +2200,8 @@ else + Syntax Error 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; } @@ -1050,18 +631,18 @@ no additional changes were made. +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : -@@ -1835,5 +2212,5 @@ + else +@@ -1834,14 +2211,31 @@ else + rm -rf conftest* 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` ++#include "confdefs.h" ++#include <assert.h> ++Syntax Error ++EOF ++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>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 @@ -1074,36 +655,29 @@ no additional changes were made. + 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" + #include "confdefs.h" + #include <assert.h> + Syntax Error + 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: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 @@ + else +@@ -1854,6 +2248,8 @@ fi + rm -f conftest* 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 @@ + CPP="$ac_cv_prog_CPP" +@@ -1876,8 +2272,8 @@ else + #include <float.h> 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; } @@ -1112,46 +686,8 @@ no additional changes were made. +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" + ac_cv_header_stdc=yes +@@ -1980,8 +2376,8 @@ else #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" @@ -1161,137 +697,54 @@ no additional changes were made. +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 @@ + eval "ac_cv_header_$ac_safe=yes" +@@ -2137,7 +2533,7 @@ else + #endif 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 @@ +@@ -2213,14 +2609,9 @@ done + echo $ac_n "checking for location of rfftw""... $ac_c" 1>&6 -echo "configure:2217: checking for location of rfftw" >&5 +-if test -r $FFTWDIR/rfftw/.libs/librfftw.a; then +- RFFTWLIB="-lrfftw" +- echo "$ac_t""found librfftw.a" 1>&6 +-else +- RFFTWLIB="$FFTWDIR/rfftw/rfftw.o $FFTWDIR/rfftw/rfftwnd.o" +- echo "$ac_t""using rfftw object code" 1>&6 +-fi +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 @@ ++RFFTWLIB="$FFTWDIR/rfftw/.libs/librfftw.a" ++echo "$ac_t""found librfftw.a" 1>&6 - 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 @@ +@@ -2310,7 +2701,7 @@ EOF + # Ultrix sh set writes to stderr and can't be redirected directly, # 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 @@ + # turns \\\\ into \\, and sed turns \\ into \). +@@ -2377,7 +2768,7 @@ do + echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" 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 @@ + echo "\$ac_cs_usage"; exit 0 ;; +@@ -2396,9 +2787,11 @@ sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g + s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF $ac_vpsub $extrasub +s%@SHELL@%$SHELL%g @@ -1301,7 +754,9 @@ no additional changes were made. +s%@FFLAGS@%$FFLAGS%g s%@DEFS@%$DEFS%g s%@LDFLAGS@%$LDFLAGS%g -@@ -2422,8 +2820,4 @@ + s%@LIBS@%$LIBS%g +@@ -2421,15 +2814,15 @@ s%@FFTWDIR@%$FFTWDIR%g + s%@CC@%$CC%g s%@F77@%$F77%g s%@F90@%$F90%g -s%@USE_F77@%$USE_F77%g @@ -1310,7 +765,7 @@ no additional changes were made. -s%@SET_MAKE@%$SET_MAKE%g s%@host@%$host%g s%@host_alias@%$host_alias%g -@@ -2431,4 +2825,8 @@ + s%@host_cpu@%$host_cpu%g s%@host_vendor@%$host_vendor%g s%@host_os@%$host_os%g +s%@FLIBS@%$FLIBS%g @@ -1319,3 +774,4 @@ no additional changes were made. +s%@SET_MAKE@%$SET_MAKE%g s%@CPP@%$CPP%g s%@RFFTWLIB@%$RFFTWLIB%g + s%@USE_NRC@%$USE_NRC%g diff --git a/benchmarks/benchfft/patches/patch-af b/benchmarks/benchfft/patches/patch-af deleted file mode 100644 index 8d391ced4cf..00000000000 --- a/benchmarks/benchfft/patches/patch-af +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-af,v 1.1 2001/12/07 19:46:07 jmc Exp $ - ---- ../fftw-2.0.1/config.sub.orig Fri Dec 7 02:05:59 2001 -+++ ../fftw-2.0.1/config.sub Fri Dec 7 02:06:22 2001 -@@ -182,7 +182,7 @@ - | sparc64-* | mips64-* | mipsel-* \ - | mips64el-* | mips64orion-* | mips64orionel-* \ - | mipstx39-* | mipstx39el-* \ -- | f301-*) -+ | f301-* | macppc-* ) - ;; - # Recognize the various machine names and aliases which stand - # for a CPU type and a company and sometimes even an OS. diff --git a/benchmarks/benchfft/patches/patch-ag b/benchmarks/benchfft/patches/patch-ag deleted file mode 100644 index 0fc3f8209a8..00000000000 --- a/benchmarks/benchfft/patches/patch-ag +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ag,v 1.1 2001/12/07 19:46:07 jmc Exp $ - ---- config.sub.orig Fri Dec 7 02:05:59 2001 -+++ config.sub Fri Dec 7 02:06:22 2001 -@@ -182,7 +182,7 @@ - | sparc64-* | mips64-* | mipsel-* \ - | mips64el-* | mips64orion-* | mips64orionel-* \ - | mipstx39-* | mipstx39el-* \ -- | f301-*) -+ | f301-* | macppc-* ) - ;; - # Recognize the various machine names and aliases which stand - # for a CPU type and a company and sometimes even an OS. |