diff options
| author | dmcmahill <dmcmahill> | 2003-02-22 04:31:03 +0000 |
|---|---|---|
| committer | dmcmahill <dmcmahill> | 2003-02-22 04:31:03 +0000 |
| commit | 77a175d03849fbc71b4ca2f8346697363c163827 (patch) | |
| tree | 1a5e3e566156ac6c4bb997f56ee37b2c3f23341d /math/scilab/patches | |
| parent | 0aa866307dd0ae1184801410900a5c8b3ccf32b6 (diff) | |
| download | pkgsrc-77a175d03849fbc71b4ca2f8346697363c163827.tar.gz | |
update to scilab-2.7.
Main Changes Scilab 2.6 -> 2.7
==============================
THANKS
======
Scilab group wants to thank the increasing number of people who have
contributed to this new version of Scilab, with special mention to
Anders Blomdell, Stephane Mottelet, Dan McMahill
Ton van Overbeek, Bruno Pincon and Enrico Segre.
NEW FUNCTIONALITIES
===================
Slicot based control routines (www.win.tue.nl/wgs/slicot.html)
have been introduced with a special attention
to identification functions, lyapunov, sylvester and riccati equation solvers.
Interface with TeXmacs (www.texmacs.org) a high level scientific text editor.
The editor allows you to write structured documents via a wysiwyg interface
including Scilab sessions and results.
An embedded text editor scipad derived from TkNotepad
(www.mindspring.com/~joeja/programs.html) as been developped.
C Code generation from Scicos discrete models
Blocks defining DAE are now usable in Scicos.
Statistic toolbox added (labostat).
A new graphics version based on objects and entities has been developped
(beta version). It allows to edit the properties of graphics
objects. By default, the old graphics version is used. Tu use the new graphics
version see the help of "graphics_entities".
OTHERS IMPROVEMENTS
===================
Linear algebra primitives now based on Lapack instead of Linpack/Eispack.
Basic functions revised (thanks to B Pincon).
stacksize use is no more restricted.
Hypertext, xml based, online help.
Binary Matlab file .mat loader (loadmatfile) added.
Possibility to customize graphics window event handlers (seteventhandler).
edit_graph, a graph editor for Metanet toolbox, written in Scilab, replaces
xmetanet. It works on both Unix and Windows.
INCOMPATIBLITIES
================
It is higly recommended to rebuild user's scilab functions libraries. This
can be done as follow:
predef(0);genlib('mylib','mylib_path',%t)
gschur and gspec functions are now obsolete and replaced by schur and spec.
Geci and the communication library have been removed. Use PVM interface instead.
Metanet graph editor has been rewritten. Use edit_graph instead.
man pages have to be written in HTML or better in XML but chapters
written in the old ascii files are still handled.
Scicos internal data structure have been changed. Automatic translation
is made when old diagrams are loaded.
Diffstat (limited to 'math/scilab/patches')
25 files changed, 34 insertions, 2127 deletions
diff --git a/math/scilab/patches/patch-aa b/math/scilab/patches/patch-aa index 2943683e39e..7465ea4b405 100644 --- a/math/scilab/patches/patch-aa +++ b/math/scilab/patches/patch-aa @@ -1,47 +1,11 @@ -$NetBSD: patch-aa,v 1.6 2001/04/08 16:25:28 dmcmahill Exp $ +$NetBSD: patch-aa,v 1.7 2003/02/22 04:31:06 dmcmahill Exp $ -fix install target. - ---- Makefile.in.orig Mon Mar 26 02:59:13 2001 -+++ Makefile.in Thu Mar 29 07:54:47 2001 -@@ -1,4 +1,9 @@ - SHELL = /bin/sh - -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+bindir=@bindir@ -+ -+ - binary: - @if test -f .binary; then \ -@@ -151,19 +156,15 @@ - - install: -- @if test `pwd` != ${LIBPREFIX}/$(SCIBASE); then \ -- touch .binary; \ -- strip $(SCIDIR)/bin/scilex; \ -- (cd tests; make distclean); \ -- (cd examples; make distclean); \ -- (cd .. ; tar cf - $(BINDISTFILES) | (cd ${LIBPREFIX}; tar xf -)); \ -- (cd ${LIBPREFIX}/$(SCIBASE); make); \ -- $(RM) .binary; \ -- fi -- $(RM) /usr/bin/scilab -- ln -fs ${LIBPREFIX}/$(SCIBASE)/bin/scilab /usr/bin/scilab -- $(RM) /usr/bin/intersci -- ln -fs ${LIBPREFIX}/$(SCIBASE)/bin/intersci /usr/bin/intersci -- $(RM) /usr/bin/intersci-n -- ln -fs ${LIBPREFIX}/$(SCIBASE)/bin/intersci-n /usr/bin/intersci-n -+ touch .binary -+ strip $(SCIDIR)/bin/scilex -+ cd tests && $(MAKE) distclean -+ cd examples && $(MAKE) distclean -+ cd .. && tar cf - $(BINDISTFILES) | (cd ${prefix}; tar xf -) -+ cd ${prefix}/$(SCIBASE) && $(MAKE) -+ $(RM) .binary -+ for f in ${prefix}/${SCIBASE}/bin/* ; \ -+ do \ -+ ln -fs $$f ${bindir}/`basename $$f` ; \ -+ done - - uninstall: +--- configure.in.orig Thu Feb 20 22:05:02 2003 ++++ configure.in Fri Feb 21 06:46:43 2003 +@@ -992,5 +992,5 @@ + FC_OPTIONS="${FFLAGS}" + FC_OPTIONS_O0=`echo $FC_OPTIONS | sed 's/-O[0-9]*//g'` +- FC_LDFLAGS="${LDLAGS} -Wl,-R${X11BASE}/lib" ++ FC_LDFLAGS="${LDFLAGS} -Wl,-R${X11BASE}/lib" + FC_PICFLAGS='-fPIC' + # check for --export-dynamic diff --git a/math/scilab/patches/patch-ab b/math/scilab/patches/patch-ab index 53e510344e2..7e63a7f1cac 100644 --- a/math/scilab/patches/patch-ab +++ b/math/scilab/patches/patch-ab @@ -1,20 +1,11 @@ -$NetBSD: patch-ab,v 1.4 2001/04/08 16:25:28 dmcmahill Exp $ +$NetBSD: patch-ab,v 1.5 2003/02/22 04:31:06 dmcmahill Exp $ -makes the pvm demo work. patch derived from a post to -comp.soft-sys.math.scilab - ---- routines/pvm/pvm_proc_ctrl.c.orig Fri Aug 18 07:10:38 2000 -+++ routines/pvm/pvm_proc_ctrl.c Tue Mar 27 10:18:59 2001 -@@ -464,5 +464,11 @@ - } - #else -- strcpy(cmd, "scilex"); -+ if (path = getenv("SCI")){ -+ strcpy(cmd,path); -+ strcat(cmd,"/bin/scilex"); -+ } -+ else { -+ strcpy(cmd, "scilex"); -+ } - #endif - #if (defined __MSC__) || (defined __ABSC__) +--- configure.orig Thu Feb 20 22:05:02 2003 ++++ configure Fri Feb 21 06:47:13 2003 +@@ -10229,5 +10229,5 @@ + FC_OPTIONS="${FFLAGS}" + FC_OPTIONS_O0=`echo $FC_OPTIONS | sed 's/-O0-9*//g'` +- FC_LDFLAGS="${LDLAGS} -Wl,-R${X11BASE}/lib" ++ FC_LDFLAGS="${LDFLAGS} -Wl,-R${X11BASE}/lib" + FC_PICFLAGS='-fPIC' + # check for --export-dynamic diff --git a/math/scilab/patches/patch-ac b/math/scilab/patches/patch-ac index 1ce47a172db..73ca98c87d0 100644 --- a/math/scilab/patches/patch-ac +++ b/math/scilab/patches/patch-ac @@ -1,50 +1,9 @@ -$NetBSD: patch-ac,v 1.5 2002/03/05 21:05:53 dmcmahill Exp $ +$NetBSD: patch-ac,v 1.6 2003/02/22 04:31:07 dmcmahill Exp $ -check for the fortran libs. We need to check this way -to keep compatibility with both f2c and f77 rather than -hard coding something like "-lg2c". - -also honor {C,F,LD}FLAGS - ---- configure.in.orig Mon Mar 26 07:08:33 2001 -+++ configure.in Sun Mar 3 13:19:35 2002 -@@ -112,4 +112,12 @@ - fi - -+################################################## -+## Fortran libraries required for creating fortran -+## shared libraries. In particular this is needed -+## for the lapack examples when using f2c. This -+## will set the FLIBS variable. -+################################################## -+AC_F77_LIBRARY_LDFLAGS +--- routines/interf/stcreate.c.orig Thu Dec 19 05:10:48 2002 ++++ routines/interf/stcreate.c Fri Feb 21 06:50:54 2003 +@@ -1,2 +1,4 @@ ++#include <string.h> + - ############################################# - ## Compilers and options according to machine -@@ -847,7 +855,7 @@ - # C Compiler - # -- CC=cc -- CC_OPTIONS='-O2 -Dnetbsd' -- CC_LDFLAGS="-Wl,-R${X11BASE}/lib" -+ CC="${CC}" -+ CC_OPTIONS="${CFLAGS} -Dnetbsd" -+ CC_LDFLAGS="${LDFLAGS} -Wl,-R${X11BASE}/lib" - CC_PICFLAGS='-fPIC' - # check for --export-dynamic -@@ -875,7 +883,7 @@ - fi - FC="$F77" -- FC_OPTIONS='-O2' -+ FC_OPTIONS="${FFLAGS}" - FC_OPTIONS_O0= -- FC_LDFLAGS="-Wl,-R${X11BASE}/lib" -+ FC_LDFLAGS="${LDFLAGS} -Wl,-R${X11BASE}/lib" - FC_PICFLAGS='-fPIC' - # check for --export-dynamic -@@ -1339,4 +1347,5 @@ - AC_SUBST(LDFLAGS) - AC_SUBST(LIBS) -+AC_SUBST(FLIBS) - #AC_SUBST(CC) - AC_SUBST(CFLAGS) + #include "../stack-c.h" + #define memused(it,mn) ((((mn)*( it % 10))/sizeof(int))+1) diff --git a/math/scilab/patches/patch-ad b/math/scilab/patches/patch-ad index e12dc3516d0..f840566c445 100644 --- a/math/scilab/patches/patch-ad +++ b/math/scilab/patches/patch-ad @@ -1,1609 +1,9 @@ -$NetBSD: patch-ad,v 1.5 2002/03/05 21:05:53 dmcmahill Exp $ +$NetBSD: patch-ad,v 1.6 2003/02/22 04:31:07 dmcmahill Exp $ -result of running autoconf on patched configure.in - ---- configure.orig Mon Mar 26 07:10:37 2001 -+++ configure Sun Mar 3 13:19:25 2002 -@@ -991,4 +991,303 @@ - fi - -+################################################## -+## Fortran libraries required for creating fortran -+## shared libraries. In particular this is needed -+## for the lapack examples when using f2c. This -+## will set the FLIBS variable. -+################################################## -+if test -z "$F77"; then -+ for ac_prog in g77 f77 f2c -+do -+# Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:1006: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_F77'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if test -n "$F77"; then -+ ac_cv_prog_F77="$F77" # Let the user override the test. -+else -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_prog_F77="$ac_prog" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+fi -+fi -+F77="$ac_cv_prog_F77" -+if test -n "$F77"; then -+ echo "$ac_t""$F77" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+test -n "$F77" && break -+done -+ -+ test -z "$F77" && { echo "configure: error: no acceptable Fortran 77 compiler found in \$PATH" 1>&2; exit 1; } -+fi -+ -+echo $ac_n "checking whether the Fortran 77 compiler ($F77 $FFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -+echo "configure:1039: checking whether the Fortran 77 compiler ($F77 $FFLAGS $LDFLAGS) works" >&5 -+ -+ac_ext=f -+ac_compile='${F77-f77} -c $FFLAGS conftest.$ac_ext 1>&5' -+ac_link='${F77-f77} -o conftest${ac_exeext} $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_f77_cross -+ -+cat > conftest.$ac_ext << EOF -+ -+ program conftest -+ end -+ -+EOF -+if { (eval echo configure:1052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ ac_cv_prog_f77_works=yes -+ # If we can't run a trivial program, we are probably using a cross compiler. -+ if (./conftest; exit) 2>/dev/null; then -+ ac_cv_prog_f77_cross=no -+ else -+ ac_cv_prog_f77_cross=yes -+ fi -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ ac_cv_prog_f77_works=no -+fi -+rm -fr conftest* -+ac_ext=c -+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+cross_compiling=$ac_cv_prog_cc_cross -+ -+echo "$ac_t""$ac_cv_prog_f77_works" 1>&6 -+if test $ac_cv_prog_f77_works = no; then -+ { echo "configure: error: installation or configuration problem: Fortran 77 compiler cannot create executables." 1>&2; exit 1; } -+fi -+echo $ac_n "checking whether the Fortran 77 compiler ($F77 $FFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -+echo "configure:1078: checking whether the Fortran 77 compiler ($F77 $FFLAGS $LDFLAGS) is a cross-compiler" >&5 -+echo "$ac_t""$ac_cv_prog_f77_cross" 1>&6 -+cross_compiling=$ac_cv_prog_f77_cross -+ -+echo $ac_n "checking whether we are using GNU Fortran 77""... $ac_c" 1>&6 -+echo "configure:1083: checking whether we are using GNU Fortran 77" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_g77'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.fpp <<EOF -+#ifdef __GNUC__ -+ yes -+#endif -+EOF -+if { ac_try='$F77 -E conftest.fpp'; { (eval echo configure:1092: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then -+ ac_cv_prog_g77=yes -+else -+ ac_cv_prog_g77=no -+fi -+fi -+ -+echo "$ac_t""$ac_cv_prog_g77" 1>&6 -+ -+if test $ac_cv_prog_g77 = yes; then -+ G77=yes -+ ac_test_FFLAGS="${FFLAGS+set}" -+ ac_save_FFLAGS="$FFLAGS" -+ FFLAGS= -+ echo $ac_n "checking whether $F77 accepts -g""... $ac_c" 1>&6 -+echo "configure:1107: checking whether $F77 accepts -g" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_f77_g'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.f << EOF -+ program conftest -+ end -+EOF -+if test -z "`$F77 -g -c conftest.f 2>&1`"; then -+ ac_cv_prog_f77_g=yes -+else -+ ac_cv_prog_f77_g=no -+fi -+rm -f conftest* -+ -+fi -+ -+echo "$ac_t""$ac_cv_prog_f77_g" 1>&6 -+ if test "$ac_test_FFLAGS" = set; then -+ FFLAGS="$ac_save_FFLAGS" -+ elif test $ac_cv_prog_f77_g = yes; then -+ FFLAGS="-g -O2" -+ else -+ FFLAGS="-O2" -+ fi -+else -+ G77= -+ test "${FFLAGS+set}" = set || FFLAGS="-g" -+fi -+ -+echo $ac_n "checking for Fortran 77 libraries""... $ac_c" 1>&6 -+echo "configure:1138: checking for Fortran 77 libraries" >&5 -+ -+ -+if eval "test \"`echo '$''{'ac_cv_flibs'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ echo " END" > conftest.f -+foutput=`${F77} -v -o conftest conftest.f 2>&1` -+xlf_p=`echo $foutput | grep xlfentry` -+if test -n "$xlf_p"; then -+ foutput=`echo $foutput | sed 's/,/ /g'` -+fi -+ld_run_path=`echo $foutput | \ -+ sed -n -e 's/^.*LD_RUN_PATH *= *\([^ ]*\).*/\1/p'` -+case "$ld_run_path" in -+ /*) -+ if test "$ac_cv_prog_gcc" = yes; then -+ ld_run_path="-Xlinker -R -Xlinker $ld_run_path" -+ else -+ ld_run_path="-R $ld_run_path" -+ fi -+ ;; -+ *) -+ ld_run_path= -+ ;; -+esac -+flibs= -+lflags= -+want_arg= -+for arg in $foutput; do -+ old_want_arg=$want_arg -+ want_arg= -+ if test -n "$old_want_arg"; then -+ case "$arg" in -+ -*) -+ old_want_arg= -+ ;; -+ esac -+ fi -+ case "$old_want_arg" in -+ '') -+ case $arg in -+ /*.a) -+ exists=false -+ for f in $lflags; do -+ if test x$arg = x$f; then -+ exists=true -+ fi -+ done -+ if $exists; then -+ arg= -+ else -+ lflags="$lflags $arg" -+ fi -+ ;; -+ -bI:*) -+ exists=false -+ for f in $lflags; do -+ if test x$arg = x$f; then -+ exists=true -+ fi -+ done -+ if $exists; then -+ arg= -+ else -+ if test "$ac_cv_prog_gcc" = yes; then -+ lflags="$lflags -Xlinker $arg" -+ else -+ lflags="$lflags $arg" -+ fi -+ fi -+ ;; -+ -lang* | -lcrt0.o | -lc | -lgcc) -+ arg= -+ ;; -+ -[lLR]) -+ want_arg=$arg -+ arg= -+ ;; -+ -[lLR]*) -+ exists=false -+ for f in $lflags; do -+ if test x$arg = x$f; then -+ exists=true -+ fi -+ done -+ if $exists; then -+ arg= -+ else -+ case "$arg" in -+ -lkernel32) -+ case "$canonical_host_type" in -+ *-*-cygwin*) -+ arg= -+ ;; -+ *) -+ lflags="$lflags $arg" -+ ;; -+ esac -+ ;; -+ -lm) -+ ;; -+ *) -+ lflags="$lflags $arg" -+ ;; -+ esac -+ fi -+ ;; -+ -u) -+ want_arg=$arg -+ arg= -+ ;; -+ -Y) -+ want_arg=$arg -+ arg= -+ ;; -+ *) -+ arg= -+ ;; -+ esac -+ ;; -+ -[lLR]) -+ arg="$old_want_arg $arg" -+ ;; -+ -u) -+ arg="-u $arg" -+ ;; -+ -Y) -+ arg=`echo $arg | sed -e 's%^P,%%'` -+ SAVE_IFS=$IFS -+ IFS=: -+ list= -+ for elt in $arg; do -+ list="$list -L$elt" -+ done -+ IFS=$SAVE_IFS -+ arg="$list" -+ ;; -+ esac -+ if test -n "$arg"; then -+ flibs="$flibs $arg" -+ fi -+done -+if test -n "$ld_run_path"; then -+ flibs_result="$ld_run_path $flibs" -+else -+ flibs_result="$flibs" -+fi -+ac_cv_flibs="$flibs_result" -+fi -+ -+FLIBS="$ac_cv_flibs" -+echo "$ac_t""$FLIBS" 1>&6 -+ -+ - ############################################# - ## Compilers and options according to machine -@@ -1055,5 +1354,5 @@ - set dummy f77; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1058: checking for $ac_word" >&5 -+echo "configure:1357: 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,5 +1424,5 @@ - set dummy f77; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1128: checking for $ac_word" >&5 -+echo "configure:1427: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_F77'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -1195,5 +1494,5 @@ - set dummy f77; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1198: checking for $ac_word" >&5 -+echo "configure:1497: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_F77'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -1258,5 +1557,5 @@ - LIEEELIB= - echo $ac_n "checking for main in -lieee""... $ac_c" 1>&6 --echo "configure:1261: checking for main in -lieee" >&5 -+echo "configure:1560: 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 -@@ -1266,5 +1565,5 @@ - LIBS="-lieee $LIBS" - cat > conftest.$ac_ext <<EOF --#line 1269 "configure" -+#line 1568 "configure" - #include "confdefs.h" - -@@ -1273,5 +1572,5 @@ - ; return 0; } - EOF --if { (eval echo configure:1276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1575: \"$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" -@@ -1306,5 +1605,5 @@ - set dummy f2c; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1309: checking for $ac_word" >&5 -+echo "configure:1608: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_F2C'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -1343,5 +1642,5 @@ - set dummy g77; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1346: checking for $ac_word" >&5 -+echo "configure:1645: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_G77'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -1377,5 +1676,5 @@ - set dummy f2c; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1380: checking for $ac_word" >&5 -+echo "configure:1679: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_F2C'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -1434,5 +1733,5 @@ - set dummy f77; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1437: checking for $ac_word" >&5 -+echo "configure:1736: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_F77'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -1507,5 +1806,5 @@ - set dummy f77; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1510: checking for $ac_word" >&5 -+echo "configure:1809: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_F77'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -1571,5 +1870,5 @@ - LIEEELIB= - echo $ac_n "checking for main in -lieee""... $ac_c" 1>&6 --echo "configure:1574: checking for main in -lieee" >&5 -+echo "configure:1873: 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 -@@ -1579,5 +1878,5 @@ - LIBS="-lieee $LIBS" - cat > conftest.$ac_ext <<EOF --#line 1582 "configure" -+#line 1881 "configure" - #include "confdefs.h" - -@@ -1586,5 +1885,5 @@ - ; return 0; } - EOF --if { (eval echo configure:1589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1888: \"$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" -@@ -1619,5 +1918,5 @@ - set dummy f2c; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1622: checking for $ac_word" >&5 -+echo "configure:1921: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_F2C'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -1656,5 +1955,5 @@ - set dummy g77; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1659: checking for $ac_word" >&5 -+echo "configure:1958: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_G77'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -1690,5 +1989,5 @@ - set dummy f2c; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1693: checking for $ac_word" >&5 -+echo "configure:1992: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_F2C'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -1742,5 +2041,5 @@ - LIEEELIB= - echo $ac_n "checking for main in -lieee""... $ac_c" 1>&6 --echo "configure:1745: checking for main in -lieee" >&5 -+echo "configure:2044: 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 -@@ -1750,5 +2049,5 @@ - LIBS="-lieee $LIBS" - cat > conftest.$ac_ext <<EOF --#line 1753 "configure" -+#line 2052 "configure" - #include "confdefs.h" - -@@ -1757,5 +2056,5 @@ - ; return 0; } - EOF --if { (eval echo configure:1760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2059: \"$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" -@@ -1790,5 +2089,5 @@ - set dummy f2c; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1793: checking for $ac_word" >&5 -+echo "configure:2092: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_F2C'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -1827,5 +2126,5 @@ - set dummy g77; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1830: checking for $ac_word" >&5 -+echo "configure:2129: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_G77'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -1861,5 +2160,5 @@ - set dummy f2c; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1864: checking for $ac_word" >&5 -+echo "configure:2163: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_F2C'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -1924,5 +2223,5 @@ - set dummy f2c; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1927: checking for $ac_word" >&5 -+echo "configure:2226: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_F2C'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -1961,5 +2260,5 @@ - set dummy g77; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1964: checking for $ac_word" >&5 -+echo "configure:2263: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_G77'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -1995,5 +2294,5 @@ - set dummy f2c; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1998: checking for $ac_word" >&5 -+echo "configure:2297: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_F2C'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -2045,5 +2344,5 @@ - LIEEELIB= - echo $ac_n "checking for main in -lieee""... $ac_c" 1>&6 --echo "configure:2048: checking for main in -lieee" >&5 -+echo "configure:2347: 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 -@@ -2053,5 +2352,5 @@ - LIBS="-lieee $LIBS" - cat > conftest.$ac_ext <<EOF --#line 2056 "configure" -+#line 2355 "configure" - #include "confdefs.h" - -@@ -2060,5 +2359,5 @@ - ; return 0; } - EOF --if { (eval echo configure:2063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2362: \"$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" -@@ -2094,5 +2393,5 @@ - set dummy f2c; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2097: checking for $ac_word" >&5 -+echo "configure:2396: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_F2C'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -2131,5 +2430,5 @@ - set dummy g77; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2134: checking for $ac_word" >&5 -+echo "configure:2433: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_G77'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -2165,5 +2464,5 @@ - set dummy f2c; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2168: checking for $ac_word" >&5 -+echo "configure:2467: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_F2C'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -2222,5 +2521,5 @@ - set dummy f77; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2225: checking for $ac_word" >&5 -+echo "configure:2524: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_F77'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -2292,5 +2591,5 @@ - set dummy f77; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2295: checking for $ac_word" >&5 -+echo "configure:2594: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_F77'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -2362,5 +2661,5 @@ - set dummy fort77; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2365: checking for $ac_word" >&5 -+echo "configure:2664: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_F77'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -2432,5 +2731,5 @@ - set dummy fort77; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2435: checking for $ac_word" >&5 -+echo "configure:2734: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_F77'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -2558,7 +2857,7 @@ - # C Compiler - # -- CC=cc -- CC_OPTIONS='-O2 -Dnetbsd' -- CC_LDFLAGS="-Wl,-R${X11BASE}/lib" -+ CC="${CC}" -+ CC_OPTIONS="${CFLAGS} -Dnetbsd" -+ CC_LDFLAGS="${LDFLAGS} -Wl,-R${X11BASE}/lib" - CC_PICFLAGS='-fPIC' - # check for --export-dynamic -@@ -2566,7 +2865,7 @@ - LDFLAGS='-Wl,--export-dynamic' - echo $ac_n "checking if the linker accepts --export-dynamic""... $ac_c" 1>&6 --echo "configure:2569: checking if the linker accepts --export-dynamic" >&5 -+echo "configure:2868: checking if the linker accepts --export-dynamic" >&5 - cat > conftest.$ac_ext <<EOF --#line 2571 "configure" -+#line 2870 "configure" - #include "confdefs.h" - -@@ -2575,5 +2874,5 @@ - ; return 0; } - EOF --if { (eval echo configure:2578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - echo "$ac_t""yes" 1>&6 -@@ -2596,5 +2895,5 @@ - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2599: checking for $ac_word" >&5 -+echo "configure:2898: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_F77'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -2635,5 +2934,5 @@ - set dummy $ac_prog; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2638: checking for $ac_word" >&5 -+echo "configure:2937: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_F77'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -2670,7 +2969,7 @@ - fi - FC="$F77" -- FC_OPTIONS='-O2' -+ FC_OPTIONS="${FFLAGS}" - FC_OPTIONS_O0= -- FC_LDFLAGS="-Wl,-R${X11BASE}/lib" -+ FC_LDFLAGS="${LDFLAGS} -Wl,-R${X11BASE}/lib" - FC_PICFLAGS='-fPIC' - # check for --export-dynamic -@@ -2678,7 +2977,7 @@ - LDFLAGS='-Wl,--export-dynamic' - echo $ac_n "checking if the linker accepts --export-dynamic""... $ac_c" 1>&6 --echo "configure:2681: checking if the linker accepts --export-dynamic" >&5 -+echo "configure:2980: checking if the linker accepts --export-dynamic" >&5 - cat > conftest.$ac_ext <<EOF --#line 2683 "configure" -+#line 2982 "configure" - #include "confdefs.h" - -@@ -2687,5 +2986,5 @@ - ; return 0; } - EOF --if { (eval echo configure:2690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - echo "$ac_t""yes" 1>&6 -@@ -2708,7 +3007,7 @@ - LDFLAGS='-Wl,--export-dynamic' - echo $ac_n "checking if the linker accepts --export-dynamic""... $ac_c" 1>&6 --echo "configure:2711: checking if the linker accepts --export-dynamic" >&5 -+echo "configure:3010: checking if the linker accepts --export-dynamic" >&5 - cat > conftest.$ac_ext <<EOF --#line 2713 "configure" -+#line 3012 "configure" - #include "confdefs.h" - -@@ -2717,5 +3016,5 @@ - ; return 0; } - EOF --if { (eval echo configure:2720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - echo "$ac_t""yes" 1>&6 -@@ -2776,5 +3075,5 @@ - set dummy ranlib; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:2779: checking for $ac_word" >&5 -+echo "configure:3078: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -2810,5 +3109,5 @@ - if test "$PERIFILE" = periX11.o; then - echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 --echo "configure:2813: checking how to run the C preprocessor" >&5 -+echo "configure:3112: checking how to run the C preprocessor" >&5 - # On Suns, sometimes $CPP names a directory. - if test -n "$CPP" && test -d "$CPP"; then -@@ -2825,5 +3124,5 @@ - # not just through cpp. - cat > conftest.$ac_ext <<EOF --#line 2828 "configure" -+#line 3127 "configure" - #include "confdefs.h" - #include <assert.h> -@@ -2831,5 +3130,5 @@ - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:2834: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:3133: \"$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 -@@ -2842,5 +3141,5 @@ - CPP="${CC-cc} -E -traditional-cpp" - cat > conftest.$ac_ext <<EOF --#line 2845 "configure" -+#line 3144 "configure" - #include "confdefs.h" - #include <assert.h> -@@ -2848,5 +3147,5 @@ - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:2851: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:3150: \"$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 -@@ -2859,5 +3158,5 @@ - CPP="${CC-cc} -nologo -E" - cat > conftest.$ac_ext <<EOF --#line 2862 "configure" -+#line 3161 "configure" - #include "confdefs.h" - #include <assert.h> -@@ -2865,5 +3164,5 @@ - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:2868: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:3167: \"$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 -@@ -2894,5 +3193,5 @@ - # --without-x overrides everything else, but does not touch the cache. - echo $ac_n "checking for X""... $ac_c" 1>&6 --echo "configure:2897: checking for X" >&5 -+echo "configure:3196: checking for X" >&5 - - # Check whether --with-x or --without-x was given. -@@ -2956,10 +3255,10 @@ - # First, try using that file with no special directory specified. - cat > conftest.$ac_ext <<EOF --#line 2959 "configure" -+#line 3258 "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:2964: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:3263: \"$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 -@@ -3030,5 +3329,5 @@ - LIBS="-l$x_direct_test_library $LIBS" - cat > conftest.$ac_ext <<EOF --#line 3033 "configure" -+#line 3332 "configure" - #include "confdefs.h" - -@@ -3037,5 +3336,5 @@ - ; return 0; } - EOF --if { (eval echo configure:3040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - LIBS="$ac_save_LIBS" -@@ -3143,8 +3442,8 @@ - "SunOS 5"*) - echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 --echo "configure:3146: checking whether -R must be followed by a space" >&5 -+echo "configure:3445: 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 3149 "configure" -+#line 3448 "configure" - #include "confdefs.h" - -@@ -3153,5 +3452,5 @@ - ; return 0; } - EOF --if { (eval echo configure:3156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_R_nospace=yes -@@ -3169,5 +3468,5 @@ - LIBS="$ac_xsave_LIBS -R $x_libraries" - cat > conftest.$ac_ext <<EOF --#line 3172 "configure" -+#line 3471 "configure" - #include "confdefs.h" - -@@ -3176,5 +3475,5 @@ - ; return 0; } - EOF --if { (eval echo configure:3179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_R_space=yes -@@ -3208,5 +3507,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:3211: checking for dnet_ntoa in -ldnet" >&5 -+echo "configure:3510: 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 -@@ -3216,5 +3515,5 @@ - LIBS="-ldnet $LIBS" - cat > conftest.$ac_ext <<EOF --#line 3219 "configure" -+#line 3518 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -3227,5 +3526,5 @@ - ; return 0; } - EOF --if { (eval echo configure:3230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3529: \"$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" -@@ -3249,5 +3548,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:3252: checking for dnet_ntoa in -ldnet_stub" >&5 -+echo "configure:3551: 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 -@@ -3257,5 +3556,5 @@ - LIBS="-ldnet_stub $LIBS" - cat > conftest.$ac_ext <<EOF --#line 3260 "configure" -+#line 3559 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -3268,5 +3567,5 @@ - ; return 0; } - EOF --if { (eval echo configure:3271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3570: \"$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" -@@ -3297,10 +3596,10 @@ - # on Irix 5.2, according to dickey@clark.net. - echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 --echo "configure:3300: checking for gethostbyname" >&5 -+echo "configure:3599: 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 3305 "configure" -+#line 3604 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, -@@ -3325,5 +3624,5 @@ - ; return 0; } - EOF --if { (eval echo configure:3328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_gethostbyname=yes" -@@ -3346,5 +3645,5 @@ - if test $ac_cv_func_gethostbyname = no; then - echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 --echo "configure:3349: checking for gethostbyname in -lnsl" >&5 -+echo "configure:3648: 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 -@@ -3354,5 +3653,5 @@ - LIBS="-lnsl $LIBS" - cat > conftest.$ac_ext <<EOF --#line 3357 "configure" -+#line 3656 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -3365,5 +3664,5 @@ - ; return 0; } - EOF --if { (eval echo configure:3368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3667: \"$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" -@@ -3395,10 +3694,10 @@ - # We assume that if connect needs -lnsl, so does gethostbyname. - echo $ac_n "checking for connect""... $ac_c" 1>&6 --echo "configure:3398: checking for connect" >&5 -+echo "configure:3697: 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 3403 "configure" -+#line 3702 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, -@@ -3423,5 +3722,5 @@ - ; return 0; } - EOF --if { (eval echo configure:3426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_connect=yes" -@@ -3444,5 +3743,5 @@ - if test $ac_cv_func_connect = no; then - echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 --echo "configure:3447: checking for connect in -lsocket" >&5 -+echo "configure:3746: 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 -@@ -3452,5 +3751,5 @@ - LIBS="-lsocket $X_EXTRA_LIBS $LIBS" - cat > conftest.$ac_ext <<EOF --#line 3455 "configure" -+#line 3754 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -3463,5 +3762,5 @@ - ; return 0; } - EOF --if { (eval echo configure:3466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3765: \"$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" -@@ -3487,10 +3786,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:3490: checking for remove" >&5 -+echo "configure:3789: 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 3495 "configure" -+#line 3794 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, -@@ -3515,5 +3814,5 @@ - ; return 0; } - EOF --if { (eval echo configure:3518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_remove=yes" -@@ -3536,5 +3835,5 @@ - if test $ac_cv_func_remove = no; then - echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 --echo "configure:3539: checking for remove in -lposix" >&5 -+echo "configure:3838: 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 -@@ -3544,5 +3843,5 @@ - LIBS="-lposix $LIBS" - cat > conftest.$ac_ext <<EOF --#line 3547 "configure" -+#line 3846 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -3555,5 +3854,5 @@ - ; return 0; } - EOF --if { (eval echo configure:3558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3857: \"$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" -@@ -3579,10 +3878,10 @@ - # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - echo $ac_n "checking for shmat""... $ac_c" 1>&6 --echo "configure:3582: checking for shmat" >&5 -+echo "configure:3881: 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 3587 "configure" -+#line 3886 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, -@@ -3607,5 +3906,5 @@ - ; return 0; } - EOF --if { (eval echo configure:3610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_shmat=yes" -@@ -3628,5 +3927,5 @@ - if test $ac_cv_func_shmat = no; then - echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 --echo "configure:3631: checking for shmat in -lipc" >&5 -+echo "configure:3930: 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 -@@ -3636,5 +3935,5 @@ - LIBS="-lipc $LIBS" - cat > conftest.$ac_ext <<EOF --#line 3639 "configure" -+#line 3938 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -3647,5 +3946,5 @@ - ; return 0; } - EOF --if { (eval echo configure:3650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3949: \"$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" -@@ -3680,5 +3979,5 @@ - # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. - echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 --echo "configure:3683: checking for IceConnectionNumber in -lICE" >&5 -+echo "configure:3982: 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 -@@ -3688,5 +3987,5 @@ - LIBS="-lICE $X_EXTRA_LIBS $LIBS" - cat > conftest.$ac_ext <<EOF --#line 3691 "configure" -+#line 3990 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -3699,5 +3998,5 @@ - ; return 0; } - EOF --if { (eval echo configure:3702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4001: \"$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" -@@ -3740,5 +4039,5 @@ - if test "$PERIFILE" = periX11.o; then - echo $ac_n "checking "for X11 release"""... $ac_c" 1>&6 --echo "configure:3743: checking "for X11 release"" >&5 -+echo "configure:4042: checking "for X11 release"" >&5 - if eval "test \"`echo '$''{'ac_cv_X11_release'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -3793,5 +4092,5 @@ - fi - echo $ac_n "checking for main in -lXmu""... $ac_c" 1>&6 --echo "configure:3796: checking for main in -lXmu" >&5 -+echo "configure:4095: 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 -@@ -3801,5 +4100,5 @@ - LIBS="-lXmu -lXt -lXext $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS" - cat > conftest.$ac_ext <<EOF --#line 3804 "configure" -+#line 4103 "configure" - #include "confdefs.h" - -@@ -3808,5 +4107,5 @@ - ; return 0; } - EOF --if { (eval echo configure:3811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4110: \"$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" -@@ -3831,5 +4130,5 @@ - if test "$with_xaw3d" = yes; then - echo $ac_n "checking for main in -lXaw3d""... $ac_c" 1>&6 --echo "configure:3834: checking for main in -lXaw3d" >&5 -+echo "configure:4133: checking for main in -lXaw3d" >&5 - ac_lib_var=`echo Xaw3d'_'main | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -@@ -3839,5 +4138,5 @@ - LIBS="-lXaw3d -lXmu -lXt -lXext $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS" - cat > conftest.$ac_ext <<EOF --#line 3842 "configure" -+#line 4141 "configure" - #include "confdefs.h" - -@@ -3846,5 +4145,5 @@ - ; return 0; } - EOF --if { (eval echo configure:3849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4148: \"$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" -@@ -3875,5 +4174,5 @@ - else - echo $ac_n "checking for main in -lXaw""... $ac_c" 1>&6 --echo "configure:3878: checking for main in -lXaw" >&5 -+echo "configure:4177: 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 -@@ -3883,5 +4182,5 @@ - LIBS="-lXaw -lXmu -lXt -lXext $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS" - cat > conftest.$ac_ext <<EOF --#line 3886 "configure" -+#line 4185 "configure" - #include "confdefs.h" - -@@ -3890,5 +4189,5 @@ - ; return 0; } - EOF --if { (eval echo configure:3893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4192: \"$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" -@@ -3943,5 +4242,5 @@ - CFLAGS=$X_CFLAGS - cat > conftest.$ac_ext <<EOF --#line 3946 "configure" -+#line 4245 "configure" - #include "confdefs.h" - #include <X11/IntrinsicP.h> -@@ -3951,5 +4250,5 @@ - ; return 0; } - EOF --if { (eval echo configure:3954: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:4253: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - : - else -@@ -3969,5 +4268,5 @@ - - echo $ac_n "checking "for leading and/or trailing underscores"""... $ac_c" 1>&6 --echo "configure:3972: checking "for leading and/or trailing underscores"" >&5 -+echo "configure:4271: checking "for leading and/or trailing underscores"" >&5 - cat << EOF > pipof.f - subroutine pipof -@@ -4021,7 +4320,7 @@ - - echo $ac_n "checking "for use of sharpsign in CPP"""... $ac_c" 1>&6 --echo "configure:4024: checking "for use of sharpsign in CPP"" >&5 -+echo "configure:4323: checking "for use of sharpsign in CPP"" >&5 - cat > conftest.$ac_ext <<EOF --#line 4026 "configure" -+#line 4325 "configure" - #include "confdefs.h" - #define C2F(name) name##_ -@@ -4030,5 +4329,5 @@ - ; return 0; } - EOF --if { (eval echo configure:4033: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:4332: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - echo "$ac_t""yes" 1>&6 -@@ -4050,5 +4349,5 @@ - - echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 --echo "configure:4053: checking for main in -lm" >&5 -+echo "configure:4352: 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 -@@ -4058,5 +4357,5 @@ - LIBS="-lm $LIBS" - cat > conftest.$ac_ext <<EOF --#line 4061 "configure" -+#line 4360 "configure" - #include "confdefs.h" - -@@ -4065,5 +4364,5 @@ - ; return 0; } - EOF --if { (eval echo configure:4068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4367: \"$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" -@@ -4095,10 +4394,10 @@ - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:4098: checking for $ac_func" >&5 -+echo "configure:4397: 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 4103 "configure" -+#line 4402 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, -@@ -4123,5 +4422,5 @@ - ; return 0; } - EOF --if { (eval echo configure:4126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4425: \"$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" -@@ -4150,10 +4449,10 @@ - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:4153: checking for $ac_func" >&5 -+echo "configure:4452: 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 4158 "configure" -+#line 4457 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, -@@ -4178,5 +4477,5 @@ - ; return 0; } - EOF --if { (eval echo configure:4181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4480: \"$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" -@@ -4205,10 +4504,10 @@ - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:4208: checking for $ac_func" >&5 -+echo "configure:4507: 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 4213 "configure" -+#line 4512 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, -@@ -4233,5 +4532,5 @@ - ; return 0; } - EOF --if { (eval echo configure:4236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4535: \"$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" -@@ -4260,10 +4559,10 @@ - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:4263: checking for $ac_func" >&5 -+echo "configure:4562: 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 4268 "configure" -+#line 4567 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, -@@ -4288,5 +4587,5 @@ - ; return 0; } - EOF --if { (eval echo configure:4291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4590: \"$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" -@@ -4315,10 +4614,10 @@ - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:4318: checking for $ac_func" >&5 -+echo "configure:4617: 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 4323 "configure" -+#line 4622 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, -@@ -4343,5 +4642,5 @@ - ; return 0; } - EOF --if { (eval echo configure:4346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4645: \"$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" -@@ -4370,10 +4669,10 @@ - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:4373: checking for $ac_func" >&5 -+echo "configure:4672: 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 4378 "configure" -+#line 4677 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, -@@ -4398,5 +4697,5 @@ - ; return 0; } - EOF --if { (eval echo configure:4401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4700: \"$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" -@@ -4431,15 +4730,15 @@ - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:4434: checking for $ac_hdr" >&5 -+echo "configure:4733: 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 4439 "configure" -+#line 4738 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:4444: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:4743: \"$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 -@@ -4474,5 +4773,5 @@ - TERMCAPLIB=no - echo $ac_n "checking for main in -ltermcap""... $ac_c" 1>&6 --echo "configure:4477: checking for main in -ltermcap" >&5 -+echo "configure:4776: 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 -@@ -4482,5 +4781,5 @@ - LIBS="-ltermcap $LIBS" - cat > conftest.$ac_ext <<EOF --#line 4485 "configure" -+#line 4784 "configure" - #include "confdefs.h" - -@@ -4489,5 +4788,5 @@ - ; return 0; } - EOF --if { (eval echo configure:4492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4791: \"$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" -@@ -4511,5 +4810,5 @@ - if test "$TERMCAPLIB" = no; then - echo $ac_n "checking for main in -ltermlib""... $ac_c" 1>&6 --echo "configure:4514: checking for main in -ltermlib" >&5 -+echo "configure:4813: 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 -@@ -4519,5 +4818,5 @@ - LIBS="-ltermlib $LIBS" - cat > conftest.$ac_ext <<EOF --#line 4522 "configure" -+#line 4821 "configure" - #include "confdefs.h" - -@@ -4526,5 +4825,5 @@ - ; return 0; } - EOF --if { (eval echo configure:4529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4828: \"$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" -@@ -4549,5 +4848,5 @@ - if test "$TERMCAPLIB" = no; then - echo $ac_n "checking for main in -lcurses""... $ac_c" 1>&6 --echo "configure:4552: checking for main in -lcurses" >&5 -+echo "configure:4851: 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 -@@ -4557,5 +4856,5 @@ - LIBS="-lcurses $LIBS" - cat > conftest.$ac_ext <<EOF --#line 4560 "configure" -+#line 4859 "configure" - #include "confdefs.h" - -@@ -4564,5 +4863,5 @@ - ; return 0; } - EOF --if { (eval echo configure:4567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4866: \"$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" -@@ -4617,5 +4916,5 @@ - - echo $ac_n "checking "for PVM architecture"""... $ac_c" 1>&6 --echo "configure:4620: checking "for PVM architecture"" >&5 -+echo "configure:4919: checking "for PVM architecture"" >&5 - if eval "test \"`echo '$''{'ac_cv_PVM_arch'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4696,5 +4995,5 @@ - - echo $ac_n "checking for main in -ldl""... $ac_c" 1>&6 --echo "configure:4699: checking for main in -ldl" >&5 -+echo "configure:4998: 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 -@@ -4704,5 +5003,5 @@ - LIBS="-ldl $LIBS" - cat > conftest.$ac_ext <<EOF --#line 4707 "configure" -+#line 5006 "configure" - #include "confdefs.h" - -@@ -4711,5 +5010,5 @@ - ; return 0; } - EOF --if { (eval echo configure:4714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5013: \"$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" -@@ -4752,5 +5051,5 @@ - echo $ac_n " testing version (need $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later)... " $ac_c - cat > conftest.$ac_ext <<EOF --#line 4755 "configure" -+#line 5054 "configure" - #include "confdefs.h" - -@@ -4843,5 +5142,5 @@ - if test "$USER_TCL_LIB_PATH" = "" - then echo $ac_n "checking for Tcl_DoOneEvent in -lm""... $ac_c" 1>&6 --echo "configure:4846: checking for Tcl_DoOneEvent in -lm" >&5 -+echo "configure:5145: 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 -@@ -4851,5 +5150,5 @@ - LIBS="-lm -l$NAME_LIB_TCL $X_LIBS $X_EXTRA_LIBS $TCLTK_LIBS $LIBS" - cat > conftest.$ac_ext <<EOF --#line 4854 "configure" -+#line 5153 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -4862,5 +5161,5 @@ - ; return 0; } - EOF --if { (eval echo configure:4865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5164: \"$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" -@@ -4884,5 +5183,5 @@ - - else echo $ac_n "checking for Tcl_DoOneEvent in -lm""... $ac_c" 1>&6 --echo "configure:4887: checking for Tcl_DoOneEvent in -lm" >&5 -+echo "configure:5186: 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 -@@ -4892,5 +5191,5 @@ - LIBS="-lm -L$USER_TCL_LIB_PATH -l$NAME_LIB_TCL $X_LIBS $X_EXTRA_LIBS $TCLTK_LIBS $LIBS" - cat > conftest.$ac_ext <<EOF --#line 4895 "configure" -+#line 5194 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -4903,5 +5202,5 @@ - ; return 0; } - EOF --if { (eval echo configure:4906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5205: \"$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" -@@ -4971,5 +5270,5 @@ - echo $ac_n " testing version (need $CHK_TK_MAJOR.$CHK_TK_MINOR or later)... " $ac_c - cat > conftest.$ac_ext <<EOF --#line 4974 "configure" -+#line 5273 "configure" - #include "confdefs.h" - -@@ -5057,5 +5356,5 @@ - if test "$USER_TK_LIB_PATH" = "" - then echo $ac_n "checking for Tk_BindEvent in -lm""... $ac_c" 1>&6 --echo "configure:5060: checking for Tk_BindEvent in -lm" >&5 -+echo "configure:5359: 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 -@@ -5065,5 +5364,5 @@ - LIBS="-lm -l$NAME_LIB_TK -lX11 $X_LIBS $X_EXTRA_LIBS $TCLTK_LIBS $LIBS" - cat > conftest.$ac_ext <<EOF --#line 5068 "configure" -+#line 5367 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -5076,5 +5375,5 @@ - ; return 0; } - EOF --if { (eval echo configure:5079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5378: \"$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" -@@ -5098,5 +5397,5 @@ - - else echo $ac_n "checking for Tk_BindEvent in -lm""... $ac_c" 1>&6 --echo "configure:5101: checking for Tk_BindEvent in -lm" >&5 -+echo "configure:5400: 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 -@@ -5106,5 +5405,5 @@ - LIBS="-lm -L$USER_TK_LIB_PATH -l$NAME_LIB_TK -lX11 $X_LIBS $X_EXTRA_LIBS $TCLTK_LIBS $LIBS" - cat > conftest.$ac_ext <<EOF --#line 5109 "configure" -+#line 5408 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -5117,5 +5416,5 @@ - ; return 0; } - EOF --if { (eval echo configure:5120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5419: \"$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" -@@ -5261,5 +5560,5 @@ - - echo $ac_n "checking build system type""... $ac_c" 1>&6 --echo "configure:5264: checking build system type" >&5 -+echo "configure:5563: checking build system type" >&5 - - build_alias=$build -@@ -5281,5 +5580,5 @@ - set dummy gcc; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:5284: checking for $ac_word" >&5 -+echo "configure:5583: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -5311,5 +5610,5 @@ - set dummy cc; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:5314: checking for $ac_word" >&5 -+echo "configure:5613: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -5362,5 +5661,5 @@ - set dummy cl; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:5365: checking for $ac_word" >&5 -+echo "configure:5664: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -5394,5 +5693,5 @@ - - echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 --echo "configure:5397: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 -+echo "configure:5696: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 - - ac_ext=c -@@ -5405,10 +5704,10 @@ - cat > conftest.$ac_ext << EOF - --#line 5408 "configure" -+#line 5707 "configure" - #include "confdefs.h" - - main(){return(0);} - EOF --if { (eval echo configure:5413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:5712: \"$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. -@@ -5436,10 +5735,10 @@ - fi - echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 --echo "configure:5439: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 -+echo "configure:5738: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 - echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 - cross_compiling=$ac_cv_prog_cc_cross - - echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 --echo "configure:5444: checking whether we are using GNU C" >&5 -+echo "configure:5743: 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 -@@ -5450,5 +5749,5 @@ - #endif - EOF --if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:5453: \"$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:5752: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then - ac_cv_prog_gcc=yes - else -@@ -5469,5 +5768,5 @@ - CFLAGS= - echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 --echo "configure:5472: checking whether ${CC-cc} accepts -g" >&5 -+echo "configure:5771: 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 -@@ -5512,5 +5811,5 @@ - # Check if gcc -print-prog-name=ld gives a path. - echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 --echo "configure:5515: checking for ld used by GCC" >&5 -+echo "configure:5814: checking for ld used by GCC" >&5 - ac_prog=`($CC -print-prog-name=ld) 2>&5` - case "$ac_prog" in -@@ -5536,8 +5835,8 @@ - elif test "$with_gnu_ld" = yes; then - echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 --echo "configure:5539: checking for GNU ld" >&5 -+echo "configure:5838: checking for GNU ld" >&5 - else - echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 --echo "configure:5542: checking for non-GNU ld" >&5 -+echo "configure:5841: checking for non-GNU ld" >&5 - fi - if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then -@@ -5575,5 +5874,5 @@ - - echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 --echo "configure:5578: checking if the linker ($LD) is GNU ld" >&5 -+echo "configure:5877: checking if the linker ($LD) is GNU ld" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -5591,5 +5890,5 @@ - - echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 --echo "configure:5594: checking for BSD-compatible nm" >&5 -+echo "configure:5893: checking for BSD-compatible nm" >&5 - if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -5628,5 +5927,5 @@ - - echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 --echo "configure:5631: checking whether ln -s works" >&5 -+echo "configure:5930: checking whether ln -s works" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -5672,6 +5971,6 @@ - *-*-irix6*) - # Find out which ABI we are using. -- echo '#line 5675 "configure"' > conftest.$ac_ext -- if { (eval echo configure:5676: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ echo '#line 5974 "configure"' > conftest.$ac_ext -+ if { (eval echo configure:5975: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - case "`/usr/bin/file conftest.o`" in - *32-bit*) -@@ -5694,10 +5993,10 @@ - CFLAGS="$CFLAGS -belf" - echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 --echo "configure:5697: checking whether the C compiler needs -belf" >&5 -+echo "configure:5996: checking whether the C compiler needs -belf" >&5 - if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 5702 "configure" -+#line 6001 "configure" - #include "confdefs.h" - -@@ -5706,5 +6005,5 @@ - ; return 0; } - EOF --if { (eval echo configure:5709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:6008: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - lt_cv_cc_needs_belf=yes -@@ -5885,4 +6184,5 @@ - - +--- routines/system/inisci-c.c.orig Wed Nov 27 05:02:30 2002 ++++ routines/system/inisci-c.c Fri Feb 21 06:52:05 2003 +@@ -1,2 +1,4 @@ ++#include <string.h> + - #AC_SUBST(CC) - -@@ -6029,4 +6329,5 @@ - s%@G77@%$G77%g - s%@F77@%$F77%g -+s%@FLIBS@%$FLIBS%g - s%@F2C@%$F2C%g - s%@RANLIB@%$RANLIB%g + #include "../machine.h" + #include "../sun/Sun.h" diff --git a/math/scilab/patches/patch-ae b/math/scilab/patches/patch-ae deleted file mode 100644 index ef735bab553..00000000000 --- a/math/scilab/patches/patch-ae +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-ae,v 1.4 2001/04/08 16:25:28 dmcmahill Exp $ - -libtool doesn't like either f77 or f2c-f77 without a tag. -also link in fortran libs - ---- config/Makeso.incl.in.orig Tue Mar 13 03:53:19 2001 -+++ config/Makeso.incl.in Fri Mar 30 06:10:34 2001 -@@ -19,4 +19,5 @@ - LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ -+FLIBS = @FLIBS@ - - #******************************************************************* -@@ -33,7 +34,7 @@ - - LTCOMPILE = $(LIBTOOL) --mode=compile $(QUIET) $(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) --FLTCOMPILE = $(LIBTOOL) --mode=compile $(QUIET) $(FC) $(INCLUDES) $(FFLAGS) -+FLTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(QUIET) $(FC) $(INCLUDES) $(FFLAGS) - --LINK = $(LIBTOOL) --mode=link $(QUIET) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) --mode=link $(QUIET) $(CC) $(CFLAGS) $(LDFLAGS) $(FLIBS) -o $@ - - OBJECTS = $(OBJS:.o=.lo) diff --git a/math/scilab/patches/patch-af b/math/scilab/patches/patch-af deleted file mode 100644 index 5822780206e..00000000000 --- a/math/scilab/patches/patch-af +++ /dev/null @@ -1,68 +0,0 @@ -$NetBSD: patch-af,v 1.5 2001/12/22 00:03:26 dmcmahill Exp $ - -libtool needs a tag for f77/f2c -also be sure to link the fortran libs -also allow FCTMEX to be empty. - ---- Makemex.in.orig Tue May 9 06:46:04 2000 -+++ Makemex.in Sun Apr 1 21:44:35 2001 -@@ -20,4 +20,5 @@ - LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ -+FLIBS = @FLIBS@ - - INCLUDES= -I$(SCIDIR)/routines -@@ -30,7 +31,7 @@ - - LTCOMPILE = $(LIBTOOL) --mode=compile $(QUIET) $(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) --FLTCOMPILE = $(LIBTOOL) --mode=compile $(QUIET) $(FC) $(FFLAGS) -+FLTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(QUIET) $(FC) $(FFLAGS) - --LINK = $(LIBTOOL) --mode=link $(QUIET) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) --mode=link $(QUIET) $(CC) $(CFLAGS) $(LDFLAGS) $(FLIBS) -o $@ - - OBJECTS = $(LIBRARY)_gateway.lo $(OTHEROBJECTS:.o=.lo) -@@ -85,16 +86,16 @@ - @echo "------------------------------------------"; - @echo "To load the function(s): "; -- @for i in $(FCTMEX) ;\ -+ @if test "X$(FCTMEX)" != "X"; then for i in $(FCTMEX) ;\ - do (\ - name=`dirname $$i`; \ - echo " $$name; " \ - ); \ -- done -- @for i in $(FORTRANFCTMEX) ;\ -+ done ; fi -+ @if test "X$(FORTRANFCTMEX)" != "X"; then for i in $(FORTRANFCTMEX) ;\ - do (\ - name=`dirname $$i`; \ - echo " $$name; " \ - ); \ -- done -+ done ; fi - @echo " at Scilab prompt, enter:"; - @echo "-->exec $(LIBRARY).sce"; -@@ -118,5 +119,5 @@ - - GATEWAYS: -- @for f in $(FCTMEX); \ -+ @if test "X$(FCTMEX)" != "X"; then for f in $(FCTMEX); \ - do \ - obj=`basename $$f .c`; \ -@@ -124,6 +125,6 @@ - make $$obj.o MEX=mex_$$mex ; \ - make $$obj.lo MEX=mex_$$mex ; \ -- done; -- @for f in $(FORTRANFCTMEX); \ -+ done; fi -+ @if test "X$(FORTRANFCTMEX)" != "X"; then for f in $(FORTRANFCTMEX); \ - do \ - obj=`basename $$f .F`; \ -@@ -131,5 +132,5 @@ - make $$obj.o MEX=mex$$mex ; \ - make $$obj.lo MEX=mex$$mex ; \ -- done; -+ done; fi - - .c.o: diff --git a/math/scilab/patches/patch-ag b/math/scilab/patches/patch-ag deleted file mode 100644 index b2fe6a97aaa..00000000000 --- a/math/scilab/patches/patch-ag +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-ag,v 1.5 2001/07/11 15:16:21 dmcmahill Exp $ - -fixes a bug in the fft() function where the 4th input argument was not checked, -and an improper value, like 0 or a string - e.g. fft(1:4,-1:1,0) -, -crashed scilab. - -Patch is from Giuseppe Allodi <Giuseppe.Allodi@fis.unipr.it> -posted to comp.soft-sys.math.scilab - ---- routines/signal/sigelm.f.orig Mon Feb 5 10:19:36 2001 -+++ routines/signal/sigelm.f Sun Jun 3 18:52:29 2001 -@@ -134,8 +134,18 @@ - 22 continue - c rhs=4 - ilinc=iadr(lstk(top)) -+ if (istk(ilinc).ne.1) then !protect the 4th arg. (GA 2001) -+ err=4 -+ call error(53) -+ return -+ endif - linc=sadr(ilinc+4) - nspn=int(stk(linc)) -+ if (nspn.eq.0) then !protect the 4th arg. (GA 2001) -+ err=4 -+ call error(36) -+ return -+ endif - top=top-1 - iln=iadr(lstk(top)) - ln=sadr(iln+4) diff --git a/math/scilab/patches/patch-ah b/math/scilab/patches/patch-ah deleted file mode 100644 index ef5a720a745..00000000000 --- a/math/scilab/patches/patch-ah +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ah,v 1.5 2001/12/22 00:03:26 dmcmahill Exp $ - -fix the ascii() function. -patch from Serge Steer on comp.soft-sys.math.scilab - ---- routines/interf/strelm.f.orig Wed Feb 28 05:17:35 2001 -+++ routines/interf/strelm.f Wed Dec 12 16:17:42 2001 -@@ -1478,6 +1478,6 @@ - lr=ilr+6 - do 20 i=0,n-1 -- m=int(stk(l+i)) -- istk(lr+i)=getcode(m) -+ c=char(int(stk(l+i))) -+ istk(lr+i)=getcode(c) - 20 continue - lstk(top+1)=sadr(lr+n) diff --git a/math/scilab/patches/patch-ai b/math/scilab/patches/patch-ai deleted file mode 100644 index ce798e29839..00000000000 --- a/math/scilab/patches/patch-ai +++ /dev/null @@ -1,44 +0,0 @@ -$NetBSD: patch-ai,v 1.5 2001/12/22 00:03:26 dmcmahill Exp $ - -make the online help be easier to read by lining things up. - ---- macros/util/formatman.sci.orig Fri Mar 2 03:50:36 2001 -+++ macros/util/formatman.sci Thu Dec 20 17:34:38 2001 -@@ -389,5 +389,5 @@ - end
- end
--function wh=asciiwhatis(path,fnam)
-+function wh_out=asciiwhatis(path,fnam)
- txt=mgetl(path)
- d=find(part(txt,1:8)=='.SH NAME')
-@@ -401,5 +401,17 @@ - wh=stripblanks(wh)
- k=find(wh=='');if k<>[] then wh(k)=[];end
--wh=wh+' @'+fnam
-+sz=size(wh);
-+for i=1:sz(1),
-+// pad the output to make the descriptions all line up on the left
-+ind=min(strindex(wh(i,:),' - '))-1;
-+ind=ind(1); -+tmps=sprintf('%-15s%s',part(wh(i),1:ind),part(wh(i),(ind+1):length(wh(i))));
-+tmps=tmps +' @'+fnam
-+if (i == 1),
-+ wh_out = tmps;
-+else
-+ wh_out=sprintf('%s\n%s',wh_out,tmps);
-+end
-+end
-
- function wh=texwhatis(path,fnam)
-@@ -426,5 +438,10 @@ - p=p(1)
-
-- whk=part(whk,1:p-1)+'</a>'+part(whk,p:length(whk))
-+ // pad the output to make the descriptions all line up on the left
-+ pad='';
-+ for i=1:(15-p),
-+ pad=pad+' ';
-+ end
-+ whk=part(whk,1:p-1)+'</a>'+pad+part(whk,p:length(whk))
- wh(k)='<br><a href=""'+fnam+'"">'+whk+'<br>'
- end
diff --git a/math/scilab/patches/patch-aj b/math/scilab/patches/patch-aj deleted file mode 100644 index 77110acc351..00000000000 --- a/math/scilab/patches/patch-aj +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aj,v 1.5 2001/12/22 00:03:26 dmcmahill Exp $ - -add missing white space (needed for man page cleanup) - ---- man/control/sysfact.man.orig Thu Aug 9 10:03:06 2001 -+++ man/control/sysfact.man Thu Aug 9 10:05:23 2001 -@@ -2,5 +2,5 @@ - .so ../sci.an - .SH NAME --sysfact- system factorization -+sysfact - system factorization - .SH CALLING SEQUENCE - .nf diff --git a/math/scilab/patches/patch-ak b/math/scilab/patches/patch-ak deleted file mode 100644 index c0b7a2289d7..00000000000 --- a/math/scilab/patches/patch-ak +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ak,v 1.5 2001/12/22 00:03:26 dmcmahill Exp $ - -add missing white space (needed for man page cleanup) - ---- man/nonlinear/derivative.man.orig Thu Aug 9 09:31:56 2001 -+++ man/nonlinear/derivative.man Thu Aug 9 10:08:41 2001 -@@ -2,5 +2,5 @@ - .so ../sci.an - .SH NAME --derivative- approximate derivative -+derivative - approximate derivative - .SH CALLING SEQUENCE - .nf diff --git a/math/scilab/patches/patch-al b/math/scilab/patches/patch-al deleted file mode 100644 index 52452cc44ce..00000000000 --- a/math/scilab/patches/patch-al +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-al,v 1.5 2001/12/22 00:03:26 dmcmahill Exp $ - -remove extra newline (needed for man page cleanup) - ---- man/pvm/pvm_barrier.man.orig Thu Aug 9 09:31:56 2001 -+++ man/pvm/pvm_barrier.man Thu Aug 9 10:12:55 2001 -@@ -2,6 +2,5 @@ - .so ../sci.an - .SH NAME --pvm_barrier - blocks the calling process until all processes --in a group have called it. -+pvm_barrier - blocks the calling process until all processes in a group have called it. - .SH CALLING SEQUENCE - .nf diff --git a/math/scilab/patches/patch-am b/math/scilab/patches/patch-am deleted file mode 100644 index baead150c38..00000000000 --- a/math/scilab/patches/patch-am +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-am,v 1.5 2001/12/22 00:03:26 dmcmahill Exp $ - -remove extra newline (needed for man page cleanup) - ---- man/pvm/pvm_error.man.orig Thu Aug 9 09:31:56 2001 -+++ man/pvm/pvm_error.man Thu Aug 9 10:15:38 2001 -@@ -2,6 +2,5 @@ - .so ../sci.an - .SH NAME --pvm_error - Prints message describing an error returned by a PVM call. --group. -+pvm_error - Prints message describing an error returned by a PVM call. - .SH CALLING SEQUENCE - .nf diff --git a/math/scilab/patches/patch-an b/math/scilab/patches/patch-an deleted file mode 100644 index 5208404c1f3..00000000000 --- a/math/scilab/patches/patch-an +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-an,v 1.5 2001/12/22 00:03:27 dmcmahill Exp $ - -remove extra newline (needed for man page cleanup) - ---- man/pvm/pvm_gettid.man.orig Thu Aug 9 09:31:56 2001 -+++ man/pvm/pvm_gettid.man Thu Aug 9 10:16:23 2001 -@@ -2,6 +2,5 @@ - .so ../sci.an - .SH NAME --pvm_gettid - returns the tid of the process identified by a --group name and instance number. -+pvm_gettid - returns the tid of the process identified by a group name and instance number. - .SH CALLING SEQUENCE - .nf diff --git a/math/scilab/patches/patch-ao b/math/scilab/patches/patch-ao deleted file mode 100644 index 3619cd91c92..00000000000 --- a/math/scilab/patches/patch-ao +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ao,v 1.6 2001/12/22 00:03:27 dmcmahill Exp $ - -remove extra newline (needed for man page cleanup) - ---- man/pvm/pvm_parent.man.orig Thu Aug 9 09:31:56 2001 -+++ man/pvm/pvm_parent.man Thu Aug 9 10:17:22 2001 -@@ -2,6 +2,5 @@ - .so ../sci.an - .SH NAME --pvm_parent - returns the tid of the process that spawned --the calling process. -+pvm_parent - returns the tid of the process that spawned the calling process. - .SH CALLING SEQUENCE - .nf diff --git a/math/scilab/patches/patch-ap b/math/scilab/patches/patch-ap deleted file mode 100644 index 90e0cc2f1f5..00000000000 --- a/math/scilab/patches/patch-ap +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ap,v 1.4 2001/12/22 00:03:27 dmcmahill Exp $ - -remove extra newline (needed for man page cleanup) - ---- man/pvm/pvm_reduce.man.orig Thu Aug 9 09:31:56 2001 -+++ man/pvm/pvm_reduce.man Thu Aug 9 10:18:01 2001 -@@ -2,6 +2,5 @@ - .so ../sci.an - .SH NAME --pvm_reduce - Performs a reduce operation over members of the specified --group. -+pvm_reduce - Performs a reduce operation over members of the specified group. - .SH CALLING SEQUENCE - .nf diff --git a/math/scilab/patches/patch-aq b/math/scilab/patches/patch-aq deleted file mode 100644 index 5647f59f5b5..00000000000 --- a/math/scilab/patches/patch-aq +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-aq,v 1.4 2001/12/22 00:03:27 dmcmahill Exp $ - -remove extra newline (needed for man page cleanup) - ---- man/pvm/pvm_tasks.man.orig Thu Aug 9 09:31:56 2001 -+++ man/pvm/pvm_tasks.man Thu Aug 9 10:18:46 2001 -@@ -2,6 +2,5 @@ - .so ../sci.an - .SH NAME --pvm_tasks - returns information about the tasks running --on the virtual machine. -+pvm_tasks - returns information about the tasks running on the virtual machine. - .SH CALLING SEQUENCE - .nf diff --git a/math/scilab/patches/patch-ar b/math/scilab/patches/patch-ar deleted file mode 100644 index c9b9961b603..00000000000 --- a/math/scilab/patches/patch-ar +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ar,v 1.4 2002/03/05 21:05:53 dmcmahill Exp $ - -longs aren't always 32 bits... - ---- routines/sound/misc.c.orig Mon Feb 5 07:19:35 2001 -+++ routines/sound/misc.c Mon Mar 4 16:43:06 2002 -@@ -12,4 +12,6 @@ - ****************************************************************/ - -+#include <sys/types.h> -+ - #include "st.h" - #include "../machine.h" -@@ -326,5 +328,9 @@ - { - union { -- unsigned long l; /** we assume here long i s4 bytes **/ -+#ifdef netbsd -+ u_int32_t l; -+#else -+ unsigned long l; /** we assume here long i s4 bytes **/ -+#endif - float f; - } u; diff --git a/math/scilab/patches/patch-as b/math/scilab/patches/patch-as deleted file mode 100644 index 3912b365a3e..00000000000 --- a/math/scilab/patches/patch-as +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-as,v 1.4 2002/03/05 21:05:53 dmcmahill Exp $ - ---- routines/interf/intfilestat.c.orig Fri Jul 21 07:54:59 2000 -+++ routines/interf/intfilestat.c Mon Mar 4 20:55:04 2002 -@@ -4,4 +4,7 @@ - #include <locale.h> - #include <stdio.h> -+#ifdef netbsd -+#include <string.h> -+#endif - #include "../stack-c.h" - int C2F(intfilestat)(fname) diff --git a/math/scilab/patches/patch-at b/math/scilab/patches/patch-at deleted file mode 100644 index b57d29f9e38..00000000000 --- a/math/scilab/patches/patch-at +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-at,v 1.4 2002/03/05 21:05:53 dmcmahill Exp $ - ---- routines/dcd/DcdInterf.c.orig Mon Feb 5 07:19:39 2001 -+++ routines/dcd/DcdInterf.c Tue Mar 5 07:18:35 2002 -@@ -2,4 +2,8 @@ - ENPC */ - -+#ifdef __NetBSD__ -+#include <string.h> -+#endif -+ - #include "../../routines/stack-c.h" - diff --git a/math/scilab/patches/patch-au b/math/scilab/patches/patch-au deleted file mode 100644 index b7da59bfe88..00000000000 --- a/math/scilab/patches/patch-au +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-au,v 1.6 2002/03/05 21:05:54 dmcmahill Exp $ - ---- routines/randlib/Rand.c.orig Mon Jul 17 09:02:35 2000 -+++ routines/randlib/Rand.c Tue Mar 5 07:21:27 2002 -@@ -1,4 +1,8 @@ - /* Copyright Enpc/Cergrene */ - -+#ifdef __NetBSD__ -+#include <string.h> -+#endif -+ - #include "../../routines/stack-c.h" - #include "grand.h" diff --git a/math/scilab/patches/patch-av b/math/scilab/patches/patch-av deleted file mode 100644 index cc33e2d713f..00000000000 --- a/math/scilab/patches/patch-av +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-av,v 1.4 2002/03/05 21:05:54 dmcmahill Exp $ - ---- routines/int/genmdsp.c.orig Thu Jun 29 08:12:16 2000 -+++ routines/int/genmdsp.c Tue Mar 5 07:27:06 2002 -@@ -1,2 +1,6 @@ -+#ifdef __NetBSD__ -+#include <string.h> -+#endif -+ - #include "../machine.h" - #include <math.h> diff --git a/math/scilab/patches/patch-aw b/math/scilab/patches/patch-aw deleted file mode 100644 index 9cd0dceeae3..00000000000 --- a/math/scilab/patches/patch-aw +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-aw,v 1.4 2002/03/05 21:05:54 dmcmahill Exp $ - ---- routines/int/mgeti.c.orig Wed Jan 5 12:25:48 2000 -+++ routines/int/mgeti.c Tue Mar 5 07:35:39 2002 -@@ -1,3 +1,6 @@ - /* Copyright INRIA */ -+#ifdef __NetBSD__ -+#include <string.h> -+#endif - #include <stdio.h> - #ifdef __STDC__ diff --git a/math/scilab/patches/patch-ax b/math/scilab/patches/patch-ax deleted file mode 100644 index 76ea2c3669b..00000000000 --- a/math/scilab/patches/patch-ax +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-ax,v 1.4 2002/03/05 21:05:54 dmcmahill Exp $ - ---- routines/int/mputi.c.orig Wed Feb 28 05:16:14 2001 -+++ routines/int/mputi.c Tue Mar 5 07:36:06 2002 -@@ -1,3 +1,6 @@ - /* Copyright INRIA */ -+#ifdef __NetBSD__ -+#include <string.h> -+#endif - #include <stdio.h> - #ifdef __STDC__ diff --git a/math/scilab/patches/patch-ay b/math/scilab/patches/patch-ay deleted file mode 100644 index 4ac666a4ccf..00000000000 --- a/math/scilab/patches/patch-ay +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-ay,v 1.5 2002/05/22 10:37:05 dmcmahill Exp $ - -compile intmgetl without optimization. The symptom is that the scilab -function mgetl() will cause scilab to exit on netbsd-1.5.1/sparc. This -breaks the formatman() function and causes the man pages to not be built. - ---- routines/interf/Makefile.orig Mon May 20 20:51:57 2002 -+++ routines/interf/Makefile Tue May 21 19:33:48 2002 -@@ -109,5 +109,4 @@ - intfile.o : ../stack.h - intgetenv.o : ../stack.h --intmgetl.o: ../stack.h - stack0.o stack1.o stack2.o: ../stack.h - getdate.o: ../machine.h -@@ -120,2 +119,6 @@ - Makefile.amk : Makefile - $(SCIDIR)/util/Mak2ABSMak Makefile -+ -+intmgetl.o: intmgetl.f ../stack.h -+ $(FC) $(FC_OPTIONS_O0) -c intmgetl.f -o intmgetl.o -+ |