diff options
Diffstat (limited to 'math/scilab')
-rw-r--r-- | math/scilab/Makefile | 7 | ||||
-rw-r--r-- | math/scilab/files/patch-sum | 9 | ||||
-rw-r--r-- | math/scilab/patches/patch-aa | 24 | ||||
-rw-r--r-- | math/scilab/patches/patch-au | 1084 | ||||
-rw-r--r-- | math/scilab/patches/patch-ay | 13 | ||||
-rw-r--r-- | math/scilab/patches/patch-bu | 10 | ||||
-rw-r--r-- | math/scilab/pkg/PLIST | 3 |
7 files changed, 916 insertions, 234 deletions
diff --git a/math/scilab/Makefile b/math/scilab/Makefile index bd707072e37..b37812f943c 100644 --- a/math/scilab/Makefile +++ b/math/scilab/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 1999/08/06 13:45:51 agc Exp $ +# $NetBSD: Makefile,v 1.10 1999/10/20 13:16:57 dmcmahill Exp $ # # IMPORTANT: Before upgrading this package, please read files/README.next_rev! @@ -11,9 +11,7 @@ MASTER_SITES= ftp://ftp.inria.fr/INRIA/Projects/Meta2/Scilab/distributions/ MAINTAINER= mcmahill@alum.mit.edu HOMEPAGE= http://www-rocq.inria.fr/scilab/ -.if !exists(/usr/bin/fort77) DEPENDS+= f2c-19980913:../../lang/f2c -.endif DEPENDS+= xless-1.7:../../x11/xless DEPENDS+= pvm-3.4.7:../../parallel/pvm3 @@ -25,6 +23,7 @@ PLIST_SRC= ${WRKDIR}/.PLIST-src USE_X11BASE= yes USE_X11= yes GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --with-f2c MAKE_ENV+= HOME=${WRKSRC} CONFIGURE_ENV+= LOCALBASE=${LOCALBASE} @@ -40,7 +39,7 @@ pre-fetch: post-patch: @${SED} -e 's|@localbase@|'${LOCALBASE}'|g' \ - -e 's|@x11base@|'${X11BASE}'|g' < ${PKGDIR}/PLIST > ${PLIST_SRC} + -e 's|@x11base@|'${X11BASE}'|g' < ${PKGDIR}/PLIST > ${PLIST_SRC} @if [ ${MACHINE_ARCH} != "alpha" ]; then \ ${MV} ${WRKSRC}/scilab.star.orig ${WRKSRC}/scilab.star ; \ fi diff --git a/math/scilab/files/patch-sum b/math/scilab/files/patch-sum index 89657150849..f9b6153f9cb 100644 --- a/math/scilab/files/patch-sum +++ b/math/scilab/files/patch-sum @@ -1,6 +1,6 @@ -$NetBSD: patch-sum,v 1.1 1999/07/09 14:09:09 agc Exp $ +$NetBSD: patch-sum,v 1.2 1999/10/20 13:16:58 dmcmahill Exp $ -MD5 (patch-aa) = 9faa53751c3ab5f6966f71c119ead4ce +MD5 (patch-aa) = 4da2feb94dda25f43d3bb69b896ce557 MD5 (patch-ab) = 5e2b13daee5b550646d4e9d0263ed784 MD5 (patch-ac) = 5bc70e04a53bf69e1385cebfab6a7de8 MD5 (patch-ad) = 7941b30677737f275521dd0f909c525c @@ -20,11 +20,11 @@ MD5 (patch-aq) = 3195d62edb2b9050dc5101ba169eb457 MD5 (patch-ar) = cef67f32f50fa960f7ec2675fcf362a6 MD5 (patch-as) = ab107f334940508c8050199310d6d8fd MD5 (patch-at) = c4d94450ccff68396bd881c8ea76d8c4 -MD5 (patch-au) = a7dc37b1f73d23d18595c3e47c399285 +MD5 (patch-au) = 186f72fee6543f80e0b4a3a41603707a MD5 (patch-av) = 7c69ce169e4339028ea329b39fb8e8ff MD5 (patch-aw) = 2841d3fa901d94a2ada4ff19c73d15bb MD5 (patch-ax) = ded46e72068fe653817e916e9f133873 -MD5 (patch-ay) = 38c4ef71f3782f4b8c659cfad5ce1a1b +MD5 (patch-ay) = 42da5a7645d3c9f05734bb6db8140908 MD5 (patch-az) = 3d27dbc49f62448c9a6b9a26a7baedda MD5 (patch-ba) = 7ab4556ef31b4cf17c17815804861b16 MD5 (patch-bb) = d36dbcc2695dec9ab3a9b11288605462 @@ -46,3 +46,4 @@ MD5 (patch-bq) = b16ad728a8d179de4c1e79b4760766db MD5 (patch-br) = a58c0bedfd7a36202764a813dd8247c4 MD5 (patch-bs) = 895ce97f5e6a7ebf4a134cda2d954d60 MD5 (patch-bt) = 22197886edadb8f13f4e9b72c2f048c5 +MD5 (patch-bu) = 0bedfd277345a6adf296af1b6b15db30 diff --git a/math/scilab/patches/patch-aa b/math/scilab/patches/patch-aa index 55b656e3f3a..852a713b783 100644 --- a/math/scilab/patches/patch-aa +++ b/math/scilab/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.2 1999/03/05 11:22:34 frueauf Exp $ +$NetBSD: patch-aa,v 1.3 1999/10/20 13:16:59 dmcmahill Exp $ --- configure.in.orig Thu Sep 17 07:44:35 1998 -+++ configure.in Fri Jan 15 22:15:57 1999 -@@ -684,4 +684,100 @@ ++++ configure.in Mon Oct 4 21:52:54 1999 +@@ -684,4 +684,108 @@ MAKEFILE_TARGET=Makefile.gcwin32 ;; + *-*-freebsd*) @@ -53,9 +53,16 @@ $NetBSD: patch-aa,v 1.2 1999/03/05 11:22:34 frueauf Exp $ + # + # Fortran Compiler + # -+ AC_CHECK_PROGS(F77,f77 f2c-f77,no) -+ if test "$F77" = no; then -+ AC_MSG_ERROR([Unable to configure: Fortran, f77 or f2c-f77, compiler not found]) ++ if test "$with_f2c" = yes; then ++ AC_CHECK_PROGS(F77,f2c-f77,no) ++ if test "$F77" = no; then ++ AC_MSG_ERROR([Unable to configure: Fortran compiler f2c-f77 not found]) ++ fi ++ else ++ AC_CHECK_PROGS(F77,f77 f2c-f77,no) ++ if test "$F77" = no; then ++ AC_MSG_ERROR([Unable to configure: Fortran, f77 or f2c-f77, compiler not found]) ++ fi + fi + + FC=$F77 @@ -63,6 +70,7 @@ $NetBSD: patch-aa,v 1.2 1999/03/05 11:22:34 frueauf Exp $ + FC_LDFLAGS="-Wl,-R${X11BASE}/lib" + FC_PICFLAGS='-fPIC' + ++ + # check for --export-dynamic + ac_save_LDFLAGS="$LDFLAGS" + LDFLAGS='-Wl,--export-dynamic' @@ -103,7 +111,7 @@ $NetBSD: patch-aa,v 1.2 1999/03/05 11:22:34 frueauf Exp $ + *) AC_MSG_ERROR("Unable to configure for host $host") -@@ -849,4 +945,9 @@ +@@ -849,4 +953,9 @@ AC_CHECK_FUNCS(usleep) +######################## @@ -113,7 +121,7 @@ $NetBSD: patch-aa,v 1.2 1999/03/05 11:22:34 frueauf Exp $ + ################## ## termcap library -@@ -883,20 +984,38 @@ +@@ -883,20 +992,38 @@ if test "$with_pvm" != no; then -AC_CACHE_CHECK("for PVM architecture",ac_cv_PVM_arch, diff --git a/math/scilab/patches/patch-au b/math/scilab/patches/patch-au index 298c8d32d0e..a496017893c 100644 --- a/math/scilab/patches/patch-au +++ b/math/scilab/patches/patch-au @@ -1,8 +1,554 @@ -$NetBSD: patch-au,v 1.2 1999/03/05 11:22:35 frueauf Exp $ +$NetBSD: patch-au,v 1.3 1999/10/20 13:16:59 dmcmahill Exp $ --- configure.orig Thu Sep 17 09:06:23 1998 -+++ configure Fri Jan 15 22:16:45 1999 -@@ -2097,4 +2097,181 @@ ++++ configure Mon Oct 4 21:53:01 1999 +@@ -44,5 +44,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. + # +@@ -104,4 +104,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 +@@ -387,5 +388,5 @@ + + -version | --version | --versio | --versi | --vers) +- echo "configure generated by autoconf version 2.12" ++ echo "configure generated by autoconf version 2.13" + exit 0 ;; + +@@ -557,7 +558,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. +@@ -597,10 +600,10 @@ + + # 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:605: checking host system type" >&5 ++echo "configure:608: checking host system type" >&5 + + host_alias=$host +@@ -609,5 +612,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 ;; +@@ -616,5 +619,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/'` +@@ -668,5 +671,5 @@ + set dummy gcc; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:671: checking for $ac_word" >&5 ++echo "configure:674: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_GCC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -675,6 +678,7 @@ + ac_cv_prog_GCC="$GCC" # 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 +@@ -700,5 +704,5 @@ + set dummy g77; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:703: checking for $ac_word" >&5 ++echo "configure:707: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_G77'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -707,6 +711,7 @@ + ac_cv_prog_G77="$G77" # 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 +@@ -734,5 +739,5 @@ + set dummy gcc; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:737: checking for $ac_word" >&5 ++echo "configure:742: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_GCC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -741,6 +746,7 @@ + ac_cv_prog_GCC="$GCC" # 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 +@@ -768,5 +774,5 @@ + set dummy g77; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:771: checking for $ac_word" >&5 ++echo "configure:777: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_G77'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -775,6 +781,7 @@ + ac_cv_prog_G77="$G77" # 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 +@@ -853,5 +860,5 @@ + set dummy f77; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:856: checking for $ac_word" >&5 ++echo "configure:863: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_F77'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -860,6 +867,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 +@@ -918,5 +926,5 @@ + set dummy f77; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:921: checking for $ac_word" >&5 ++echo "configure:929: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_F77'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -925,6 +933,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 +@@ -983,5 +992,5 @@ + set dummy f77; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:986: checking for $ac_word" >&5 ++echo "configure:995: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_F77'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -990,6 +999,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 +@@ -1049,5 +1059,5 @@ + set dummy f77; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1052: checking for $ac_word" >&5 ++echo "configure:1062: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_F77'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -1056,6 +1066,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 +@@ -1118,5 +1129,5 @@ + set dummy f77; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1121: checking for $ac_word" >&5 ++echo "configure:1132: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_F77'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -1125,6 +1136,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 +@@ -1179,5 +1191,5 @@ + LIEEELIB= + echo $ac_n "checking for main in -lieee""... $ac_c" 1>&6 +-echo "configure:1182: checking for main in -lieee" >&5 ++echo "configure:1194: checking for main in -lieee" >&5 + ac_lib_var=`echo ieee'_'main | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +@@ -1187,5 +1199,5 @@ + LIBS="-lieee $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 1190 "configure" ++#line 1202 "configure" + #include "confdefs.h" + +@@ -1194,5 +1206,5 @@ + ; return 0; } + EOF +-if { (eval echo configure:1197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ++if { (eval echo configure:1209: \"$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" +@@ -1226,5 +1238,5 @@ + set dummy f2c; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1229: checking for $ac_word" >&5 ++echo "configure:1241: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_F2C'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -1233,6 +1245,7 @@ + ac_cv_prog_F2C="$F2C" # 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 +@@ -1262,5 +1275,5 @@ + set dummy g77; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1265: checking for $ac_word" >&5 ++echo "configure:1278: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_G77'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -1269,6 +1282,7 @@ + ac_cv_prog_G77="$G77" # 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 +@@ -1295,5 +1309,5 @@ + set dummy f2c; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1298: checking for $ac_word" >&5 ++echo "configure:1312: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_F2C'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -1302,6 +1316,7 @@ + ac_cv_prog_F2C="$F2C" # 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 +@@ -1345,5 +1360,5 @@ + LIEEELIB= + echo $ac_n "checking for main in -lieee""... $ac_c" 1>&6 +-echo "configure:1348: checking for main in -lieee" >&5 ++echo "configure:1363: checking for main in -lieee" >&5 + ac_lib_var=`echo ieee'_'main | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +@@ -1353,5 +1368,5 @@ + LIBS="-lieee $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 1356 "configure" ++#line 1371 "configure" + #include "confdefs.h" + +@@ -1360,5 +1375,5 @@ + ; return 0; } + EOF +-if { (eval echo configure:1363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ++if { (eval echo configure:1378: \"$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" +@@ -1392,5 +1407,5 @@ + set dummy f2c; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1395: checking for $ac_word" >&5 ++echo "configure:1410: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_F2C'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -1399,6 +1414,7 @@ + ac_cv_prog_F2C="$F2C" # 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 +@@ -1428,5 +1444,5 @@ + set dummy g77; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1431: checking for $ac_word" >&5 ++echo "configure:1447: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_G77'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -1435,6 +1451,7 @@ + ac_cv_prog_G77="$G77" # 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 +@@ -1461,5 +1478,5 @@ + set dummy f2c; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1464: checking for $ac_word" >&5 ++echo "configure:1481: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_F2C'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -1468,6 +1485,7 @@ + ac_cv_prog_F2C="$F2C" # 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 +@@ -1521,5 +1539,5 @@ + set dummy f2c; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1524: checking for $ac_word" >&5 ++echo "configure:1542: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_F2C'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -1528,6 +1546,7 @@ + ac_cv_prog_F2C="$F2C" # 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 +@@ -1557,5 +1576,5 @@ + set dummy g77; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1560: checking for $ac_word" >&5 ++echo "configure:1579: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_G77'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -1564,6 +1583,7 @@ + ac_cv_prog_G77="$G77" # 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 +@@ -1590,5 +1610,5 @@ + set dummy f2c; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1593: checking for $ac_word" >&5 ++echo "configure:1613: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_F2C'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -1597,6 +1617,7 @@ + ac_cv_prog_F2C="$F2C" # 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 +@@ -1638,5 +1659,5 @@ + LIEEELIB= + echo $ac_n "checking for main in -lieee""... $ac_c" 1>&6 +-echo "configure:1641: checking for main in -lieee" >&5 ++echo "configure:1662: checking for main in -lieee" >&5 + ac_lib_var=`echo ieee'_'main | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +@@ -1646,5 +1667,5 @@ + LIBS="-lieee $LIBS" + cat > conftest.$ac_ext <<EOF +-#line 1649 "configure" ++#line 1670 "configure" + #include "confdefs.h" + +@@ -1653,5 +1674,5 @@ + ; return 0; } + EOF +-if { (eval echo configure:1656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ++if { (eval echo configure:1677: \"$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" +@@ -1686,5 +1707,5 @@ + set dummy f2c; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1689: checking for $ac_word" >&5 ++echo "configure:1710: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_F2C'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -1693,6 +1714,7 @@ + ac_cv_prog_F2C="$F2C" # 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 +@@ -1722,5 +1744,5 @@ + set dummy g77; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1725: checking for $ac_word" >&5 ++echo "configure:1747: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_G77'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -1729,6 +1751,7 @@ + ac_cv_prog_G77="$G77" # 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 +@@ -1755,5 +1778,5 @@ + set dummy f2c; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1758: checking for $ac_word" >&5 ++echo "configure:1781: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_F2C'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -1762,6 +1785,7 @@ + ac_cv_prog_F2C="$F2C" # 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 +@@ -1810,5 +1834,5 @@ + set dummy f77; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1813: checking for $ac_word" >&5 ++echo "configure:1837: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_F77'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -1817,6 +1841,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 +@@ -1876,5 +1901,5 @@ + set dummy f77; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1879: checking for $ac_word" >&5 ++echo "configure:1904: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_F77'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -1883,6 +1908,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 +@@ -1943,5 +1969,5 @@ + set dummy fort77; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1946: checking for $ac_word" >&5 ++echo "configure:1972: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_F77'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -1950,6 +1976,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 +@@ -2009,5 +2036,5 @@ + set dummy fort77; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2012: checking for $ac_word" >&5 ++echo "configure:2039: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_F77'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -2016,6 +2043,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 +@@ -2097,4 +2125,224 @@ MAKEFILE_TARGET=Makefile.gcwin32 ;; + *-*-freebsd*) @@ -44,16 +590,16 @@ $NetBSD: patch-au,v 1.2 1999/03/05 11:22:35 frueauf Exp $ + ac_save_LDFLAGS="$LDFLAGS" + LDFLAGS='-Wl,--export-dynamic' + echo $ac_n "checking if the linker accepts --export-dynamic""... $ac_c" 1>&6 -+echo "configure:2139: checking if the linker accepts --export-dynamic" >&5 ++echo "configure:2167: checking if the linker accepts --export-dynamic" >&5 + cat > conftest.$ac_ext <<EOF -+#line 2141 "configure" ++#line 2169 "configure" +#include "confdefs.h" + +int main() { + +; return 0; } +EOF -+if { (eval echo configure:2148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ++if { (eval echo configure:2176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + echo "$ac_t""yes" 1>&6 + CC_LDFLAGS="$CC_LDFLAGS -Wl,--export-dynamic" @@ -69,20 +615,22 @@ $NetBSD: patch-au,v 1.2 1999/03/05 11:22:35 frueauf Exp $ + # + # Fortran Compiler + # -+ for ac_prog in f77 f2c-f77 ++ if test "$with_f2c" = yes; then ++ for ac_prog in f2c-f77 +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:2169: checking for $ac_word" >&5 ++echo "configure:2198: 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="${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 + ac_cv_prog_F77="$ac_prog" @@ -103,8 +651,48 @@ $NetBSD: patch-au,v 1.2 1999/03/05 11:22:35 frueauf Exp $ +done +test -n "$F77" || F77="no" + -+ if test "$F77" = no; then -+ { echo "configure: error: Unable to configure: Fortran, f77 or f2c-f77, compiler not found" 1>&2; exit 1; } ++ if test "$F77" = no; then ++ { echo "configure: error: Unable to configure: Fortran compiler f2c-f77 not found" 1>&2; exit 1; } ++ fi ++ else ++ for ac_prog in f77 f2c-f77 ++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:2237: 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 -n "$F77" || F77="no" ++ ++ if test "$F77" = no; then ++ { echo "configure: error: Unable to configure: Fortran, f77 or f2c-f77, compiler not found" 1>&2; exit 1; } ++ fi + fi + + FC=$F77 @@ -112,20 +700,21 @@ $NetBSD: patch-au,v 1.2 1999/03/05 11:22:35 frueauf Exp $ + FC_LDFLAGS="-Wl,-R${X11BASE}/lib" + FC_PICFLAGS='-fPIC' + ++ + # check for --export-dynamic + ac_save_LDFLAGS="$LDFLAGS" + LDFLAGS='-Wl,--export-dynamic' + echo $ac_n "checking if the linker accepts --export-dynamic""... $ac_c" 1>&6 -+echo "configure:2211: checking if the linker accepts --export-dynamic" >&5 ++echo "configure:2282: checking if the linker accepts --export-dynamic" >&5 + cat > conftest.$ac_ext <<EOF -+#line 2213 "configure" ++#line 2284 "configure" +#include "confdefs.h" + +int main() { + +; return 0; } +EOF -+if { (eval echo configure:2220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ++if { (eval echo configure:2291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + echo "$ac_t""yes" 1>&6 + FC_LDFLAGS="$FC_LDFLAGS -Wl,--export-dynamic" @@ -148,16 +737,16 @@ $NetBSD: patch-au,v 1.2 1999/03/05 11:22:35 frueauf Exp $ + ac_save_LDFLAGS="$LDFLAGS" + LDFLAGS='-Wl,--export-dynamic' + echo $ac_n "checking if the linker accepts --export-dynamic""... $ac_c" 1>&6 -+echo "configure:2243: checking if the linker accepts --export-dynamic" >&5 ++echo "configure:2314: checking if the linker accepts --export-dynamic" >&5 + cat > conftest.$ac_ext <<EOF -+#line 2245 "configure" ++#line 2316 "configure" +#include "confdefs.h" + +int main() { + +; return 0; } +EOF -+if { (eval echo configure:2252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ++if { (eval echo configure:2323: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + echo "$ac_t""yes" 1>&6 + LD_LDFLAGS="$LD_LDFLAGS --export-dynamic" @@ -184,536 +773,579 @@ $NetBSD: patch-au,v 1.2 1999/03/05 11:22:35 frueauf Exp $ + *) { echo "configure: error: "Unable to configure for host $host"" 1>&2; exit 1; } -@@ -2112,5 +2289,5 @@ +@@ -2112,5 +2360,5 @@ set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2115: checking for $ac_word" >&5 -+echo "configure:2292: checking for $ac_word" >&5 ++echo "configure:2363: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -2144,5 +2321,5 @@ +@@ -2119,6 +2367,7 @@ + ac_cv_prog_RANLIB="$RANLIB" # 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 +@@ -2144,5 +2393,5 @@ if test "$PERIFILE" = periX11.o; then echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:2147: checking how to run the C preprocessor" >&5 -+echo "configure:2324: checking how to run the C preprocessor" >&5 ++echo "configure:2396: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then -@@ -2159,5 +2336,5 @@ +@@ -2159,5 +2408,5 @@ # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 2162 "configure" -+#line 2339 "configure" ++#line 2411 "configure" #include "confdefs.h" #include <assert.h> -@@ -2165,5 +2342,5 @@ +@@ -2165,6 +2414,6 @@ EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2168: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2345: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out` +-ac_err=`grep -v '^ *+' conftest.out` ++{ (eval echo configure:2417: \"$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 -@@ -2176,5 +2353,5 @@ + : +@@ -2176,5 +2425,22 @@ CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 2179 "configure" -+#line 2356 "configure" ++#line 2428 "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:2434: \"$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 2445 "configure" #include "confdefs.h" #include <assert.h> -@@ -2182,5 +2359,5 @@ +@@ -2182,6 +2448,6 @@ EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2185: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2362: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out` +-ac_err=`grep -v '^ *+' conftest.out` ++{ (eval echo configure:2451: \"$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 -@@ -2209,5 +2386,5 @@ + : +@@ -2196,4 +2462,6 @@ + fi + rm -f conftest* ++fi ++rm -f conftest* + ac_cv_prog_CPP="$CPP" + fi +@@ -2209,5 +2477,5 @@ # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:2212: checking for X" >&5 -+echo "configure:2389: checking for X" >&5 ++echo "configure:2480: checking for X" >&5 # Check whether --with-x or --without-x was given. -@@ -2271,10 +2448,10 @@ +@@ -2271,11 +2539,11 @@ # First, try using that file with no special directory specified. cat > conftest.$ac_ext <<EOF -#line 2274 "configure" -+#line 2451 "configure" ++#line 2542 "configure" #include "confdefs.h" #include <$x_direct_test_include> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2279: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2456: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out` +-ac_err=`grep -v '^ *+' conftest.out` ++{ (eval echo configure:2547: \"$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 -@@ -2345,5 +2522,5 @@ + rm -rf conftest* +@@ -2345,5 +2613,5 @@ LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <<EOF -#line 2348 "configure" -+#line 2525 "configure" ++#line 2616 "configure" #include "confdefs.h" -@@ -2352,5 +2529,5 @@ +@@ -2352,5 +2620,5 @@ ; return 0; } EOF -if { (eval echo configure:2355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:2532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ++if { (eval echo configure:2623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" -@@ -2458,8 +2635,8 @@ +@@ -2458,8 +2726,8 @@ "SunOS 5"*) echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -echo "configure:2461: checking whether -R must be followed by a space" >&5 -+echo "configure:2638: checking whether -R must be followed by a space" >&5 ++echo "configure:2729: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <<EOF -#line 2464 "configure" -+#line 2641 "configure" ++#line 2732 "configure" #include "confdefs.h" -@@ -2468,5 +2645,5 @@ +@@ -2468,5 +2736,5 @@ ; return 0; } EOF -if { (eval echo configure:2471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:2648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ++if { (eval echo configure:2739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes -@@ -2484,5 +2661,5 @@ +@@ -2484,5 +2752,5 @@ LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <<EOF -#line 2487 "configure" -+#line 2664 "configure" ++#line 2755 "configure" #include "confdefs.h" -@@ -2491,5 +2668,5 @@ +@@ -2491,5 +2759,5 @@ ; return 0; } EOF -if { (eval echo configure:2494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:2671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ++if { (eval echo configure:2762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes -@@ -2523,5 +2700,5 @@ +@@ -2523,5 +2791,5 @@ # the Alpha needs dnet_stub (dnet does not exist). echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:2526: checking for dnet_ntoa in -ldnet" >&5 -+echo "configure:2703: checking for dnet_ntoa in -ldnet" >&5 ++echo "configure:2794: checking for dnet_ntoa in -ldnet" >&5 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -@@ -2531,5 +2708,5 @@ +@@ -2531,5 +2799,5 @@ LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <<EOF -#line 2534 "configure" -+#line 2711 "configure" ++#line 2802 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ -@@ -2542,5 +2719,5 @@ +@@ -2542,5 +2810,5 @@ ; return 0; } EOF -if { (eval echo configure:2545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:2722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ++if { (eval echo configure:2813: \"$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" -@@ -2564,5 +2741,5 @@ +@@ -2564,5 +2832,5 @@ if test $ac_cv_lib_dnet_dnet_ntoa = no; then echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:2567: checking for dnet_ntoa in -ldnet_stub" >&5 -+echo "configure:2744: checking for dnet_ntoa in -ldnet_stub" >&5 ++echo "configure:2835: checking for dnet_ntoa in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -@@ -2572,5 +2749,5 @@ +@@ -2572,5 +2840,5 @@ LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <<EOF -#line 2575 "configure" -+#line 2752 "configure" ++#line 2843 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ -@@ -2583,5 +2760,5 @@ +@@ -2583,5 +2851,5 @@ ; return 0; } EOF -if { (eval echo configure:2586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:2763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ++if { (eval echo configure:2854: \"$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" -@@ -2612,10 +2789,10 @@ +@@ -2612,10 +2880,10 @@ # on Irix 5.2, according to dickey@clark.net. echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:2615: checking for gethostbyname" >&5 -+echo "configure:2792: checking for gethostbyname" >&5 ++echo "configure:2883: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2620 "configure" -+#line 2797 "configure" ++#line 2888 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, -@@ -2640,5 +2817,5 @@ +@@ -2640,5 +2908,5 @@ ; return 0; } EOF -if { (eval echo configure:2643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:2820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ++if { (eval echo configure:2911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" -@@ -2661,5 +2838,5 @@ +@@ -2661,5 +2929,5 @@ if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:2664: checking for gethostbyname in -lnsl" >&5 -+echo "configure:2841: checking for gethostbyname in -lnsl" >&5 ++echo "configure:2932: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -@@ -2669,5 +2846,5 @@ +@@ -2669,5 +2937,5 @@ LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <<EOF -#line 2672 "configure" -+#line 2849 "configure" ++#line 2940 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ -@@ -2680,5 +2857,5 @@ +@@ -2680,5 +2948,5 @@ ; return 0; } EOF -if { (eval echo configure:2683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:2860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ++if { (eval echo configure:2951: \"$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" -@@ -2710,10 +2887,10 @@ +@@ -2710,10 +2978,10 @@ # We assume that if connect needs -lnsl, so does gethostbyname. echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:2713: checking for connect" >&5 -+echo "configure:2890: checking for connect" >&5 ++echo "configure:2981: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2718 "configure" -+#line 2895 "configure" ++#line 2986 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, -@@ -2738,5 +2915,5 @@ +@@ -2738,5 +3006,5 @@ ; return 0; } EOF -if { (eval echo configure:2741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:2918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ++if { (eval echo configure:3009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" -@@ -2759,5 +2936,5 @@ +@@ -2759,5 +3027,5 @@ if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:2762: checking for connect in -lsocket" >&5 -+echo "configure:2939: checking for connect in -lsocket" >&5 ++echo "configure:3030: checking for connect in -lsocket" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -@@ -2767,5 +2944,5 @@ +@@ -2767,5 +3035,5 @@ LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 2770 "configure" -+#line 2947 "configure" ++#line 3038 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ -@@ -2778,5 +2955,5 @@ +@@ -2778,5 +3046,5 @@ ; return 0; } EOF -if { (eval echo configure:2781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:2958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ++if { (eval echo configure:3049: \"$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" -@@ -2802,10 +2979,10 @@ +@@ -2802,10 +3070,10 @@ # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:2805: checking for remove" >&5 -+echo "configure:2982: checking for remove" >&5 ++echo "configure:3073: checking for remove" >&5 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2810 "configure" -+#line 2987 "configure" ++#line 3078 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, -@@ -2830,5 +3007,5 @@ +@@ -2830,5 +3098,5 @@ ; return 0; } EOF -if { (eval echo configure:2833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:3010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ++if { (eval echo configure:3101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_remove=yes" -@@ -2851,5 +3028,5 @@ +@@ -2851,5 +3119,5 @@ if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:2854: checking for remove in -lposix" >&5 -+echo "configure:3031: checking for remove in -lposix" >&5 ++echo "configure:3122: checking for remove in -lposix" >&5 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -@@ -2859,5 +3036,5 @@ +@@ -2859,5 +3127,5 @@ LIBS="-lposix $LIBS" cat > conftest.$ac_ext <<EOF -#line 2862 "configure" -+#line 3039 "configure" ++#line 3130 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ -@@ -2870,5 +3047,5 @@ +@@ -2870,5 +3138,5 @@ ; return 0; } EOF -if { (eval echo configure:2873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:3050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ++if { (eval echo configure:3141: \"$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" -@@ -2894,10 +3071,10 @@ +@@ -2894,10 +3162,10 @@ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:2897: checking for shmat" >&5 -+echo "configure:3074: checking for shmat" >&5 ++echo "configure:3165: checking for shmat" >&5 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2902 "configure" -+#line 3079 "configure" ++#line 3170 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, -@@ -2922,5 +3099,5 @@ +@@ -2922,5 +3190,5 @@ ; return 0; } EOF -if { (eval echo configure:2925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:3102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ++if { (eval echo configure:3193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shmat=yes" -@@ -2943,5 +3120,5 @@ +@@ -2943,5 +3211,5 @@ if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:2946: checking for shmat in -lipc" >&5 -+echo "configure:3123: checking for shmat in -lipc" >&5 ++echo "configure:3214: checking for shmat in -lipc" >&5 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -@@ -2951,5 +3128,5 @@ +@@ -2951,5 +3219,5 @@ LIBS="-lipc $LIBS" cat > conftest.$ac_ext <<EOF -#line 2954 "configure" -+#line 3131 "configure" ++#line 3222 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ -@@ -2962,5 +3139,5 @@ +@@ -2962,5 +3230,5 @@ ; return 0; } EOF -if { (eval echo configure:2965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:3142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ++if { (eval echo configure:3233: \"$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" -@@ -2995,5 +3172,5 @@ +@@ -2995,5 +3263,5 @@ # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:2998: checking for IceConnectionNumber in -lICE" >&5 -+echo "configure:3175: checking for IceConnectionNumber in -lICE" >&5 ++echo "configure:3266: checking for IceConnectionNumber in -lICE" >&5 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -@@ -3003,5 +3180,5 @@ - LIBS="-lICE $LIBS" +@@ -3001,7 +3269,7 @@ + else + ac_save_LIBS="$LIBS" +-LIBS="-lICE $LIBS" ++LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 3006 "configure" -+#line 3183 "configure" ++#line 3274 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ -@@ -3014,5 +3191,5 @@ +@@ -3014,5 +3282,5 @@ ; return 0; } EOF -if { (eval echo configure:3017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:3194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ++if { (eval echo configure:3285: \"$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" -@@ -3055,5 +3232,5 @@ +@@ -3055,5 +3323,5 @@ if test "$PERIFILE" = periX11.o; then echo $ac_n "checking "for X11 release"""... $ac_c" 1>&6 -echo "configure:3058: checking "for X11 release"" >&5 -+echo "configure:3235: checking "for X11 release"" >&5 ++echo "configure:3326: checking "for X11 release"" >&5 if eval "test \"`echo '$''{'ac_cv_X11_release'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -3104,5 +3281,5 @@ +@@ -3104,5 +3372,5 @@ fi echo $ac_n "checking for main in -lXmu""... $ac_c" 1>&6 -echo "configure:3107: checking for main in -lXmu" >&5 -+echo "configure:3284: checking for main in -lXmu" >&5 ++echo "configure:3375: checking for main in -lXmu" >&5 ac_lib_var=`echo Xmu'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -@@ -3112,5 +3289,5 @@ +@@ -3112,5 +3380,5 @@ LIBS="-lXmu -lXt -lXext $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 3115 "configure" -+#line 3292 "configure" ++#line 3383 "configure" #include "confdefs.h" -@@ -3119,5 +3296,5 @@ +@@ -3119,5 +3387,5 @@ ; return 0; } EOF -if { (eval echo configure:3122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:3299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ++if { (eval echo configure:3390: \"$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" -@@ -3141,5 +3318,5 @@ +@@ -3141,5 +3409,5 @@ echo $ac_n "checking for main in -lXaw""... $ac_c" 1>&6 -echo "configure:3144: checking for main in -lXaw" >&5 -+echo "configure:3321: checking for main in -lXaw" >&5 ++echo "configure:3412: checking for main in -lXaw" >&5 ac_lib_var=`echo Xaw'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -@@ -3149,5 +3326,5 @@ +@@ -3149,5 +3417,5 @@ LIBS="-lXaw -lXmu -lXt -lXext $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 3152 "configure" -+#line 3329 "configure" ++#line 3420 "configure" #include "confdefs.h" -@@ -3156,5 +3333,5 @@ +@@ -3156,5 +3424,5 @@ ; return 0; } EOF -if { (eval echo configure:3159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:3336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ++if { (eval echo configure:3427: \"$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" -@@ -3201,5 +3378,5 @@ +@@ -3201,5 +3469,5 @@ echo $ac_n "checking "for leading and/or trailing underscores"""... $ac_c" 1>&6 -echo "configure:3204: checking "for leading and/or trailing underscores"" >&5 -+echo "configure:3381: checking "for leading and/or trailing underscores"" >&5 ++echo "configure:3472: checking "for leading and/or trailing underscores"" >&5 cat << EOF > pipof.f subroutine pipof -@@ -3253,7 +3430,7 @@ +@@ -3253,7 +3521,7 @@ echo $ac_n "checking "for use of sharpsign in CPP"""... $ac_c" 1>&6 -echo "configure:3256: checking "for use of sharpsign in CPP"" >&5 -+echo "configure:3433: checking "for use of sharpsign in CPP"" >&5 ++echo "configure:3524: checking "for use of sharpsign in CPP"" >&5 cat > conftest.$ac_ext <<EOF -#line 3258 "configure" -+#line 3435 "configure" ++#line 3526 "configure" #include "confdefs.h" #define C2F(name) name##_ -@@ -3262,5 +3439,5 @@ +@@ -3262,5 +3530,5 @@ ; return 0; } EOF -if { (eval echo configure:3265: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:3442: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:3533: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 -@@ -3281,5 +3458,5 @@ +@@ -3281,5 +3549,5 @@ ############################################################## echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 -echo "configure:3284: checking for main in -lm" >&5 -+echo "configure:3461: checking for main in -lm" >&5 ++echo "configure:3552: checking for main in -lm" >&5 ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -@@ -3289,5 +3466,5 @@ +@@ -3289,5 +3557,5 @@ LIBS="-lm $LIBS" cat > conftest.$ac_ext <<EOF -#line 3292 "configure" -+#line 3469 "configure" ++#line 3560 "configure" #include "confdefs.h" -@@ -3296,5 +3473,5 @@ +@@ -3296,5 +3564,5 @@ ; return 0; } EOF -if { (eval echo configure:3299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:3476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ++if { (eval echo configure:3567: \"$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" -@@ -3326,10 +3503,10 @@ +@@ -3326,10 +3594,10 @@ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3329: checking for $ac_func" >&5 -+echo "configure:3506: checking for $ac_func" >&5 ++echo "configure:3597: 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 3334 "configure" -+#line 3511 "configure" ++#line 3602 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, -@@ -3354,5 +3531,5 @@ +@@ -3354,5 +3622,5 @@ ; return 0; } EOF -if { (eval echo configure:3357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:3534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ++if { (eval echo configure:3625: \"$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" -@@ -3381,10 +3558,10 @@ +@@ -3381,10 +3649,10 @@ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3384: checking for $ac_func" >&5 -+echo "configure:3561: checking for $ac_func" >&5 ++echo "configure:3652: 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 3389 "configure" -+#line 3566 "configure" ++#line 3657 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, -@@ -3409,5 +3586,5 @@ +@@ -3409,5 +3677,5 @@ ; return 0; } EOF -if { (eval echo configure:3412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:3589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ++if { (eval echo configure:3680: \"$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" -@@ -3436,10 +3613,10 @@ +@@ -3436,10 +3704,10 @@ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3439: checking for $ac_func" >&5 -+echo "configure:3616: checking for $ac_func" >&5 ++echo "configure:3707: 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 3444 "configure" -+#line 3621 "configure" ++#line 3712 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, -@@ -3464,5 +3641,5 @@ +@@ -3464,5 +3732,5 @@ ; return 0; } EOF -if { (eval echo configure:3467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:3644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ++if { (eval echo configure:3735: \"$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" -@@ -3491,10 +3668,10 @@ +@@ -3491,10 +3759,10 @@ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3494: checking for $ac_func" >&5 -+echo "configure:3671: checking for $ac_func" >&5 ++echo "configure:3762: 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 3499 "configure" -+#line 3676 "configure" ++#line 3767 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, -@@ -3519,5 +3696,5 @@ +@@ -3519,5 +3787,5 @@ ; return 0; } EOF -if { (eval echo configure:3522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:3699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ++if { (eval echo configure:3790: \"$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" -@@ -3546,10 +3723,10 @@ +@@ -3546,10 +3814,10 @@ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3549: checking for $ac_func" >&5 -+echo "configure:3726: checking for $ac_func" >&5 ++echo "configure:3817: 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 3554 "configure" -+#line 3731 "configure" ++#line 3822 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, -@@ -3574,5 +3751,5 @@ +@@ -3574,5 +3842,5 @@ ; return 0; } EOF -if { (eval echo configure:3577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:3754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ++if { (eval echo configure:3845: \"$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" -@@ -3599,4 +3776,48 @@ +@@ -3599,4 +3867,48 @@ +######################## @@ -723,18 +1355,18 @@ $NetBSD: patch-au,v 1.2 1999/03/05 11:22:35 frueauf Exp $ +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -+echo "configure:3786: checking for $ac_hdr" >&5 ++echo "configure:3877: 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 3791 "configure" ++#line 3882 "configure" +#include "confdefs.h" +#include <$ac_hdr> +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:3796: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+ac_err=`grep -v '^ *+' conftest.out` ++{ (eval echo configure:3887: \"$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* + eval "ac_cv_header_$ac_safe=yes" @@ -762,70 +1394,70 @@ $NetBSD: patch-au,v 1.2 1999/03/05 11:22:35 frueauf Exp $ + ################## ## termcap library -@@ -3604,5 +3825,5 @@ +@@ -3604,5 +3916,5 @@ TERMCAPLIB=no echo $ac_n "checking for main in -ltermcap""... $ac_c" 1>&6 -echo "configure:3607: checking for main in -ltermcap" >&5 -+echo "configure:3828: checking for main in -ltermcap" >&5 ++echo "configure:3919: checking for main in -ltermcap" >&5 ac_lib_var=`echo termcap'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -@@ -3612,5 +3833,5 @@ +@@ -3612,5 +3924,5 @@ LIBS="-ltermcap $LIBS" cat > conftest.$ac_ext <<EOF -#line 3615 "configure" -+#line 3836 "configure" ++#line 3927 "configure" #include "confdefs.h" -@@ -3619,5 +3840,5 @@ +@@ -3619,5 +3931,5 @@ ; return 0; } EOF -if { (eval echo configure:3622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:3843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ++if { (eval echo configure:3934: \"$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" -@@ -3641,5 +3862,5 @@ +@@ -3641,5 +3953,5 @@ if test "$TERMCAPLIB" = no; then echo $ac_n "checking for main in -ltermlib""... $ac_c" 1>&6 -echo "configure:3644: checking for main in -ltermlib" >&5 -+echo "configure:3865: checking for main in -ltermlib" >&5 ++echo "configure:3956: checking for main in -ltermlib" >&5 ac_lib_var=`echo termlib'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -@@ -3649,5 +3870,5 @@ +@@ -3649,5 +3961,5 @@ LIBS="-ltermlib $LIBS" cat > conftest.$ac_ext <<EOF -#line 3652 "configure" -+#line 3873 "configure" ++#line 3964 "configure" #include "confdefs.h" -@@ -3656,5 +3877,5 @@ +@@ -3656,5 +3968,5 @@ ; return 0; } EOF -if { (eval echo configure:3659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:3880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ++if { (eval echo configure:3971: \"$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" -@@ -3679,5 +3900,5 @@ +@@ -3679,5 +3991,5 @@ if test "$TERMCAPLIB" = no; then echo $ac_n "checking for main in -lcurses""... $ac_c" 1>&6 -echo "configure:3682: checking for main in -lcurses" >&5 -+echo "configure:3903: checking for main in -lcurses" >&5 ++echo "configure:3994: checking for main in -lcurses" >&5 ac_lib_var=`echo curses'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -@@ -3687,5 +3908,5 @@ +@@ -3687,5 +3999,5 @@ LIBS="-lcurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 3690 "configure" -+#line 3911 "configure" ++#line 4002 "configure" #include "confdefs.h" -@@ -3694,5 +3915,5 @@ +@@ -3694,5 +4006,5 @@ ; return 0; } EOF -if { (eval echo configure:3697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:3918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ++if { (eval echo configure:4009: \"$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" -@@ -3738,30 +3959,52 @@ +@@ -3738,30 +4050,52 @@ if test "$with_pvm" != no; then -echo $ac_n "checking "for PVM architecture"""... $ac_c" 1>&6 @@ -834,7 +1466,7 @@ $NetBSD: patch-au,v 1.2 1999/03/05 11:22:35 frueauf Exp $ + *-*-netbsd*) + ## with NetBSD, use the version of pvm3 which is part of the package collection + echo $ac_n "checking "for PVM architecture"""... $ac_c" 1>&6 -+echo "configure:3966: checking "for PVM architecture"" >&5 ++echo "configure:4057: checking "for PVM architecture"" >&5 + echo "$ac_t"""NETBSD"" 1>&6 + cat >> confdefs.h <<\EOF +#define WITH_PVM 1 @@ -851,7 +1483,7 @@ $NetBSD: patch-au,v 1.2 1999/03/05 11:22:35 frueauf Exp $ + *) + + echo $ac_n "checking "for PVM architecture"""... $ac_c" 1>&6 -+echo "configure:3983: checking "for PVM architecture"" >&5 ++echo "configure:4074: checking "for PVM architecture"" >&5 if eval "test \"`echo '$''{'ac_cv_PVM_arch'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -893,80 +1525,104 @@ $NetBSD: patch-au,v 1.2 1999/03/05 11:22:35 frueauf Exp $ +esac fi -@@ -3822,5 +4065,5 @@ +@@ -3822,5 +4156,5 @@ echo $ac_n "checking for main in -ldl""... $ac_c" 1>&6 -echo "configure:3825: checking for main in -ldl" >&5 -+echo "configure:4068: checking for main in -ldl" >&5 ++echo "configure:4159: checking for main in -ldl" >&5 ac_lib_var=`echo dl'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -@@ -3830,5 +4073,5 @@ +@@ -3830,5 +4164,5 @@ LIBS="-ldl $LIBS" cat > conftest.$ac_ext <<EOF -#line 3833 "configure" -+#line 4076 "configure" ++#line 4167 "configure" #include "confdefs.h" -@@ -3837,5 +4080,5 @@ +@@ -3837,5 +4171,5 @@ ; return 0; } EOF -if { (eval echo configure:3840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:4083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ++if { (eval echo configure:4174: \"$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" -@@ -3878,5 +4121,5 @@ +@@ -3878,5 +4212,5 @@ echo $ac_n " Testing version (need $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later)... " $ac_c cat > conftest.$ac_ext <<EOF -#line 3881 "configure" -+#line 4124 "configure" ++#line 4215 "configure" #include "confdefs.h" -@@ -3963,5 +4206,5 @@ +@@ -3963,5 +4297,5 @@ echo $ac_n " ""$ac_c" echo $ac_n "checking for Tcl_DoOneEvent in -lm""... $ac_c" 1>&6 -echo "configure:3966: checking for Tcl_DoOneEvent in -lm" >&5 -+echo "configure:4209: checking for Tcl_DoOneEvent in -lm" >&5 ++echo "configure:4300: checking for Tcl_DoOneEvent in -lm" >&5 ac_lib_var=`echo m'_'Tcl_DoOneEvent | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -@@ -3971,5 +4214,5 @@ +@@ -3971,5 +4305,5 @@ LIBS="-lm $m $X_LIBS $X_EXTRA_LIBS $TCLTK_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 3974 "configure" -+#line 4217 "configure" ++#line 4308 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ -@@ -3982,5 +4225,5 @@ +@@ -3982,5 +4316,5 @@ ; return 0; } EOF -if { (eval echo configure:3985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:4228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ++if { (eval echo configure:4319: \"$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" -@@ -4045,5 +4288,5 @@ +@@ -4045,5 +4379,5 @@ echo $ac_n " Testing version (need $CHK_TK_MAJOR.$CHK_TK_MINOR or later)... " $ac_c cat > conftest.$ac_ext <<EOF -#line 4048 "configure" -+#line 4291 "configure" ++#line 4382 "configure" #include "confdefs.h" -@@ -4126,5 +4369,5 @@ +@@ -4126,5 +4460,5 @@ echo $ac_n " ""$ac_c" echo $ac_n "checking for Tk_BindEvent in -lm""... $ac_c" 1>&6 -echo "configure:4129: checking for Tk_BindEvent in -lm" >&5 -+echo "configure:4372: checking for Tk_BindEvent in -lm" >&5 ++echo "configure:4463: checking for Tk_BindEvent in -lm" >&5 ac_lib_var=`echo m'_'Tk_BindEvent | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -@@ -4134,5 +4377,5 @@ +@@ -4134,5 +4468,5 @@ LIBS="-lm $m -lX11 $X_LIBS $X_EXTRA_LIBS $TCLTK_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 4137 "configure" -+#line 4380 "configure" ++#line 4471 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ -@@ -4145,5 +4388,5 @@ +@@ -4145,5 +4479,5 @@ ; return 0; } EOF -if { (eval echo configure:4148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:4391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ++if { (eval echo configure:4482: \"$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" +@@ -4286,5 +4620,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 +@@ -4353,5 +4687,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) +@@ -4372,7 +4706,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 diff --git a/math/scilab/patches/patch-ay b/math/scilab/patches/patch-ay index 73f06f6529c..453b21a4563 100644 --- a/math/scilab/patches/patch-ay +++ b/math/scilab/patches/patch-ay @@ -1,7 +1,7 @@ -$NetBSD: patch-ay,v 1.2 1999/03/05 11:22:35 frueauf Exp $ +$NetBSD: patch-ay,v 1.3 1999/10/20 13:17:00 dmcmahill Exp $ ---- examples/misc-examples/zlink.dia.ref.orig Mon Aug 24 12:07:41 1998 -+++ examples/misc-examples/zlink.dia.ref Mon Aug 24 12:07:58 1998 +--- examples/misc-examples/zlink.dia.ref.orig Tue Sep 15 07:28:05 1998 ++++ examples/misc-examples/zlink.dia.ref Fri Oct 8 19:36:36 1999 @@ -231,5 +231,5 @@ yy2=dassl([y0,y0d],t0,t,'dres1',info); //=yy0 @@ -9,3 +9,10 @@ $NetBSD: patch-ay,v 1.2 1999/03/05 11:22:35 frueauf Exp $ +if norm(dres1(yy2(1,:),yy2(2:3,:),yy2(4:5,:)),1)>1.4d-6 then bugmes();quit;end // fortran routines dres1 and djac1 in dir. routines/default, with jacobian +@@ -346,5 +346,5 @@ + xn=dassl([x0,x0d],t0,t,g,j,info); + +-if norm(x-xn,1) > Eps then bugmes();quit;end ++if norm(x-xn,1) > 2.0*Eps then bugmes();quit;end + + diff --git a/math/scilab/patches/patch-bu b/math/scilab/patches/patch-bu new file mode 100644 index 00000000000..8c76db82646 --- /dev/null +++ b/math/scilab/patches/patch-bu @@ -0,0 +1,10 @@ +$NetBSD: patch-bu,v 1.3 1999/10/20 13:17:00 dmcmahill Exp $ + +--- examples/misc-examples/dassl2.sce.orig Wed Jun 3 03:35:36 1998 ++++ examples/misc-examples/dassl2.sce Fri Oct 8 17:47:12 1999 +@@ -29,4 +29,4 @@ + x=dassl([x0,x0d],t0,t,g,info); + xn=dassl([x0,x0d],t0,t,g,j,info); +-if norm(x-xn,1) > Eps then pause,end ++if norm(x-xn,1) > 2.0*Eps then pause,end + diff --git a/math/scilab/pkg/PLIST b/math/scilab/pkg/PLIST index 7fcaca014c1..e721d6e13da 100644 --- a/math/scilab/pkg/PLIST +++ b/math/scilab/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 1999/08/13 14:06:57 agc Exp $ +@comment $NetBSD: PLIST,v 1.4 1999/10/20 13:17:01 dmcmahill Exp $ bin/scilab lib/X11/app-defaults/Metanet-color lib/X11/app-defaults/Xscilab @@ -541,6 +541,7 @@ share/${PKGNAME}/examples/misc-examples/dasrt3.sce share/${PKGNAME}/examples/misc-examples/dassl1.sce share/${PKGNAME}/examples/misc-examples/dassl1.sce.orig share/${PKGNAME}/examples/misc-examples/dassl2.sce +share/${PKGNAME}/examples/misc-examples/dassl2.sce.orig share/${PKGNAME}/examples/misc-examples/gr22.f share/${PKGNAME}/examples/misc-examples/jac22.f share/${PKGNAME}/examples/misc-examples/ode1.sce |