diff -urNP ../siag-3.4.3/ChangeLog ./ChangeLog --- ../siag-3.4.3/ChangeLog Mon Nov 6 02:08:17 2000 +++ ./ChangeLog Mon Nov 13 13:34:10 2000 @@ -1,4 +1,17 @@ +001113 Released 3.4.4. + +001110 Siag: equally experimental support for Mysql. + PW: It seems like Abi files can be read directly by the html + reader, so added it to the menu. + +001107 Siag: experimental support for the Lago database. + +001106 PW: Use psiconv to load Psion Word files. Also added workaround + for files with but no tag, as produced by psiconv. + Added csnprintf in common.c as a wrapper around vsnprintf if that + function exists and vsprintf otherwise. + 001106 Catch WM_DELETE in listsel dialog. New words in Swedish translation. Released 3.4.3. diff -urNP ../siag-3.4.3/INSTALL ./INSTALL --- ../siag-3.4.3/INSTALL Wed Sep 6 21:32:45 2000 +++ ./INSTALL Sun Nov 12 01:10:05 2000 @@ -72,7 +72,16 @@ An alternative to copying the library is to run configure like this: -LDFLAGS=-L/usr/local/lib/python1.5/config ./configure +LDFLAGS=-L/usr/local/lib/python1.5/config ./configure --with-python + + +Mysql: Run configure with + +LDFLAGS=-L/usr/local/lib/mysql ./configure --with-mysql + +This is because Mysql hides its libraries in a subdirectory. +On Linux (at least), the directory must also be added to +/etc/ld.so.conf and /sbin/ldconfig must be rerun. -------- diff -urNP ../siag-3.4.3/Nws/Makefile.in ./Nws/Makefile.in --- ../siag-3.4.3/Nws/Makefile.in Mon Nov 6 13:12:25 2000 +++ ./Nws/Makefile.in Mon Nov 13 14:04:45 2000 @@ -223,47 +223,6 @@ || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done -Base.o: Base.c PopText.h BaseP.h Base.h cvt.h dimdefP.h BaseConstP.h \ - BaseConst.h BaseCompP.h BaseComp.h Init.h utils.h Traverse.h -BaseComp.o: BaseComp.c PopText.h BaseCompP.h BaseComp.h cvt.h dimdefP.h \ - BaseConstP.h BaseConst.h Init.h utils.h Traverse.h -BaseConst.o: BaseConst.c PopText.h BaseConstP.h BaseConst.h cvt.h \ - dimdefP.h BaseCompP.h BaseComp.h Init.h utils.h Traverse.h -BaseME.o: BaseME.c BaseMEP.h BaseME.h cvt.h dimdefP.h Init.h utils.h -Button.o: Button.c utils.h cvt.h misc.h cvt.h ButtonP.h SButtonP.h \ - BaseP.h Base.h dimdefP.h SButton.h Button.h Init.h -CheckME.o: CheckME.c CheckMEP.h LabelMEP.h BaseMEP.h BaseME.h cvt.h \ - dimdefP.h LabelME.h CheckME.h Init.h utils.h mdoff.xpm mdon.xpm \ - mroff.xpm mron.xpm mcoff.xpm mcon.xpm mchoff.xpm mchon.xpm \ - mc2on.xpm mc2off.xpm mcron.xpm mcroff.xpm -LabelME.o: LabelME.c LabelMEP.h BaseMEP.h BaseME.h cvt.h dimdefP.h \ - LabelME.h Init.h utils.h misc.h -LineME.o: LineME.c LineMEP.h BaseMEP.h BaseME.h cvt.h dimdefP.h LineME.h \ - Init.h -MBButton.o: MBButton.c MenuBarP.h RowP.h BaseConstP.h BaseConst.h cvt.h \ - dimdefP.h Row.h MenuBar.h Init.h MenuP.h Menu.h BaseMEP.h \ - BaseME.h MBButtonP.h LabelMEP.h BaseMEP.h LabelME.h MBButton.h -Menu.o: Menu.c MenuP.h Menu.h cvt.h dimdefP.h BaseMEP.h BaseME.h Init.h \ - utils.h cvt.h -MenuBar.o: MenuBar.c MenuBarP.h RowP.h BaseConstP.h BaseConst.h cvt.h \ - dimdefP.h Row.h MenuBar.h Init.h MBButtonP.h LabelMEP.h \ - BaseMEP.h BaseME.h LabelME.h MBButton.h -MenuButton.o: MenuButton.c MenuButtonP.h ButtonP.h SButtonP.h BaseP.h \ - Base.h cvt.h dimdefP.h SButton.h Button.h MenuButton.h Init.h -NwsVendor.o: NwsVendor.c NwsVendor.h NwsVendorP.h -PopText.o: PopText.c PopTextP.h PopText.h Init.h misc.h -Row.o: Row.c RowP.h BaseConstP.h BaseConst.h cvt.h dimdefP.h Row.h \ - Init.h misc.h Traverse.h -SButton.o: SButton.c SButtonP.h BaseP.h Base.h cvt.h dimdefP.h SButton.h \ - Init.h -SubME.o: SubME.c MenuP.h Menu.h cvt.h dimdefP.h BaseMEP.h BaseME.h \ - Init.h SubMEP.h LabelMEP.h BaseMEP.h LabelME.h SubME.h utils.h \ - trion.xpm trioff.xpm -Traverse.o: Traverse.c Traverse.h BaseConstP.h BaseConst.h cvt.h \ - dimdefP.h BaseCompP.h BaseComp.h -cvt.o: cvt.c cvt.h -misc.o: misc.c misc.h -utils.o: utils.c utils.h cvt.h BaseMEP.h BaseME.h dimdefP.h info-am: info: info-am diff -urNP ../siag-3.4.3/acconfig.h ./acconfig.h --- ../siag-3.4.3/acconfig.h Wed Jul 12 02:35:31 2000 +++ ./acconfig.h Mon Nov 6 17:45:12 2000 @@ -73,3 +73,5 @@ #undef HAVE_LIB_T1X +#undef HAVE_VSNPRINTF + diff -urNP ../siag-3.4.3/acinclude.m4 ./acinclude.m4 --- ../siag-3.4.3/acinclude.m4 Sun Oct 8 21:59:16 2000 +++ ./acinclude.m4 Fri Nov 10 15:12:47 2000 @@ -159,6 +159,18 @@ AC_CHECK_LIB(gmp, main) fi ]) +AC_ARG_WITH(lago, + [ --with-lago enable Lago database queries], + [ if test "$withval" != "no"; then + AC_CHECK_LIB(lago, Lquery) + fi ]) + +AC_ARG_WITH(mysql, + [ --with-mysql enable Mysql database queries], + [ if test "$withval" != "no"; then + AC_CHECK_LIB(mysqlclient, mysql_real_connect) + fi ]) + dnl ccmath defines variables in ccmath.h, which causes AC_CHECK_LIB to fail dnl so we roll our own define(siag_CHECK_CCMATH, @@ -215,6 +227,8 @@ XAWLIB="-lXawM" fi AC_SUBST(XAWLIB) + +AC_CHECK_FUNC(vsnprintf, AC_DEFINE(HAVE_VSNPRINTF)) dnl What curses lib is available? Try in this order: dnl 0. use termcap if available diff -urNP ../siag-3.4.3/aclocal.m4 ./aclocal.m4 --- ../siag-3.4.3/aclocal.m4 Wed Nov 1 20:28:18 2000 +++ ./aclocal.m4 Mon Nov 13 13:55:24 2000 @@ -171,6 +171,18 @@ AC_CHECK_LIB(gmp, main) fi ]) +AC_ARG_WITH(lago, + [ --with-lago enable Lago database queries], + [ if test "$withval" != "no"; then + AC_CHECK_LIB(lago, Lquery) + fi ]) + +AC_ARG_WITH(mysql, + [ --with-mysql enable Mysql database queries], + [ if test "$withval" != "no"; then + AC_CHECK_LIB(mysqlclient, mysql_real_connect) + fi ]) + dnl ccmath defines variables in ccmath.h, which causes AC_CHECK_LIB to fail dnl so we roll our own define(siag_CHECK_CCMATH, @@ -227,6 +239,8 @@ XAWLIB="-lXawM" fi AC_SUBST(XAWLIB) + +AC_CHECK_FUNC(vsnprintf, AC_DEFINE(HAVE_VSNPRINTF)) dnl What curses lib is available? Try in this order: dnl 0. use termcap if available diff -urNP ../siag-3.4.3/common/Makefile.in ./common/Makefile.in --- ../siag-3.4.3/common/Makefile.in Mon Nov 6 13:12:03 2000 +++ ./common/Makefile.in Mon Nov 13 14:04:42 2000 @@ -362,13 +362,6 @@ || exit 1; \ fi; \ done -cmalloc.o: cmalloc.c cmalloc.h -common.o: common.c ../config.h cmalloc.h common.h traceme.h -fonts.o: fonts.c common.h cmalloc.h oldfonts.h fonts.h -globals.o: globals.c -pfb2ps.o: pfb2ps.c -ps.o: ps.c ps.h -richchar.o: richchar.c cmalloc.h fonts.h traceme.h info-am: info: info-recursive diff -urNP ../siag-3.4.3/common/common.c ./common/common.c --- ../siag-3.4.3/common/common.c Fri Oct 27 01:29:38 2000 +++ ./common/common.c Mon Nov 6 17:46:55 2000 @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -223,6 +224,20 @@ i++; } return c; +} + +int csnprintf(char *str, size_t n, const char *format, ...) +{ + int m; + va_list ap; + va_start(ap, format); +#ifdef HAVE_VSNPRINTF + m = vsnprintf(str, n, format, ap); +#else + m = vsprintf(str, format, ap); +#endif + va_end(ap); + return m; } diff -urNP ../siag-3.4.3/common/common.h ./common/common.h --- ../siag-3.4.3/common/common.h Fri Oct 27 01:07:17 2000 +++ ./common/common.h Mon Nov 6 17:41:19 2000 @@ -37,6 +37,7 @@ extern int cstrcmp(const char *, const char *); extern int cstrcasecmp(const char *, const char *); extern int cstrncasecmp(const char *, const char *, size_t); +extern int csnprintf(char *, size_t, const char *, ...); extern void deletia_add(long, char *); extern void deletia_mark(long); extern void deletia_reap(void); diff -urNP ../siag-3.4.3/config.h.in ./config.h.in --- ../siag-3.4.3/config.h.in Sun Oct 8 22:00:22 2000 +++ ./config.h.in Fri Nov 10 16:10:52 2000 @@ -89,6 +89,8 @@ #undef HAVE_LIB_T1X +#undef HAVE_VSNPRINTF + /* Define if you have the beep function. */ #undef HAVE_BEEP @@ -212,8 +214,14 @@ /* Define if you have the gmp library (-lgmp). */ #undef HAVE_LIBGMP +/* Define if you have the lago library (-llago). */ +#undef HAVE_LIBLAGO + /* Define if you have the m library (-lm). */ #undef HAVE_LIBM + +/* Define if you have the mysqlclient library (-lmysqlclient). */ +#undef HAVE_LIBMYSQLCLIENT /* Define if you have the nsl library (-lnsl). */ #undef HAVE_LIBNSL diff -urNP ../siag-3.4.3/configure ./configure --- ../siag-3.4.3/configure Wed Nov 1 20:28:29 2000 +++ ./configure Mon Nov 13 13:55:28 2000 @@ -28,6 +28,10 @@ ac_help="$ac_help --with-gmp enable Gnu arbitrary precision arithmetic" ac_help="$ac_help + --with-lago enable Lago database queries" +ac_help="$ac_help + --with-mysql enable Mysql database queries" +ac_help="$ac_help --with-ccmath enable the CCMATH mathematics library" ac_help="$ac_help --enable-profiling enable profiling" @@ -577,7 +581,7 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:581: checking for a BSD compatible install" >&5 +echo "configure:585: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -630,7 +634,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:634: checking whether build environment is sane" >&5 +echo "configure:638: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -687,7 +691,7 @@ test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:691: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:695: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -716,7 +720,7 @@ PACKAGE=siag -VERSION=3.4.3 +VERSION=3.4.4 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } @@ -733,7 +737,7 @@ missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:737: checking for working aclocal" >&5 +echo "configure:741: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -746,7 +750,7 @@ fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:750: checking for working autoconf" >&5 +echo "configure:754: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -759,7 +763,7 @@ fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:763: checking for working automake" >&5 +echo "configure:767: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -772,7 +776,7 @@ fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:776: checking for working autoheader" >&5 +echo "configure:780: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -785,7 +789,7 @@ fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:789: checking for working makeinfo" >&5 +echo "configure:793: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -805,7 +809,7 @@ # 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:809: checking for $ac_word" >&5 +echo "configure:813: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -837,7 +841,7 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:841: checking for $ac_word" >&5 +echo "configure:845: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -867,7 +871,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:871: checking for $ac_word" >&5 +echo "configure:875: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -918,7 +922,7 @@ # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:922: checking for $ac_word" >&5 +echo "configure:926: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -950,7 +954,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:954: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:958: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -961,12 +965,12 @@ cat > conftest.$ac_ext << EOF -#line 965 "configure" +#line 969 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:974: \"$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. if (./conftest; exit) 2>/dev/null; then @@ -992,12 +996,12 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:996: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1000: 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:1001: checking whether we are using GNU C" >&5 +echo "configure:1005: 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 else @@ -1006,7 +1010,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1010: \"$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:1014: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1025,7 +1029,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1029: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1033: 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 else @@ -1068,7 +1072,7 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1072: checking for a BSD compatible install" >&5 +echo "configure:1076: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1121,7 +1125,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1125: checking whether ln -s works" >&5 +echo "configure:1129: 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 else @@ -1144,7 +1148,7 @@ # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1148: checking for $ac_word" >&5 +echo "configure:1152: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1172,7 +1176,7 @@ fi echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 -echo "configure:1176: checking for POSIXized ISC" >&5 +echo "configure:1180: checking for POSIXized ISC" >&5 if test -d /etc/conf/kconfig.d && grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 then @@ -1195,7 +1199,7 @@ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1199: checking how to run the C preprocessor" >&5 +echo "configure:1203: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1210,13 +1214,13 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1220: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1224: \"$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 : @@ -1227,13 +1231,13 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1237: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1241: \"$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 : @@ -1244,13 +1248,13 @@ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1254: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1258: \"$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 : @@ -1279,7 +1283,7 @@ # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:1283: checking for X" >&5 +echo "configure:1287: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -1341,12 +1345,12 @@ # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1350: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1354: \"$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* @@ -1415,14 +1419,14 @@ ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -1528,17 +1532,17 @@ case "`(uname -sr) 2>/dev/null`" in "SunOS 5"*) echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -echo "configure:1532: checking whether -R must be followed by a space" >&5 +echo "configure:1536: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -1554,14 +1558,14 @@ else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -1593,7 +1597,7 @@ # libraries were built with DECnet support. And karl@cs.umb.edu says # the Alpha needs dnet_stub (dnet does not exist). echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:1597: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:1601: 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 echo $ac_n "(cached) $ac_c" 1>&6 @@ -1601,7 +1605,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1620: \"$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" else @@ -1634,7 +1638,7 @@ 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:1638: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:1642: 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 echo $ac_n "(cached) $ac_c" 1>&6 @@ -1642,7 +1646,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1661: \"$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" else @@ -1682,12 +1686,12 @@ # The nsl library prevents programs from opening the X display # on Irix 5.2, according to dickey@clark.net. echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:1686: checking for gethostbyname" >&5 +echo "configure:1690: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -1731,7 +1735,7 @@ if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:1735: checking for gethostbyname in -lnsl" >&5 +echo "configure:1739: 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 echo $ac_n "(cached) $ac_c" 1>&6 @@ -1739,7 +1743,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1758: \"$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" else @@ -1780,12 +1784,12 @@ # -lsocket must be given before -lnsl if both are needed. # We assume that if connect needs -lnsl, so does gethostbyname. echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:1784: checking for connect" >&5 +echo "configure:1788: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -1829,7 +1833,7 @@ if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:1833: checking for connect in -lsocket" >&5 +echo "configure:1837: 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 echo $ac_n "(cached) $ac_c" 1>&6 @@ -1837,7 +1841,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1856: \"$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" else @@ -1872,12 +1876,12 @@ # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:1876: checking for remove" >&5 +echo "configure:1880: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -1921,7 +1925,7 @@ if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:1925: checking for remove in -lposix" >&5 +echo "configure:1929: 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 echo $ac_n "(cached) $ac_c" 1>&6 @@ -1929,7 +1933,7 @@ ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1948: \"$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" else @@ -1964,12 +1968,12 @@ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:1968: checking for shmat" >&5 +echo "configure:1972: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -2013,7 +2017,7 @@ if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:2017: checking for shmat in -lipc" >&5 +echo "configure:2021: 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 echo $ac_n "(cached) $ac_c" 1>&6 @@ -2021,7 +2025,7 @@ ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2040: \"$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" else @@ -2065,7 +2069,7 @@ # libraries we check for below, so use a different variable. # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:2069: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:2073: 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 echo $ac_n "(cached) $ac_c" 1>&6 @@ -2073,7 +2077,7 @@ ac_save_LIBS="$LIBS" LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2092: \"$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" else @@ -2113,12 +2117,12 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 -echo "configure:2117: checking for $ac_hdr that defines DIR" >&5 +echo "configure:2121: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_hdr> @@ -2126,7 +2130,7 @@ DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:2130: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2134: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -2151,7 +2155,7 @@ # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 -echo "configure:2155: checking for opendir in -ldir" >&5 +echo "configure:2159: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2159,7 +2163,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2178: \"$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" else @@ -2192,7 +2196,7 @@ else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:2196: checking for opendir in -lx" >&5 +echo "configure:2200: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2200,7 +2204,7 @@ ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2219: \"$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" else @@ -2234,12 +2238,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:2238: checking for ANSI C header files" >&5 +echo "configure:2242: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2247,7 +2251,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2251: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2255: \"$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* @@ -2264,7 +2268,7 @@ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -2282,7 +2286,7 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -2303,7 +2307,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -2314,7 +2318,7 @@ exit (0); } EOF -if { (eval echo configure:2318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -2338,19 +2342,19 @@ fi echo $ac_n "checking whether sys/types.h defines makedev""... $ac_c" 1>&6 -echo "configure:2342: checking whether sys/types.h defines makedev" >&5 +echo "configure:2346: checking whether sys/types.h defines makedev" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_types_h_makedev'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return makedev(0, 0); ; return 0; } EOF -if { (eval echo configure:2354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_sys_types_h_makedev=yes else @@ -2368,17 +2372,17 @@ if test $ac_cv_header_sys_types_h_makedev = no; then ac_safe=`echo "sys/mkdev.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/mkdev.h""... $ac_c" 1>&6 -echo "configure:2372: checking for sys/mkdev.h" >&5 +echo "configure:2376: checking for sys/mkdev.h" >&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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2382: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2386: \"$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* @@ -2406,17 +2410,17 @@ if test $ac_cv_header_sys_mkdev_h = no; then ac_safe=`echo "sys/sysmacros.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/sysmacros.h""... $ac_c" 1>&6 -echo "configure:2410: checking for sys/sysmacros.h" >&5 +echo "configure:2414: checking for sys/sysmacros.h" >&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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2420: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2424: \"$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* @@ -2446,12 +2450,12 @@ echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:2450: checking for size_t" >&5 +echo "configure:2454: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -2479,12 +2483,12 @@ fi echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 -echo "configure:2483: checking for st_blksize in struct stat" >&5 +echo "configure:2487: checking for st_blksize in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2492,7 +2496,7 @@ struct stat s; s.st_blksize; ; return 0; } EOF -if { (eval echo configure:2496: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2500: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blksize=yes else @@ -2513,12 +2517,12 @@ fi echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&6 -echo "configure:2517: checking for st_blocks in struct stat" >&5 +echo "configure:2521: checking for st_blocks in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_blocks'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2526,7 +2530,7 @@ struct stat s; s.st_blocks; ; return 0; } EOF -if { (eval echo configure:2530: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2534: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blocks=yes else @@ -2549,12 +2553,12 @@ fi echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6 -echo "configure:2553: checking for st_rdev in struct stat" >&5 +echo "configure:2557: checking for st_rdev in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_rdev'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2562,7 +2566,7 @@ struct stat s; s.st_rdev; ; return 0; } EOF -if { (eval echo configure:2566: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2570: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_rdev=yes else @@ -2583,12 +2587,12 @@ fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:2587: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:2591: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2597,7 +2601,7 @@ struct tm *tp; ; return 0; } EOF -if { (eval echo configure:2601: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2605: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -2618,12 +2622,12 @@ fi echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:2622: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:2626: checking whether struct tm is in sys/time.h or time.h" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2631,7 +2635,7 @@ struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:2635: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2639: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -2653,7 +2657,7 @@ echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6 -echo "configure:2657: checking whether getpgrp takes no argument" >&5 +echo "configure:2661: checking whether getpgrp takes no argument" >&5 if eval "test \"`echo '$''{'ac_cv_func_getpgrp_void'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2661,7 +2665,7 @@ { echo "configure: error: cannot check getpgrp if cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_getpgrp_void=yes else @@ -2740,7 +2744,7 @@ fi echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:2744: checking for 8-bit clean memcmp" >&5 +echo "configure:2748: checking for 8-bit clean memcmp" >&5 if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2748,7 +2752,7 @@ ac_cv_func_memcmp_clean=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_memcmp_clean=yes else @@ -2776,12 +2780,12 @@ test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}" echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:2780: checking return type of signal handlers" >&5 +echo "configure:2784: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2798,7 +2802,7 @@ int i; ; return 0; } EOF -if { (eval echo configure:2802: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2806: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -2817,12 +2821,12 @@ echo $ac_n "checking for strftime""... $ac_c" 1>&6 -echo "configure:2821: checking for strftime" >&5 +echo "configure:2825: checking for strftime" >&5 if eval "test \"`echo '$''{'ac_cv_func_strftime'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_strftime=yes" else @@ -2867,7 +2871,7 @@ echo "$ac_t""no" 1>&6 # strftime is in -lintl on SCO UNIX. echo $ac_n "checking for strftime in -lintl""... $ac_c" 1>&6 -echo "configure:2871: checking for strftime in -lintl" >&5 +echo "configure:2875: checking for strftime in -lintl" >&5 ac_lib_var=`echo intl'_'strftime | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2875,7 +2879,7 @@ ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2894: \"$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" else @@ -2913,7 +2917,7 @@ fi echo $ac_n "checking whether utime accepts a null argument""... $ac_c" 1>&6 -echo "configure:2917: checking whether utime accepts a null argument" >&5 +echo "configure:2921: checking whether utime accepts a null argument" >&5 if eval "test \"`echo '$''{'ac_cv_func_utime_null'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2923,7 +2927,7 @@ ac_cv_func_utime_null=no else cat > conftest.$ac_ext < #include @@ -2934,7 +2938,7 @@ && t.st_mtime - s.st_mtime < 120)); } EOF -if { (eval echo configure:2938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_utime_null=yes else @@ -2958,12 +2962,12 @@ fi echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:2962: checking for vprintf" >&5 +echo "configure:2966: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -3010,12 +3014,12 @@ if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:3014: checking for _doprnt" >&5 +echo "configure:3018: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3046: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -3081,12 +3085,12 @@ strtol do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3085: checking for $ac_func" >&5 +echo "configure:3089: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3117: \"$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" else @@ -3136,12 +3140,12 @@ echo $ac_n "checking for fnmatch""... $ac_c" 1>&6 -echo "configure:3140: checking for fnmatch" >&5 +echo "configure:3144: checking for fnmatch" >&5 if eval "test \"`echo '$''{'ac_cv_func_fnmatch'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_fnmatch=yes" else @@ -3185,7 +3189,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gmatch in -lgen""... $ac_c" 1>&6 -echo "configure:3189: checking for gmatch in -lgen" >&5 +echo "configure:3193: checking for gmatch in -lgen" >&5 ac_lib_var=`echo gen'_'gmatch | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3193,7 +3197,7 @@ ac_save_LIBS="$LIBS" LIBS="-lgen $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3212: \"$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" else @@ -3232,12 +3236,12 @@ fi echo $ac_n "checking for gmatch""... $ac_c" 1>&6 -echo "configure:3236: checking for gmatch" >&5 +echo "configure:3240: checking for gmatch" >&5 if eval "test \"`echo '$''{'ac_cv_func_gmatch'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gmatch=yes" else @@ -3303,7 +3307,7 @@ if test "$withval" != "no"; then echo $ac_n "checking for dbm_open in -l$MAYBE_LIBNDBM""... $ac_c" 1>&6 -echo "configure:3307: checking for dbm_open in -l$MAYBE_LIBNDBM" >&5 +echo "configure:3311: checking for dbm_open in -l$MAYBE_LIBNDBM" >&5 ac_lib_var=`echo $MAYBE_LIBNDBM'_'dbm_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3311,7 +3315,7 @@ ac_save_LIBS="$LIBS" LIBS="-l$MAYBE_LIBNDBM $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3330: \"$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" else @@ -3341,7 +3345,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dbm_open in -ldb""... $ac_c" 1>&6 -echo "configure:3345: checking for dbm_open in -ldb" >&5 +echo "configure:3349: checking for dbm_open in -ldb" >&5 ac_lib_var=`echo db'_'dbm_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3349,7 +3353,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldb $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3368: \"$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" else @@ -3379,7 +3383,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dbm_open in -lgdbm""... $ac_c" 1>&6 -echo "configure:3383: checking for dbm_open in -lgdbm" >&5 +echo "configure:3387: checking for dbm_open in -lgdbm" >&5 ac_lib_var=`echo gdbm'_'dbm_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3387,7 +3391,7 @@ ac_save_LIBS="$LIBS" LIBS="-lgdbm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3406: \"$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" else @@ -3417,7 +3421,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dbm_open in -lndbm""... $ac_c" 1>&6 -echo "configure:3421: checking for dbm_open in -lndbm" >&5 +echo "configure:3425: checking for dbm_open in -lndbm" >&5 ac_lib_var=`echo ndbm'_'dbm_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3425,7 +3429,7 @@ ac_save_LIBS="$LIBS" LIBS="-lndbm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3444: \"$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" else @@ -3467,12 +3471,12 @@ LIBS="$LIBDB $LIBS" fi echo $ac_n "checking for dbm_dirfno""... $ac_c" 1>&6 -echo "configure:3471: checking for dbm_dirfno" >&5 +echo "configure:3475: checking for dbm_dirfno" >&5 if eval "test \"`echo '$''{'ac_cv_func_dbm_dirfno'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dbm_dirfno=yes" else @@ -3518,12 +3522,12 @@ fi echo $ac_n "checking for dbm_pagfno""... $ac_c" 1>&6 -echo "configure:3522: checking for dbm_pagfno" >&5 +echo "configure:3526: checking for dbm_pagfno" >&5 if eval "test \"`echo '$''{'ac_cv_func_dbm_pagfno'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dbm_pagfno=yes" else @@ -3569,12 +3573,12 @@ fi echo $ac_n "checking for dbm_rdonly""... $ac_c" 1>&6 -echo "configure:3573: checking for dbm_rdonly" >&5 +echo "configure:3577: checking for dbm_rdonly" >&5 if eval "test \"`echo '$''{'ac_cv_func_dbm_rdonly'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dbm_rdonly=yes" else @@ -3620,12 +3624,12 @@ fi echo $ac_n "checking for dbm_open""... $ac_c" 1>&6 -echo "configure:3624: checking for dbm_open" >&5 +echo "configure:3628: checking for dbm_open" >&5 if eval "test \"`echo '$''{'ac_cv_func_dbm_open'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dbm_open=yes" else @@ -3675,7 +3679,7 @@ echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 -echo "configure:3679: checking for main in -lm" >&5 +echo "configure:3683: 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 echo $ac_n "(cached) $ac_c" 1>&6 @@ -3683,14 +3687,14 @@ ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3698: \"$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" else @@ -3719,12 +3723,12 @@ echo $ac_n "checking for acosh""... $ac_c" 1>&6 -echo "configure:3723: checking for acosh" >&5 +echo "configure:3727: checking for acosh" >&5 if eval "test \"`echo '$''{'ac_cv_func_acosh'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_acosh=yes" else @@ -3770,12 +3774,12 @@ fi echo $ac_n "checking for asinh""... $ac_c" 1>&6 -echo "configure:3774: checking for asinh" >&5 +echo "configure:3778: checking for asinh" >&5 if eval "test \"`echo '$''{'ac_cv_func_asinh'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_asinh=yes" else @@ -3821,12 +3825,12 @@ fi echo $ac_n "checking for log1p""... $ac_c" 1>&6 -echo "configure:3825: checking for log1p" >&5 +echo "configure:3829: checking for log1p" >&5 if eval "test \"`echo '$''{'ac_cv_func_log1p'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&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_func_log1p=yes" else @@ -3872,12 +3876,12 @@ fi echo $ac_n "checking for expm1""... $ac_c" 1>&6 -echo "configure:3876: checking for expm1" >&5 +echo "configure:3880: checking for expm1" >&5 if eval "test \"`echo '$''{'ac_cv_func_expm1'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_expm1=yes" else @@ -3923,12 +3927,12 @@ fi echo $ac_n "checking for cbrt""... $ac_c" 1>&6 -echo "configure:3927: checking for cbrt" >&5 +echo "configure:3931: checking for cbrt" >&5 if eval "test \"`echo '$''{'ac_cv_func_cbrt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_cbrt=yes" else @@ -3974,12 +3978,12 @@ fi echo $ac_n "checking for drem""... $ac_c" 1>&6 -echo "configure:3978: checking for drem" >&5 +echo "configure:3982: checking for drem" >&5 if eval "test \"`echo '$''{'ac_cv_func_drem'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_drem=yes" else @@ -4025,12 +4029,12 @@ fi echo $ac_n "checking for atanh""... $ac_c" 1>&6 -echo "configure:4029: checking for atanh" >&5 +echo "configure:4033: checking for atanh" >&5 if eval "test \"`echo '$''{'ac_cv_func_atanh'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_atanh=yes" else @@ -4077,7 +4081,7 @@ echo $ac_n "checking for main in -lcrypt""... $ac_c" 1>&6 -echo "configure:4081: checking for main in -lcrypt" >&5 +echo "configure:4085: checking for main in -lcrypt" >&5 ac_lib_var=`echo crypt'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4085,14 +4089,14 @@ ac_save_LIBS="$LIBS" LIBS="-lcrypt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4100: \"$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" else @@ -4114,7 +4118,7 @@ if test "$LIBSYSDEP" = ""; then echo $ac_n "checking for main in -lposix4""... $ac_c" 1>&6 -echo "configure:4118: checking for main in -lposix4" >&5 +echo "configure:4122: checking for main in -lposix4" >&5 ac_lib_var=`echo posix4'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4122,14 +4126,14 @@ ac_save_LIBS="$LIBS" LIBS="-lposix4 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4137: \"$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" else @@ -4156,7 +4160,7 @@ echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6 -echo "configure:4160: checking for main in -lnsl" >&5 +echo "configure:4164: checking for main in -lnsl" >&5 ac_lib_var=`echo nsl'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4164,14 +4168,14 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4179: \"$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" else @@ -4199,7 +4203,7 @@ fi echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:4203: checking for connect in -lsocket" >&5 +echo "configure:4207: 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 echo $ac_n "(cached) $ac_c" 1>&6 @@ -4207,7 +4211,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4226: \"$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" else @@ -4250,17 +4254,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4254: checking for $ac_hdr" >&5 +echo "configure:4258: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4264: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4268: \"$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* @@ -4291,12 +4295,12 @@ usleep lchown strptime putpwent getwd do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4295: checking for $ac_func" >&5 +echo "configure:4299: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4327: \"$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" else @@ -4365,7 +4369,7 @@ if test "$withval" != "no"; then echo $ac_n "checking for main in -ldl""... $ac_c" 1>&6 -echo "configure:4369: checking for main in -ldl" >&5 +echo "configure:4373: 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 echo $ac_n "(cached) $ac_c" 1>&6 @@ -4373,14 +4377,14 @@ ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4388: \"$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" else @@ -4401,7 +4405,7 @@ fi echo $ac_n "checking for Tcl_Main in -l$MAYBE_LIBTCL""... $ac_c" 1>&6 -echo "configure:4405: checking for Tcl_Main in -l$MAYBE_LIBTCL" >&5 +echo "configure:4409: checking for Tcl_Main in -l$MAYBE_LIBTCL" >&5 ac_lib_var=`echo $MAYBE_LIBTCL'_'Tcl_Main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4409,7 +4413,7 @@ ac_save_LIBS="$LIBS" LIBS="-l$MAYBE_LIBTCL $LIBMATH $LIBDL $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4428: \"$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" else @@ -4469,7 +4473,7 @@ withval="$with_guile" if test "$withval" != "no"; then echo $ac_n "checking for gh_enter in -lguile""... $ac_c" 1>&6 -echo "configure:4473: checking for gh_enter in -lguile" >&5 +echo "configure:4477: checking for gh_enter in -lguile" >&5 ac_lib_var=`echo guile'_'gh_enter | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4477,7 +4481,7 @@ ac_save_LIBS="$LIBS" LIBS="-lguile `guile-config link` $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4496: \"$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" else @@ -4523,7 +4527,7 @@ withval="$with_python" if test "$withval" != "no"; then echo $ac_n "checking for main in -lpthread""... $ac_c" 1>&6 -echo "configure:4527: checking for main in -lpthread" >&5 +echo "configure:4531: checking for main in -lpthread" >&5 ac_lib_var=`echo pthread'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4531,14 +4535,14 @@ ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4546: \"$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" else @@ -4566,7 +4570,7 @@ fi echo $ac_n "checking for PyFloat_AsDouble in -lpython1.5""... $ac_c" 1>&6 -echo "configure:4570: checking for PyFloat_AsDouble in -lpython1.5" >&5 +echo "configure:4574: checking for PyFloat_AsDouble in -lpython1.5" >&5 ac_lib_var=`echo python1.5'_'PyFloat_AsDouble | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4574,7 +4578,7 @@ ac_save_LIBS="$LIBS" LIBS="-lpython1.5 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4593: \"$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" else @@ -4619,7 +4623,7 @@ withval="$with_stocks" if test "$withval" != "no"; then echo $ac_n "checking for main in -lstocks""... $ac_c" 1>&6 -echo "configure:4623: checking for main in -lstocks" >&5 +echo "configure:4627: checking for main in -lstocks" >&5 ac_lib_var=`echo stocks'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4627,14 +4631,14 @@ ac_save_LIBS="$LIBS" LIBS="-lstocks $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4642: \"$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" else @@ -4670,7 +4674,7 @@ withval="$with_gmp" if test "$withval" != "no"; then echo $ac_n "checking for main in -lgmp""... $ac_c" 1>&6 -echo "configure:4674: checking for main in -lgmp" >&5 +echo "configure:4678: checking for main in -lgmp" >&5 ac_lib_var=`echo gmp'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4678,14 +4682,14 @@ ac_save_LIBS="$LIBS" LIBS="-lgmp $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4693: \"$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" else @@ -4716,6 +4720,116 @@ fi +# Check whether --with-lago or --without-lago was given. +if test "${with_lago+set}" = set; then + withval="$with_lago" + if test "$withval" != "no"; then + echo $ac_n "checking for Lquery in -llago""... $ac_c" 1>&6 +echo "configure:4729: checking for Lquery in -llago" >&5 +ac_lib_var=`echo lago'_'Lquery | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-llago $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_lib=HAVE_LIB`echo lago | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h <&6 +fi + + fi +fi + + +# Check whether --with-mysql or --without-mysql was given. +if test "${with_mysql+set}" = set; then + withval="$with_mysql" + if test "$withval" != "no"; then + echo $ac_n "checking for mysql_real_connect in -lmysqlclient""... $ac_c" 1>&6 +echo "configure:4784: checking for mysql_real_connect in -lmysqlclient" >&5 +ac_lib_var=`echo mysqlclient'_'mysql_real_connect | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lmysqlclient $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_lib=HAVE_LIB`echo mysqlclient | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h <&6 +fi + + fi +fi + + # Check whether --with-ccmath or --without-ccmath was given. @@ -4725,14 +4839,14 @@ ac_save_LIBS=$LIBS LIBS="-lccm $LIBS" cat > conftest.$ac_ext < int main() { main(); ; return 0; } EOF -if { (eval echo configure:4736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBCCMATH=-lccm else @@ -4759,7 +4873,7 @@ ac_save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $X_LIBS" echo $ac_n "checking for main in -lXext""... $ac_c" 1>&6 -echo "configure:4763: checking for main in -lXext" >&5 +echo "configure:4877: checking for main in -lXext" >&5 ac_lib_var=`echo Xext'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4767,14 +4881,14 @@ ac_save_LIBS="$LIBS" LIBS="-lXext $X_PRE_LIBS $X_EXTRA_LIBS $X_EXTRA_LIBS -lXt -lX11 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4892: \"$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" else @@ -4797,7 +4911,7 @@ echo $ac_n "checking for main in -lXmu""... $ac_c" 1>&6 -echo "configure:4801: checking for main in -lXmu" >&5 +echo "configure:4915: 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 echo $ac_n "(cached) $ac_c" 1>&6 @@ -4805,14 +4919,14 @@ ac_save_LIBS="$LIBS" LIBS="-lXmu $LIBXEXT $X_PRE_LIBS $X_EXTRA_LIBS $X_EXTRA_LIBS -lXt -lX11 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4930: \"$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" else @@ -4834,7 +4948,7 @@ echo $ac_n "checking for XCreateIC in -lX11""... $ac_c" 1>&6 -echo "configure:4838: checking for XCreateIC in -lX11" >&5 +echo "configure:4952: checking for XCreateIC in -lX11" >&5 ac_lib_var=`echo X11'_'XCreateIC | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4842,7 +4956,7 @@ ac_save_LIBS="$LIBS" LIBS="-lX11 $x_libs $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4971: \"$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" else @@ -4878,7 +4992,7 @@ echo $ac_n "checking for main in -lXawM""... $ac_c" 1>&6 -echo "configure:4882: checking for main in -lXawM" >&5 +echo "configure:4996: checking for main in -lXawM" >&5 ac_lib_var=`echo XawM'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4886,14 +5000,14 @@ ac_save_LIBS="$LIBS" LIBS="-lXawM $LIBXMU $LIBEXT $X_PRE_LIBS $X_EXTRA_LIBS -lXt -lX11 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5011: \"$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" else @@ -4944,9 +5058,61 @@ fi +echo $ac_n "checking for vsnprintf""... $ac_c" 1>&6 +echo "configure:5063: checking for vsnprintf" >&5 +if eval "test \"`echo '$''{'ac_cv_func_vsnprintf'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char vsnprintf(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_vsnprintf) || defined (__stub___vsnprintf) +choke me +#else +vsnprintf(); +#endif + +; return 0; } +EOF +if { (eval echo configure:5091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_vsnprintf=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_vsnprintf=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'vsnprintf`\" = yes"; then + echo "$ac_t""yes" 1>&6 + cat >> confdefs.h <<\EOF +#define HAVE_VSNPRINTF 1 +EOF + +else + echo "$ac_t""no" 1>&6 +fi + + ac_save_LDFLAGS="$LDFLAGS" echo $ac_n "checking for main in -ltermcap""... $ac_c" 1>&6 -echo "configure:4950: checking for main in -ltermcap" >&5 +echo "configure:5116: 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 echo $ac_n "(cached) $ac_c" 1>&6 @@ -4954,14 +5120,14 @@ ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5131: \"$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" else @@ -4982,7 +5148,7 @@ fi echo $ac_n "checking for wgetch in -lncurses""... $ac_c" 1>&6 -echo "configure:4986: checking for wgetch in -lncurses" >&5 +echo "configure:5152: checking for wgetch in -lncurses" >&5 ac_lib_var=`echo ncurses'_'wgetch | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4990,7 +5156,7 @@ ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBTERMCAP $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5171: \"$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" else @@ -5020,7 +5186,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for wgetch in -lcurses""... $ac_c" 1>&6 -echo "configure:5024: checking for wgetch in -lcurses" >&5 +echo "configure:5190: checking for wgetch in -lcurses" >&5 ac_lib_var=`echo curses'_'wgetch | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5028,7 +5194,7 @@ ac_save_LIBS="$LIBS" LIBS="-lcurses $LIBTERMCAP $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5209: \"$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" else @@ -5065,12 +5231,12 @@ for ac_func in resizeterm beep immedok keypad do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5069: checking for $ac_func" >&5 +echo "configure:5235: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5263: \"$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" else @@ -5125,7 +5291,7 @@ withval="$with_t1lib" if test "$withval" != "no"; then echo $ac_n "checking for main in -lt1""... $ac_c" 1>&6 -echo "configure:5129: checking for main in -lt1" >&5 +echo "configure:5295: checking for main in -lt1" >&5 ac_lib_var=`echo t1'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5133,14 +5299,14 @@ ac_save_LIBS="$LIBS" LIBS="-lt1 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5310: \"$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" else @@ -5167,7 +5333,7 @@ fi echo $ac_n "checking for main in -lt1x""... $ac_c" 1>&6 -echo "configure:5171: checking for main in -lt1x" >&5 +echo "configure:5337: checking for main in -lt1x" >&5 ac_lib_var=`echo t1x'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5175,14 +5341,14 @@ ac_save_LIBS="$LIBS" LIBS="-lt1x $LIBT1 $X_LIBS -lX11 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5352: \"$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" else diff -urNP ../siag-3.4.3/configure.in ./configure.in --- ../siag-3.4.3/configure.in Sun Oct 29 00:57:39 2000 +++ ./configure.in Fri Nov 10 18:08:30 2000 @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(README) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(siag, 3.4.3) +AM_INIT_AUTOMAKE(siag, 3.4.4) dnl Set of available languages dnl ALL_LINGUAS="" diff -urNP ../siag-3.4.3/egon/Makefile.in ./egon/Makefile.in --- ../siag-3.4.3/egon/Makefile.in Mon Nov 6 13:12:57 2000 +++ ./egon/Makefile.in Mon Nov 13 14:04:51 2000 @@ -336,37 +336,6 @@ || exit 1; \ fi; \ done -buffer.o: buffer.c egon.h ../common/fonts.h types.h ../common/common.h \ - ../common/cmalloc.h -cmds.o: cmds.c ../common/common.h ../common/cmalloc.h ../common/plugin.h \ - ../siod/siod.h egon.h ../common/fonts.h types.h \ - user_interface.h -fileio.o: fileio.c ../siod/siod.h egon.h ../common/fonts.h types.h \ - ../common/common.h ../common/cmalloc.h user_interface.h -fileio_c.o: fileio_c.c egon.h ../common/fonts.h types.h \ - ../common/common.h -fileio_egon.o: fileio_egon.c ../common/oldfonts.h egon.h \ - ../common/fonts.h types.h user_interface.h ../common/common.h \ - ../common/cmalloc.h ../common/plugin.h -fileio_html.o: fileio_html.c egon.h ../common/fonts.h types.h \ - ../common/common.h ../common/cmalloc.h -fileio_mgp.o: fileio_mgp.c egon.h ../common/fonts.h types.h \ - ../common/common.h -fileio_scm.o: fileio_scm.c egon.h ../common/fonts.h types.h \ - user_interface.h ../common/common.h ../common/cmalloc.h -fileio_txt.o: fileio_txt.c egon.h ../common/fonts.h types.h \ - ../common/common.h ../common/cmalloc.h -guilei.o: guilei.c -main.o: main.c egon.h ../common/fonts.h types.h user_interface.h \ - ../common/common.h ../common/cmalloc.h ../siod/siod.h -matrix.o: matrix.c egon.h ../common/fonts.h types.h ../common/cmalloc.h \ - ../common/common.h -pythoni.o: pythoni.c -railway.o: railway.c types.h egon.h ../common/fonts.h ../siod/siod.h \ - ../common/common.h ../common/cmalloc.h -siodi.o: siodi.c types.h egon.h ../common/fonts.h ../siod/siod.h \ - ../common/common.h -tcli.o: tcli.c info-am: info: info-recursive diff -urNP ../siag-3.4.3/gvu/Makefile.in ./gvu/Makefile.in --- ../siag-3.4.3/gvu/Makefile.in Mon Nov 6 13:13:17 2000 +++ ./gvu/Makefile.in Mon Nov 13 14:04:55 2000 @@ -305,21 +305,6 @@ || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done -callbacks.o: callbacks.c ../common/common.h ../common/cmalloc.h \ - ../xcommon/filesel.h ../xcommon/dialogs.h ../xcommon/xcommon.h \ - gv.h ../xcommon/Ghostview.h ../Nws/cvt.h ../common/ps.h -main.o: main.c blank.xpm dot.xpm ../Nws/utils.h ../Nws/cvt.h \ - ../Nws/Menu.h ../Nws/MenuBar.h ../Nws/Row.h ../Nws/BaseConst.h \ - ../Nws/MBButton.h ../Nws/LabelME.h ../Nws/BaseME.h \ - ../Nws/LineME.h ../Nws/SubME.h ../common/common.h \ - ../xcommon/xcommon.h ../xcommon/dialogs.h ../xcommon/Rudegrid.h \ - ../xcommon/Frame.h ../xcommon/Tooltip.h ../xcommon/Handle.h \ - gv.h ../xcommon/Ghostview.h ../common/ps.h \ - ../xcommon/xcommon-ad.h ../xcommon/filesel-ad.h \ - ../xcommon/dialogs-ad.h ../xcommon/nws-ad.h gvu-ad.h -misc.o: misc.c ../Nws/Menu.h ../Nws/cvt.h ../Nws/MBButton.h \ - ../Nws/LabelME.h ../Nws/BaseME.h ../Nws/LineME.h gv.h \ - ../xcommon/Ghostview.h ../common/ps.h info-am: info: info-am diff -urNP ../siag-3.4.3/plugins/Makefile.in ./plugins/Makefile.in --- ../siag-3.4.3/plugins/Makefile.in Mon Nov 6 13:13:04 2000 +++ ./plugins/Makefile.in Mon Nov 13 14:04:53 2000 @@ -382,20 +382,6 @@ || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done -clipart.o: clipart.c ../common/cmalloc.h ../common/ps.h \ - ../common/common.h ../xcommon/xcommon.h ../xcommon/Rudegrid.h \ - ../xcommon/Ghostview.h -dummy.o: dummy.c ../siod/siod.h ../common/common.h ../common/cmalloc.h -form.o: form.c ../xcommon/Notebook.h ../xcommon/Check.h \ - ../xcommon/TextField.h ../xcommon/Frame.h ../xcommon/Combo.h \ - form-ad.h -hello.o: hello.c -image.o: image.c ../common/common.h ../common/cmalloc.h \ - ../common/bitmaps/image.xpm ../xcommon/Image.h \ - ../xcommon/icon.h -plot.o: plot.c ../common/common.h ../common/cmalloc.h ../xcommon/Image.h -siodi.o: siodi.c ../siod/siod.h -text.o: text.c ../common/common.h info-am: info: info-am diff -urNP ../siag-3.4.3/pw/Makefile.in ./pw/Makefile.in --- ../siag-3.4.3/pw/Makefile.in Mon Nov 6 13:12:49 2000 +++ ./pw/Makefile.in Mon Nov 13 14:04:50 2000 @@ -315,42 +315,6 @@ || exit 1; \ fi; \ done -buffer.o: buffer.c ../common/common.h ../common/cmalloc.h \ - ../common/plugin.h pw.h ../common/fonts.h ../common/traceme.h \ - user_interface.h -cmds.o: cmds.c ../common/cmalloc.h ../common/common.h ../common/plugin.h \ - pw.h ../common/fonts.h ../common/traceme.h user_interface.h \ - ../siod/siod.h -fileio.o: fileio.c ../siod/siod.h ../common/common.h ../common/cmalloc.h \ - pw.h ../common/fonts.h ../common/traceme.h user_interface.h -fileio_html.o: fileio_html.c ../common/common.h pw.h ../common/fonts.h \ - ../common/traceme.h user_interface.h -fileio_ps.o: fileio_ps.c pw.h ../common/fonts.h ../common/traceme.h \ - user_interface.h ../common/common.h ../common/cmalloc.h \ - ../common/plugin.h -fileio_pw.o: fileio_pw.c ../common/common.h ../common/cmalloc.h \ - ../common/plugin.h pw.h ../common/fonts.h ../common/traceme.h \ - user_interface.h -fileio_rtf.o: fileio_rtf.c pw.h ../common/fonts.h ../common/traceme.h \ - user_interface.h ../common/common.h ../common/cmalloc.h -fileio_txt.o: fileio_txt.c pw.h ../common/fonts.h ../common/traceme.h \ - user_interface.h ../common/common.h ../common/cmalloc.h -guilei.o: guilei.c -main.o: main.c ../common/common.h ../common/cmalloc.h pw.h \ - ../common/fonts.h ../common/traceme.h user_interface.h \ - ../siod/siod.h -matrix.o: matrix.c ../common/common.h ../common/cmalloc.h \ - ../common/plugin.h pw.h ../common/fonts.h ../common/traceme.h \ - user_interface.h -position.o: position.c pw.h ../common/fonts.h ../common/traceme.h \ - user_interface.h -pythoni.o: pythoni.c -railway.o: railway.c ../siod/siod.h ../common/common.h \ - ../common/cmalloc.h pw.h ../common/fonts.h ../common/traceme.h \ - user_interface.h -siodi.o: siodi.c pw.h ../common/fonts.h ../common/traceme.h \ - user_interface.h ../siod/siod.h ../common/common.h -tcli.o: tcli.c info-am: info: info-recursive diff -urNP ../siag-3.4.3/pw/docs/fileformats.html ./pw/docs/fileformats.html --- ../siag-3.4.3/pw/docs/fileformats.html Thu Jun 22 23:46:54 2000 +++ ./pw/docs/fileformats.html Mon Nov 6 20:01:02 2000 @@ -39,17 +39,19 @@

Adobe's "Portable Document Format". Loading requires the program pdftohtml, saving requires ps2pdf.

Microsoft Word -

If the catdoc utility is available on the system, +

If the wvHtml utility is available on the system, PW can use it to import text from MS Word documents. - All formatting is lost. A better solution is to save + Some formatting may be lost. A better solution is to save the file as RTF in Word and then load it in Siag.
- If the mswordview utility is available, PW can use it - to convert MS Word 97 documents to HTML, which is then - imported. That way, some formatting can be preserved. + If wvHtml is not installed, mswordview and/or + catdoc can be used instead.

AUIS ez

Reads documents created by the ez word processor from the Andrew system, using 2rtf to first convert to RTF. 2rtf is distributed with ez. +

Psion Word +

Uses psiconv to convert Psion Word files to HTML which + can be loaded by PW.

Adding Format Handlers

@@ -59,7 +61,7 @@ implementation of that function.

Ulric Eriksson - June 1999 - ulric@siag.nu

Ulric Eriksson - November 2000 - ulric@siag.nu

diff -urNP ../siag-3.4.3/pw/fileio_html.c ./pw/fileio_html.c --- ../siag-3.4.3/pw/fileio_html.c Wed Jul 5 02:00:46 2000 +++ ./pw/fileio_html.c Mon Nov 6 19:54:58 2000 @@ -371,6 +371,7 @@ {"/b", tag_b_}, {"head", tag_mute}, {"/head", tag_unmute}, + {"body", tag_unmute}, {NULL, NULL} }; diff -urNP ../siag-3.4.3/pw/pw.scm ./pw/pw.scm --- ../siag-3.4.3/pw/pw.scm Fri Oct 20 16:38:06 2000 +++ ./pw/pw.scm Sat Nov 11 02:08:04 2000 @@ -571,6 +571,13 @@ (register-converter "LyX (*.lyx)" "*.html" "lyx2html %s %s" nil nil)) + (if (executable-file "psiconv") + (register-converter "Psion (*.psi)" + "*.html" "psiconv %s > %s" + nil nil)) + (register-converter "Abi Word (*.abw)" + "*.html" "cp %s %s" + nil nil) (if (executable-file "2rtf") (register-converter "AUIS ez (*.ez)" "*.rtf" "2rtf %s %s" diff -urNP ../siag-3.4.3/siag/Makefile.am ./siag/Makefile.am --- ../siag-3.4.3/siag/Makefile.am Mon Oct 9 22:22:22 2000 +++ ./siag/Makefile.am Fri Nov 10 09:00:14 2000 @@ -9,7 +9,7 @@ fileio_wk1.c fileio_tbl.c fileio_latex.c \ ci.c siodi.c guilei.c tcli.c pythoni.c position.c main.c \ window.c selection.c globals.c stocks.c gmp.c ccmath.c \ - mathfunc.c roman.c + mathfunc.c roman.c lago.c mysql.c noinst_HEADERS = calc.h fileio.h user_interface.h \ selection.h mathfunc.h diff -urNP ../siag-3.4.3/siag/Makefile.in ./siag/Makefile.in --- ../siag-3.4.3/siag/Makefile.in Mon Nov 6 13:12:38 2000 +++ ./siag/Makefile.in Mon Nov 13 14:04:47 2000 @@ -89,7 +89,7 @@ noinst_LIBRARIES = libsiag.a -libsiag_a_SOURCES = railway.c matrix.c fileio.c cmds.c buffer.c mathwrap.c fileio_abs.c fileio_siag.c fileio_txt.c fileio_html.c fileio_scm.c fileio_ps.c fileio_wk1.c fileio_tbl.c fileio_latex.c ci.c siodi.c guilei.c tcli.c pythoni.c position.c main.c window.c selection.c globals.c stocks.c gmp.c ccmath.c mathfunc.c roman.c +libsiag_a_SOURCES = railway.c matrix.c fileio.c cmds.c buffer.c mathwrap.c fileio_abs.c fileio_siag.c fileio_txt.c fileio_html.c fileio_scm.c fileio_ps.c fileio_wk1.c fileio_tbl.c fileio_latex.c ci.c siodi.c guilei.c tcli.c pythoni.c position.c main.c window.c selection.c globals.c stocks.c gmp.c ccmath.c mathfunc.c roman.c lago.c mysql.c noinst_HEADERS = calc.h fileio.h user_interface.h selection.h mathfunc.h @@ -122,7 +122,8 @@ mathwrap.o fileio_abs.o fileio_siag.o fileio_txt.o fileio_html.o \ fileio_scm.o fileio_ps.o fileio_wk1.o fileio_tbl.o fileio_latex.o ci.o \ siodi.o guilei.o tcli.o pythoni.o position.o main.o window.o \ -selection.o globals.o stocks.o gmp.o ccmath.o mathfunc.o roman.o +selection.o globals.o stocks.o gmp.o ccmath.o mathfunc.o roman.o lago.o \ +mysql.o AR = ar CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -319,61 +320,6 @@ || exit 1; \ fi; \ done -buffer.o: buffer.c ../common/common.h ../common/cmalloc.h \ - ../common/fonts.h ../common/plugin.h calc.h ../common/traceme.h \ - user_interface.h -ccmath.o: ccmath.c ../config.h -ci.o: ci.c ../common/cmalloc.h ../common/common.h calc.h \ - ../common/traceme.h user_interface.h -cmds.o: cmds.c ../siod/siod.h ../common/cmalloc.h ../common/fonts.h \ - ../common/common.h ../common/plugin.h calc.h \ - ../common/traceme.h user_interface.h -fileio.o: fileio.c ../siod/siod.h ../common/common.h ../common/cmalloc.h \ - ../common/fonts.h calc.h ../common/traceme.h user_interface.h \ - fileio.h -fileio_abs.o: fileio_abs.c calc.h ../common/traceme.h user_interface.h \ - ../common/fonts.h ../common/common.h -fileio_html.o: fileio_html.c ../common/fonts.h ../common/common.h calc.h \ - ../common/traceme.h user_interface.h -fileio_latex.o: fileio_latex.c ../common/common.h calc.h \ - ../common/traceme.h user_interface.h -fileio_ps.o: fileio_ps.c ../common/fonts.h ../common/common.h \ - ../common/plugin.h calc.h ../common/traceme.h user_interface.h -fileio_scm.o: fileio_scm.c calc.h ../common/traceme.h user_interface.h -fileio_siag.o: fileio_siag.c ../common/cmalloc.h ../common/fonts.h \ - ../common/common.h ../common/plugin.h calc.h \ - ../common/traceme.h user_interface.h -fileio_tbl.o: fileio_tbl.c ../common/common.h calc.h ../common/traceme.h \ - user_interface.h -fileio_txt.o: fileio_txt.c calc.h ../common/traceme.h user_interface.h \ - ../common/fonts.h ../common/common.h -fileio_wk1.o: fileio_wk1.c ../siod/siod.h ../common/common.h \ - ../common/cmalloc.h ../common/fonts.h calc.h \ - ../common/traceme.h user_interface.h -globals.o: globals.c calc.h ../common/traceme.h user_interface.h -gmp.o: gmp.c ../config.h -guilei.o: guilei.c -main.o: main.c ../common/cmalloc.h ../common/common.h ../common/fonts.h \ - calc.h ../common/traceme.h user_interface.h ../siod/siod.h -mathfunc.o: mathfunc.c ../config.h ../siod/siod.h ../common/common.h \ - ../common/cmalloc.h mathfunc.h -mathwrap.o: mathwrap.c ../siod/siod.h ../config.h -matrix.o: matrix.c ../common/common.h ../common/cmalloc.h \ - ../common/fonts.h calc.h ../common/traceme.h user_interface.h -position.o: position.c calc.h ../common/traceme.h user_interface.h -pythoni.o: pythoni.c -railway.o: railway.c ../common/cmalloc.h calc.h ../common/traceme.h \ - user_interface.h ../common/common.h -roman.o: roman.c -selection.o: selection.c ../common/cmalloc.h ../common/common.h calc.h \ - ../common/traceme.h user_interface.h selection.h -siodi.o: siodi.c ../common/cmalloc.h ../common/common.h calc.h \ - ../common/traceme.h user_interface.h ../siod/siod.h -stocks.o: stocks.c ../config.h ../common/common.h ../common/cmalloc.h \ - ../siod/siod.h calc.h ../common/traceme.h user_interface.h -tcli.o: tcli.c -window.o: window.c ../siod/siod.h ../common/common.h ../common/cmalloc.h \ - ../common/fonts.h calc.h ../common/traceme.h user_interface.h info-am: info: info-recursive diff -urNP ../siag-3.4.3/siag/calc.h ./siag/calc.h --- ../siag-3.4.3/siag/calc.h Thu Oct 12 23:09:41 2000 +++ ./siag/calc.h Sat Nov 11 02:53:55 2000 @@ -43,6 +43,10 @@ #define EXPRESSION 4 #define STRING 5 #define EMBED 6 +#define MNUMBER 7 /* transient number in matrix or such */ +#define MTEXT 8 /* string in matrix or table */ + +#define IS_NUMBER(x) ((x)==EXPRESSION||(x)==CONSTANT||(x)==MNUMBER) enum {PORTRAIT = 0, LANDSCAPE}; diff -urNP ../siag-3.4.3/siag/ccmath.c ./siag/ccmath.c --- ../siag-3.4.3/siag/ccmath.c Fri Oct 13 06:31:11 2000 +++ ./siag/ccmath.c Sat Nov 11 02:34:05 2000 @@ -73,7 +73,7 @@ int x, y; int i = 0; cval val; - int type = CONSTANT; + int type = MNUMBER; char b[100]; if (a == NULL) return; get_siod_coords(&row, &col, &sheet, &buf); diff -urNP ../siag-3.4.3/siag/ci.c ./siag/ci.c --- ../siag-3.4.3/siag/ci.c Sun Nov 5 06:24:57 2000 +++ ./siag/ci.c Mon Nov 6 17:42:37 2000 @@ -335,7 +335,7 @@ { char *tmp1 = POPRESSTACK; char a[2048]; - snprintf(a, sizeof a, "(%s %s)", p, tmp1); + csnprintf(a, sizeof a, "(%s %s)", p, tmp1); cfree(tmp1); PUSHRESSTACK(a); } @@ -345,7 +345,7 @@ char *tmp1 = POPRESSTACK; char *tmp2 = POPRESSTACK; char a[2048]; - snprintf(a, sizeof a, "(%s %s %s)", p, tmp2, tmp1); + csnprintf(a, sizeof a, "(%s %s %s)", p, tmp2, tmp1); cfree(tmp1); cfree(tmp2); PUSHRESSTACK(a); @@ -373,7 +373,7 @@ } else { /* just cons'em up */ tmp1 = POPRESSTACK; tmp2 = POPRESSTACK; - snprintf(a, sizeof a, "%s %s", tmp2, tmp1); + csnprintf(a, sizeof a, "%s %s", tmp2, tmp1); cfree(tmp1); cfree(tmp2); PUSHRESSTACK(a); @@ -382,7 +382,7 @@ case FUN: tmp1 = POPRESSTACK; tmp2 = POPRESSTACK; - snprintf(a, sizeof a, "(%s %s)", tmp2, tmp1); + csnprintf(a, sizeof a, "(%s %s)", tmp2, tmp1); cfree(tmp1); cfree(tmp2); PUSHRESSTACK(a); @@ -462,7 +462,7 @@ break; case PERCENT: tmp1 = POPRESSTACK; - snprintf(a, sizeof a, "(/ %s 100)", tmp1); + csnprintf(a, sizeof a, "(/ %s 100)", tmp1); cfree(tmp1); PUSHRESSTACK(a); break; diff -urNP ../siag-3.4.3/siag/docs/README ./siag/docs/README --- ../siag-3.4.3/siag/docs/README Fri Jul 28 01:03:15 2000 +++ ./siag/docs/README Wed Nov 8 01:20:44 2000 @@ -29,3 +29,11 @@ cat ../../*.c ../../*.scm | ../snarfcmds ../cmdindex > ../siag-commands.html) +Generate keys.html: + +../../siod/siod keys.scm + +Generate commands.html: + +../../siod/siod menus.scm + diff -urNP ../siag-3.4.3/siag/docs/commands.html ./siag/docs/commands.html --- ../siag-3.4.3/siag/docs/commands.html Tue Aug 15 16:14:03 2000 +++ ./siag/docs/commands.html Wed Nov 8 01:19:45 2000 @@ -6,230 +6,230 @@

Menu Commands

File

- - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + +

File - New	(new_buffer)
File - Open	(load_buffer)
File - Save	(save_buffer)
File - Save As	(save_buffer_as)
File - Preview	(preview)
File - Close	(kill_buffer 1)
File - Backup Copies - Yes	(make_backups 1)
File - Backup Copies - No	(make_backups 0)
File - Settings - Margins	(change_margins nil)
File - Settings - Paper Size	(change_paper_size nil)
File - Settings - Header and Footer	(change_headfoot nil)
File - Print	(print)
File - Print Format	(print_format)
File - Load External	(load_external)
File - Save External	(save_external)
File - Exit	(quit_program)
File - New	(new_buffer)
File - Open	(load_buffer)
File - Save	(save_buffer)
File - Save As	(save_buffer_as)
File - Preview	(preview)
File - Close	(kill_buffer 1)
File - Backup Copies - Yes	(make_backups 1)
File - Backup Copies - No	(make_backups 0)
File - Settings - Margins	(change_margins nil)
File - Settings - Paper Size	(change_paper_size nil)
File - Settings - Header and Footer	(change_headfoot nil)
File - Print	(print)
File - Print Format	(print_format)
File - Load External	(load_external)
File - Save External	(save_external)
File - Exit	(quit_program)

Edit

- - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + +

Edit - Undo	(undo_restore)
Edit - Delete	(delete_cell)
Edit - Insert Line	(insert_line)
Edit - Remove Line	(remove_line)
Edit - Insert Column	(insert_col)
Edit - Remove Column	(remove_col)
Edit - Select All	(select_all)
Edit - Cut	(cut_block_to_string)
Edit - Copy	(copy_block_to_string)
Edit - Paste	(paste_block_from_string)
Edit - Find	(search_forward)
Edit - Find Backward	(search_backward)
Edit - Label	(edit_label)
Edit - Expression - C	(edit_c)
Edit - Expression - SIOD	(edit_siod)
Edit - Expression - Tcl	(edit_tcl)
Edit - Expression - Guile	(edit_guile)
Edit - Expression - Python	(edit_python)
Edit - Change Default Interpreter - C	(define standard-interpreter* 'C)*
Edit - Change Default Interpreter - SIOD	(define standard-interpreter* 'SIOD)*
Edit - Change Default Interpreter - Tcl	(define standard-interpreter* 'Tcl)*
Edit - Change Default Interpreter - Guile	(define standard-interpreter* 'Guile)*
Edit - Change Default Interpreter - Python	(define standard-interpreter* 'Python)*
Edit - Change Default Interpreter - Other	(change_interpreter)
Edit - Add Property	(add_property)
Edit - Undo	(undo_restore)
Edit - Delete	(delete_cell)
Edit - Insert Line	(insert_line)
Edit - Remove Line	(remove_line)
Edit - Insert Column	(insert_col)
Edit - Remove Column	(remove_col)
Edit - Select All	(select_all)
Edit - Cut	(cut_block_to_string)
Edit - Copy	(copy_block_to_string)
Edit - Paste	(paste_block_from_string)
Edit - Find	(search_forward)
Edit - Find Backward	(search_backward)
Edit - Label	(edit_label)
Edit - Expression - C	(edit_c)
Edit - Expression - SIOD	(edit_siod)
Edit - Expression - Tcl	(edit_tcl)
Edit - Expression - Guile	(edit_guile)
Edit - Expression - Python	(edit_python)
Edit - Change Default Interpreter - C	(define standard-interpreter* 'C)*
Edit - Change Default Interpreter - SIOD	(define standard-interpreter* 'SIOD)*
Edit - Change Default Interpreter - Tcl	(define standard-interpreter* 'Tcl)*
Edit - Change Default Interpreter - Guile	(define standard-interpreter* 'Guile)*
Edit - Change Default Interpreter - Python	(define standard-interpreter* 'Python)*
Edit - Change Default Interpreter - Other	(change_interpreter)
Edit - Add Property	(add_property)

Block

- - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + +

Block - Set Mark	(set_mark_command)
Block - Set Block	(set_block)
Block - Unset Block	(unset_block)
Block - Copy Block	(copy_block)
Block - Delete Block	(delete_block)
Block - Fill Block	(fill_block)
Block - Smart Fill Block	(smart_fill_block)
Block - Sort - Rows Ascending as Text	(sort_block 0 nil nil nil)
Block - Sort - Rows Ascending as Numbers	(sort_block 0 nil nil t)
Block - Sort - Rows Descending as Text	(sort_block 0 nil t nil)
Block - Sort - Rows Descending as Numbers	(sort_block 0 nil t t)
Block - Sort - Columns Ascending as Text	(sort_block 0 t nil nil)
Block - Sort - Columns Ascending as Numbers	(sort_block 0 t nil t)
Block - Sort - Columns Descending as Text	(sort_block 0 t t nil)
Block - Sort - Columns Descending as Numbers	(sort_block 0 t t t)
Block - Block Sum	(block_sum)
Block - Block Minimum	(block_min)
Block - Block Maximum	(block_max)
Block - Block Average	(block_avg)
Block - Borders - Borders	(block_borders 1)
Block - Borders - Grid	(block_borders 2)
Block - Borders - Underline	(block_borders 3)
Block - Borders - Top	(block_borders 4)
Block - Borders - Left	(block_borders 5)
Block - Borders - Right	(block_borders 6)
Block - Borders - None	(block_borders 0)
Block - Set Mark	(set_mark_command)
Block - Set Block	(set_block)
Block - Unset Block	(unset_block)
Block - Copy Block	(copy_block)
Block - Delete Block	(delete_block)
Block - Fill Block	(fill_block)
Block - Smart Fill Block	(smart_fill_block)
Block - Sort - Rows Ascending as Text	(sort_block 0 nil nil nil)
Block - Sort - Rows Ascending as Numbers	(sort_block 0 nil nil t)
Block - Sort - Rows Descending as Text	(sort_block 0 nil t nil)
Block - Sort - Rows Descending as Numbers	(sort_block 0 nil t t)
Block - Sort - Columns Ascending as Text	(sort_block 0 t nil nil)
Block - Sort - Columns Ascending as Numbers	(sort_block 0 t nil t)
Block - Sort - Columns Descending as Text	(sort_block 0 t t nil)
Block - Sort - Columns Descending as Numbers	(sort_block 0 t t t)
Block - Block Sum	(block_sum)
Block - Block Minimum	(block_min)
Block - Block Maximum	(block_max)
Block - Block Average	(block_avg)
Block - Borders - Borders	(block_borders 1)
Block - Borders - Grid	(block_borders 2)
Block - Borders - Underline	(block_borders 3)
Block - Borders - Top	(block_borders 4)
Block - Borders - Left	(block_borders 5)
Block - Borders - Right	(block_borders 6)
Block - Borders - None	(block_borders 0)

Format

- - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + +

Format - Margins	(change_margins "")
Format - Paper Size	(change_paper_size "")
Format - Header and Footer	(change_headfoot "")
Format - First Page Number	(change_first_page "")
Format - Column Width - Set	(set_cell_width)
Format - Column Width - Fit Block	(fit_block_width)
Format - Column Width - Set Default	(set_standard_width)
Format - Row Height - Set	(set_cell_height)
Format - Row Height - Fit Block	(fit_block_height)
Format - Row Height - Set Default	(set_standard_height)
Format - Set Default Format	(set_standard_format)
Format - Font	(new_attribute "family")
Format - Style	(new_attribute "style")
Format - Define Style	(define_style)
Format - Foreground Color	(new_attribute "fg")
Format - Background Color	(new_attribute "bg")
Format - Margins	(change_margins "")
Format - Paper Size	(change_paper_size "")
Format - Header and Footer	(change_headfoot "")
Format - First Page Number	(change_first_page "")
Format - Column Width - Set	(set_cell_width)
Format - Column Width - Fit Block	(fit_block_width)
Format - Column Width - Set Default	(set_standard_width)
Format - Row Height - Set	(set_cell_height)
Format - Row Height - Fit Block	(fit_block_height)
Format - Row Height - Set Default	(set_standard_height)
Format - Set Default Format	(set_standard_format)
Format - Font	(new_attribute "family")
Format - Style	(new_attribute "style")
Format - Define Style	(define_style)
Format - Foreground Color	(new_attribute "fg")
Format - Background Color	(new_attribute "bg")

Data

- - - - - - - + + + + + + +

Data - Edit Record	(data_record_edit (position_row (get_point)))
Data - Data Entry	(data_entry)
Data - Siag-net	(siag_net 8080)
Data - Enter Date	(enter_date)
Data - Enter Time	(enter_time)
Data - Identify Cell	(what_cursor_position)
Data - Recalculate	(recalc_matrix)
Data - Edit Record	(data_record_edit (position_row (get_point)))
Data - Data Entry	(data_entry)
Data - Siag-net	(siag_net 8080)
Data - Enter Date	(enter_date)
Data - Enter Time	(enter_time)
Data - Identify Cell	(what_cursor_position)
Data - Recalculate	(recalc_matrix)

Window

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Window - Zoom	(zoom_adjust)
Window - Change Buffer	(switch_to_buffer)
Window - Delete Buffer	(kill_buffer 1)
Window - Split Window	(split_window_vertically)
Window - Remove Window	(delete_window)
Window - One Window	(delete_other_windows)
Window - Change Window	(other_window)
Window - Add Sheet	(add_sheet)
Window - Remove Sheet	(remove_sheet)
Window - Rename Sheet	(rename_sheet)
Window - Move Sheet - Up	(move_sheet_up)
Window - Move Sheet - Down	(move_sheet_down)
Window - Move Sheet - Top	(move_sheet_top)
Window - Move Sheet - Bottom	(move_sheet_bottom)
Window - Protect Cells	(protect_cells)
Window - Remove Protection	(remove_protection)
Window - Go To - Beginning of buffer	(beginning_of_buffer)
Window - Go To - End of buffer	(end_of_buffer)
Window - Go To - Top of buffer	(top_of_buffer)
Window - Go To - Bottom of buffer	(bottom_of_buffer)
Window - Go To - Cell	(go_to)
Window - Grid Lines - Show	(grid_lines 1)
Window - Grid Lines - Hide	(grid_lines 0)
Window - Reference Style - R1C1	(a1_refs_set 0)
Window - Reference Style - A1	(a1_refs_set 1)
Window - Helptexts - Disable	(tooltip_set 0)
Window - Helptexts - Label	(tooltip_set 1)
Window - Helptexts - Popup	(tooltip_set 2)
Window - Helptexts - Both	(tooltip_set 3)
Window - Save Preferences	(save_preferences)
Window - Zoom	(zoom_adjust)
Window - Change Buffer	(switch_to_buffer)
Window - Delete Buffer	(kill_buffer 1)
Window - Split Window	(split_window_vertically)
Window - Remove Window	(delete_window)
Window - One Window	(delete_other_windows)
Window - Change Window	(other_window)
Window - Add Sheet	(add_sheet)
Window - Remove Sheet	(remove_sheet)
Window - Rename Sheet	(rename_sheet)
Window - Move Sheet - Up	(move_sheet_up)
Window - Move Sheet - Down	(move_sheet_down)
Window - Move Sheet - Top	(move_sheet_top)
Window - Move Sheet - Bottom	(move_sheet_bottom)
Window - Protect Cells	(protect_cells)
Window - Remove Protection	(remove_protection)
Window - Go To - Beginning of buffer	(beginning_of_buffer)
Window - Go To - End of buffer	(end_of_buffer)
Window - Go To - Top of buffer	(top_of_buffer)
Window - Go To - Bottom of buffer	(bottom_of_buffer)
Window - Go To - Cell	(go_to)
Window - Grid Lines - Show	(grid_lines 1)
Window - Grid Lines - Hide	(grid_lines 0)
Window - Reference Style - R1C1	(a1_refs_set 0)
Window - Reference Style - A1	(a1_refs_set 1)
Window - Helptexts - Disable	(tooltip_set 0)
Window - Helptexts - Label	(tooltip_set 1)
Window - Helptexts - Popup	(tooltip_set 2)
Window - Helptexts - Both	(tooltip_set 3)
Window - Save Preferences	(save_preferences)

Plot

- - - + + +

Plot - Plugin	(plot_plugin "lines")
Plot - Surface	(splot "lines")
Plot - Wizard	(plot_wizard)
Plot - Plugin	(plot_plugin "lines")
Plot - Surface	(splot "lines")
Plot - Wizard	(plot_wizard)

Tools

- - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + +

Tools - Command - SIOD	(exec-siod)
Tools - Command - C	(exec-c)
Tools - Command - Tcl	(exec-tcl)
Tools - Command - Guile	(exec-guile)
Tools - Command - Python	(exec-python)
Tools - Pathetic Writer	(spawn "pw")
Tools - Scheme In A Grid	(spawn "siag")
Tools - Egon Animator	(spawn "egon")
Tools - Terminal	(spawn terminal-command)
Tools - Editor	(spawn editor-command)
Tools - File Manager	(spawn filer-command)
Tools - Calculator	(spawn calculator-command)
Tools - Environment - Defaults	(set-environment "Defaults")
Tools - Environment - KDE	(set-environment "KDE")
Tools - Environment - CDE	(set-environment "CDE")
Tools - Environment - Gnome	(set-environment "Gnome")
Tools - Environment - Custom	(edit-applications)
Tools - Applets - Webserver	(webserver)
Tools - Applets - Mail	(mailto)
Tools - Applets - File Manager	(filemgr)
Tools - Form Test - Test 1	(form_test)
Tools - Form Test - Test 2	(form_test2)
Tools - Form Test - Test 3	(form_test3)
Tools - Command - SIOD	(exec-siod)
Tools - Command - C	(exec-c)
Tools - Command - Tcl	(exec-tcl)
Tools - Command - Guile	(exec-guile)
Tools - Command - Python	(exec-python)
Tools - Pathetic Writer	(spawn "pw")
Tools - Scheme In A Grid	(spawn "siag")
Tools - Egon Animator	(spawn "egon")
Tools - Terminal	(spawn terminal-command)
Tools - Editor	(spawn editor-command)
Tools - File Manager	(spawn filer-command)
Tools - Calculator	(spawn calculator-command)
Tools - Environment - Defaults	(set-environment "Defaults")
Tools - Environment - KDE	(set-environment "KDE")
Tools - Environment - CDE	(set-environment "CDE")
Tools - Environment - Gnome	(set-environment "Gnome")
Tools - Environment - Custom	(edit-applications)
Tools - Applets - Webserver	(webserver)
Tools - Applets - Mail	(mailto)
Tools - Applets - File Manager	(filemgr)
Tools - Form Test - Test 1	(form_test)
Tools - Form Test - Test 2	(form_test2)
Tools - Form Test - Test 3	(form_test3)

Plugin

- - - - - - - - - - - - + + + + + + + + + + + +

Plugin - Import	(plugin_import nil)
Plugin - Export	(plugin_export)
Plugin - Link	(plugin_link nil)
Plugin - Delete	(plugin_delete)
Plugin - Move	(plugin_move)
Plugin - Resize	(plugin_resize)
Plugin - App - Xclock	(plugin_import "xclock.run")
Plugin - App - Xterm	(plugin_import "xterm.run")
Plugin - App - Xload	(plugin_import "xload.run")
Plugin - App - Siag	(plugin_import "PLuGiN.siag")
Plugin - App - PW	(plugin_import "PLuGiN.pw")
Plugin - App - Hello World	(plugin_import "x.hello")
Plugin - Import	(plugin_import nil)
Plugin - Export	(plugin_export)
Plugin - Link	(plugin_link nil)
Plugin - Delete	(plugin_delete)
Plugin - Move	(plugin_move)
Plugin - Resize	(plugin_resize)
Plugin - App - Xclock	(plugin_import "xclock.run")
Plugin - App - Xterm	(plugin_import "xterm.run")
Plugin - App - Xload	(plugin_import "xload.run")
Plugin - App - Siag	(plugin_import "PLuGiN.siag")
Plugin - App - PW	(plugin_import "PLuGiN.pw")
Plugin - App - Hello World	(plugin_import "x.hello")

Help

- - - - - - - + + + + + + +

Help - Contents	(help_contents)
Help - Copying	(help_copyright)
Help - Help for Help	(help_for_help)
Help - Links - Siag Home	(do_link "http://siag.nu/")
Help - Links - FTP Directory	(do_link "ftp://siag.nu/pub/siag/")
Help - About Siag...	(aboutbox)
Help - About Siag Office...	(aboutsiag)
Help - Contents	(help_contents)
Help - Copying	(help_copyright)
Help - Help for Help	(help_for_help)
Help - Links - Siag Home	(do_link "http://siag.nu/")
Help - Links - FTP Directory	(do_link "ftp://siag.nu/pub/siag/")
Help - About Siag...	(aboutbox)
Help - About Siag Office...	(aboutsiag)

Shortcuts

- - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + +

Shortcuts - Open	(load_buffer)
Shortcuts - Save	(save_buffer_as)
Shortcuts - Undo	(undo_restore)
Shortcuts - Delete	(delete_cell)
Shortcuts - Label	(edit_label)
Shortcuts - Expression - C	(edit_c)
Shortcuts - Expression - SIOD	(edit_siod)
Shortcuts - Expression - Guile	(edit_guile)
Shortcuts - Expression - Tcl	(edit_tcl)
Shortcuts - Expression - Python	(edit_python)
Shortcuts - Command	(exec_siod)
Shortcuts - Sum	(block_sum)
Shortcuts - Plugin - Import	(plugin_import)
Shortcuts - Plugin - Export	(plugin_export)
Shortcuts - Plugin - Link	(plugin_link)
Shortcuts - Plugin - Delete	(plugin_delete)
Shortcuts - Plugin - Move	(plugin_move)
Shortcuts - Help	(help_contents)
Shortcuts - Quit	(quit_program)
Shortcuts - Open	(load_buffer)
Shortcuts - Save	(save_buffer_as)
Shortcuts - Undo	(undo_restore)
Shortcuts - Delete	(delete_cell)
Shortcuts - Label	(edit_label)
Shortcuts - Expression - C	(edit_c)
Shortcuts - Expression - SIOD	(edit_siod)
Shortcuts - Expression - Guile	(edit_guile)
Shortcuts - Expression - Tcl	(edit_tcl)
Shortcuts - Expression - Python	(edit_python)
Shortcuts - Command	(exec_siod)
Shortcuts - Sum	(block_sum)
Shortcuts - Plugin - Import	(plugin_import)
Shortcuts - Plugin - Export	(plugin_export)
Shortcuts - Plugin - Link	(plugin_link)
Shortcuts - Plugin - Delete	(plugin_delete)
Shortcuts - Plugin - Move	(plugin_move)
Shortcuts - Help	(help_contents)
Shortcuts - Quit	(quit_program)

This listing was generated automatically from the file @@ -239,6 +239,6 @@ Description of the Scheme interface.

Ulric Eriksson - August 2000 - ulric@siag.nu

Ulric Eriksson - November 2000 - ulric@siag.nu

diff -urNP ../siag-3.4.3/siag/docs/keys.html ./siag/docs/keys.html --- ../siag-3.4.3/siag/docs/keys.html Tue Aug 15 16:14:03 2000 +++ ./siag/docs/keys.html Wed Nov 8 01:19:17 2000 @@ -9,118 +9,118 @@ Here are the standard keybindings.

This listing was generated automatically from the file diff -urNP ../siag-3.4.3/siag/docs/siag-functions.html ./siag/docs/siag-functions.html --- ../siag-3.4.3/siag/docs/siag-functions.html Wed Sep 6 03:19:43 2000 +++ ./siag/docs/siag-functions.html Wed Nov 8 01:17:07 2000 @@ -6,14 +6,23 @@

Function Reference

abs +
acos
acosh
address
and +
ash +
asin
asinh +
atan +
atan2 +
atan_2
atanh
avedev
average
averagea +
base64decode +
base64encode
besseli
besselj
besselk @@ -25,6 +34,7 @@
bin2oct
binomdist
cbrt +
cc_solv
ceil
ceiling
char @@ -38,12 +48,15 @@
concatenate
confidence
convert +
cos
cosh
count
counta
countblank
countif
critbinom +
crypt +
currency_rate
datevalue
daverage
day @@ -52,6 +65,7 @@
dec2bin
dec2hex
dec2oct +
define
degrees
delta
devsq @@ -73,6 +87,7 @@
euro
even
exact +
exp
expm_1
expondist
fabs @@ -84,6 +99,7 @@
fisherinv
fixed
floor +
fmod
fv
g_product
gammadist @@ -92,11 +108,22 @@
gcd
geomean
gestep +
get_cell +
getcwd +
getenv +
getgid +
gethostid +
gethostname +
getpgrp +
getpid +
getppid +
getuid
hex2bin
hex2dec
hex2oct
hlookup
hour +
href
hyperlink
hypgeomdist
hypot @@ -118,6 +145,7 @@
imsub
imsum
imtan +
inet_addr
info
int
isblank @@ -138,20 +166,25 @@
lcm
left
len +
length
lgamma
ln +
log
log1p
log_10
log_2
loginv
lognormdist
lower +
max
maxa
median +
min
mina
minute
mmult
mod +
month
mpf_abs
mpf_add
mpf_ceil @@ -219,11 +252,73 @@
mpz_tdiv_r_2exp
mpz_tstbit
mpz_xor +
mround +
n +
negbinomdist +
nominal +
normdist +
norminv +
normsdist +
normsinv +
not +
now +
nper +
oct2bin +
oct2dec +
oct2hex +
odd +
or +
permut +
pi +
pmt +
poisson +
pow
pow_10
pow_2 +
power +
ppmt +
product +
pv +
pwr +
quotient +
r_avg +
r_max +
r_min +
r_sum +
radians +
rand +
randbernoulli +
randbetween +
randbinom +
randexp +
randnegbinom +
random +
randpoisson +
realtime +
rept +
roman +
round +
rounddown +
roundup +
rows +
second
siag_colsum
siag_rowsum +
sign +
sin
sinh +
siod +
skew +
skewp +
sln +
small +
sqrt +
sqrtpi +
standardize +
stdev +
stdeva +
stdevp +
stdevpa
stock_max
stock_min
stock_open @@ -232,12 +327,73 @@
stock_var
stock_volume
stock_yesterday +
strcmp +
strcspn +
strspn +
substring +
sum +
suma +
sumif +
sumproduct +
sumsq +
sumx2my2 +
sumx2py2 +
sumxmy_2 +
sxhash +
syd +
tan
tanh +
tbilleq +
tbillprice +
tbillyield +
tdist +
time +
timevalue +
tinv +
totalheight +
totalwidth +
transpose +
trunc +
upper +
var +
vara +
varp +
varpa +
vref +
weekday +
weibull
y_0
y_1 +
year
yn

Synopsis

+ash(value, bits) +

Description

+Arithmetic shift of value a given number of bits to the left (positive) +or right (negative). +

Examples

+ash(1, 2) returns 4. +

asin

Synopsis

+asin(x) +

Description

+Returns the inverse sin of x. +

Examples

+ +

asinh

Top

Synopsis

+cc_solv(a, b, n) +

Description

+ Solve a general linear system A*x = b. +

+ int solv(double a[],double b[],int n) +

+ a = array containing system matrix A in row order + (altered to L-U factored form by computation) +

+ b = array containing system vector b at entry and + solution vector x at exit +

cosh

Top

+ +

define

Synopsis

+define(variable, value) +

Description

+A special form used to assign a value to a variable: +

+ define(variable, value) +

+get_cell(row, column, [sheet]) +

Description

+Returns the value in the specified row and column. If a sheet is + specified, it is used. Otherwise the current sheet is used. +

Examples

+get_cell(2, 3) returns the value in row 2, column 3 in the current sheet. +

Synopsis

+month(serial_number) +

Description

+Converts a serial number to a month. +

Examples

+ +

mpf_abs

Synopsis

@@ -4406,288 +4990,2082 @@

Synopsis

-siag_colsum(c1, c2) +negbinomdist(f,t,p)

Description

-Returns the sum of all cells on the current row from column c1 to c2. +negbinomdist returns the negative binomial distribution. f + is the number of failures, t is the threshold number of successes, + and p is the probability of a success. +

+ If f or t is a non-integer it is truncated. If (f + t -1) <= 0 + negbinomdist returns error. If p < 0 or p > 1 negbinomdist + returns error. Excel compatible.

Examples

- +negbinomdist(2,5,0.55) equals 0.152872629.

siag_rowsum

+ +

nominal

Synopsis

-siag_rowsum(r1, r2) +nominal(rate, nper)

Description

-Returns the sum of all cells in the current column from row r1 to r2. +NOMINAL calculates the nominal interest rate from a given effective + rate. +

+ Nominal interest rate is given by a formula: +

+ nper * (( 1 + r ) ^ (1 / nper) - 1 ) +

+ where: +

+ r = effective interest rate +

+ nper = number of periods used for compounding

Examples

sinh

+ +

normdist

Synopsis

-sinh(x) +normdist(x,mean,stdev,cumulative)

Description

- SINH function returns the hyperbolic sine of x, which is defined - mathematically as (exp(x) - exp(-x)) / 2. -Excel compatible. +normdist returns the normal cumulative distribution. x is + the value for which you want the distribution, mean is the mean of + the distribution, stdev is the standard deviation. +

+ If stdev is 0 normdist returns error. This function is Excel + compatible.

Examples

- SINH(0.5) equals 0.521095. +normdist(2,1,2,0) equals 0.176032663.

stock_max

+ +

norminv

Description

-Fetches stock information from Yahoo over the Internet. +normsinv returns the inverse of the standard normal + cumulative distribution. p is the given probability corresponding to + the normal distribution. Excel compatible. +

+ If p < 0 or p > 1 normsinv returns error.

Examples

-stock_open("ABB.ST") +normsinv(0.2) equals -0.841621234.

stock_percent

+ +

not

Synopsis

-stock_percent(symbol) +not(number)

Description

-Fetches stock information from Yahoo over the Internet. +NOT implements the logical NOT function: the result is TRUE if the + number is zero; otherwise the result is FALSE. +

+ Excel compatible. + The name of this function is @NOT, to avoid clash with Scheme.

Examples

-stock_percent("ABB.ST") +NOT(0) equals TRUE. +

+ NOT(TRUE) equals FALSE.

stock_price

+ +

now

oct2bin

+ b1, trough bN are expressions that should evaluate to TRUE or FALSE. + If an integer or floating point value is provided zero is considered + FALSE and anything else is TRUE. +

+ If the values contain strings or empty cells those values are ignored. + If no logical values are provided, then an error is returned. + Excel compatible. The name of the function is @OR.

Examples

- +OR(TRUE,FALSE) equals TRUE. +

+ OR(3>4,4<3) equals FALSE.

permut

Synopsis

+permut(n,k) +

Description

+PERMUT returns the number of permutations. n is the number + of objects, k is the number of objects in each permutation. +

+ If n = 0 PERMUT returns error. If n < k PERMUT returns + error. Excel compatible. +

Examples

+PERMUT(7,3) equals 210. +

pi

Synopsis

+pi() +

Description

+PI functions returns the value of Pi. +

+ This function is called with no arguments. Excel + compatible. +

Examples

+PI() equals 3.141593. +

pmt

Synopsis

+pmt(rate,nper,pv[,fv,type]) +

Description

+XXX: Below is a PV function description!PMT calculates the present + value of an investment. +

Examples

+ +

poisson

Synopsis

+poisson(x,mean,cumulative) +

Description

Description

+POWER returns the value of x raised to the power y. + Excel compatible. +

Examples

+POWER(2,7) equals 128. +

+ POWER(3,3.141) equals 31.523749. +

ppmt

Synopsis

+ppmt(rate,per,nper,pv[,fv,type]) +

Description

+PPMT calculates the amount of a payment of an annuity going towards + principal. +

+ Formula for it is: +

+ PPMT(per) = PMT - IPMT(per) +

+randexp(b) +

Description

+RandExp returns a exponentially distributed random number. +

Examples

+RandExp(0.5). +

randnegbinom

Synopsis

+randnegbinom(p,failures) +

Description

Description

Examples

+Let us assume that the cells A1, A2, ..., A5 contain numbers 11.4, + 17.3, 21.3, 25.9, and 40.1. Then +

+ SKEW(A1..A5) equals 0.976798268. +

skewp

Synopsis

+skewp(n1, n2, ...) +

Description

+SKEWP returns the population skewness of a data set. +

+ Strings and empty cells are simply ignored. +

+ If less than two numbers are given, SKEWP returns error. +

Examples

+Let us assume that the cells A1, A2, ..., A5 contain numbers 11.4, + 17.3, 21.3, 25.9, and 40.1. Then +

+ SKEWP(A1..A5) equals 0.655256198. +

sln

Synopsis

+sln(cost,salvage_value,life) +

Description

+The SLN function will determine the straight line depreciation of an + asset for a single period. The amount you paid for the asset is the + cost, salvage is the value of the asset at the end of its useful + life, and life is the number of periods over which an the asset is + depreciated. This method of deprecition devides the cost evenly over + the life of an asset. +

+ The formula used for straight line depriciation is: +

+ Depriciation expense = ( cost - salvage_value ) / life +

+ cost = cost of an asset when acquired (market value). salvage_value + = amount you get when asset sold at the end of the assets's useful + life. life = anticipated life of an asset. +

Examples

+For example, lets suppose your company purchases a new machine for + $10,000, which has a salvage value of $700 and will have a useful life + of 10 years. The SLN yearly depreciation is computed as follows: +

+ =SLN(10000, 700, 10) +

+ This will return the yearly depreciation figure of $930. +

small

Synopsis

+small(n1, n2, ..., k) +

Description

+SMALL returns the k-th smallest value in a data set. +

+standardize(x, mean, stddev) +

Description

+STANDARDIZE returns a normalized value. x is the number to + be normalized, mean is the mean of the distribution, stddev is the + standard deviation of the distribution. +

+ If stddev is 0 STANDARDIZE returns error. This function is + Excel compatible. +

Examples

+Let us assume that the cells A1, A2, ..., A5 contain numbers 11, 15, + 17, 21, and 43. Then +

+ SUM(A1..A5) equals 107. +

suma

Synopsis

+suma(value1, value2, ...) +

Description

+SUMA computes the sum of all the values and cells referenced in the + argument list. Numbers, text and logical values are included in the + calculation too. If the cell contains text or the argument evaluates + to FALSE, it is counted as value zero (0). If the argument evaluates + to TRUE, it is counted as one (1). Since logical values are numbers + in Siag, this function is identical to sum. +

Examples

+Let us assume that the cells A1, A2, ..., A5 contain numbers 11, 15, + 17, 21, and 43. Then +

+ SUMA(A1..A5) equals 107. +

sumif

Synopsis

+sumif(range,criteria[,actual_range]) +

Description

+SUMIF sums the values in the given range that meet the given + criteria. If actual_range is given, SUMIF sums the values in the + actual_range whose corresponding components in range meet the given + criteria. Excel compatible. +

Examples

+Let us assume that the cells A1, A2, ..., A5 contain numbers 23, 27, + 28, 33, and 39. Then +

+ SUMIF(A1..A5,"<=28") equals 78. +

+ SUMIF(A1..A5,"<28") equals 50. +

+ In addition, if the cells B1, B2, ..., B5 hold numbers 5, 3, 2, 6, and + 7 then: +

+ SUMIF(A1..A5,"<=27",B1..B5) equals 8. +

sumproduct

Synopsis

+sumproduct(range1,range2,...) +

Description

+SUMPRODUCT multiplies corresponding data entries in the given + arrays or ranges, and then returns the sum of those products. If an + array entry is not numeric, the value zero is used instead. +

+ If arrays or range arguments do not have the same dimentions, + SUMPRODUCT returns error. Excel compatible. +

Examples

+Let us assume that the cells A1, A2, ..., A5 contain numbers 11, 15, + 17, 21, and 43 and the cells B1, B2, ..., B5 hold numbers 13, 22, 31, + 33, and 39. Then +

+ SUMPRODUCT(A1..A5,B1..B5) equals 3370. +

sumsq

Description

+Computes a recursive hash of the data with respect to the specified +modulus. +

Examples

+ +

syd

Synopsis

+syd(cost,salvage_value,life,period) +

Description

+The SYD function calculates the sum-of-years digits depriciation for + an asset based on its cost, salvage value, anticipated life and a + particular period. This method accelerates the rate of the + depreciation, so that more depreciation expense occurs in earlier + periods than in later ones. The depreciable cost is the actual cost + minus the salvage value. The useful life is the number of periods + (typically years) over with the asset is depreciated. +

+ The Formula used for sum-of-years digits depriciation is: +

+ Depriciation expense = ( cost - salvage_value ) * (life - period + + 1) * 2 / life * (life + 1). +

+ cost = cost of an asset when acquired (market value). salvage_value + = amount you get when asset sold at the end of its useful life. life + = anticipated life of an asset. period = period for which we need the + expense. +

Examples

+For example say a company purchases a new computer for $5000 which has + a salvage value of $200, and a useful life of three years. We would + use the following to calculate the second year's depreciation using + the SYD method: +

+ =SYD(5000, 200, 5, 2) which returns 1,280.00. +

tan

Synopsis

+tan(x) +

Description

+Computes the tagent of the angle x specified in radians. +

Examples

+ +

tanh

Synopsis

+tanh(x) +

+Returns a number representing the time of day. +

Examples

+ +

timevalue

Synopsis

+timevalue(timetext) +

Description

+Returns a number representing the time of day, a number between 0 + and 86400. +

Examples

+ +

tinv

Synopsis

+tinv(p,dof) +

Description

Description

+VAR estimates the variance of a sample of a population. To get the + true variance of a complete population use VARP. +

+ (VAR is also known as the N-1-variance. Under reasonable conditions, + it is the maximum-likelihood estimator for the true variance.)This + function is Excel compatible. +

Examples

+Let us assume that the cells A1, A2, ..., A5 contain numbers 11.4, + 17.3, 21.3, 25.9, and 40.1. Then +

+ VAR(A1..A5) equals 117.64. +

vara

Synopsis

+vara(number1,number2,...) +

Description

+VARA returns the variance based on a sample. Numbers, text and logical + values are included in the calculation too. If the cell contains text + or the argument evaluates to FALSE, it is counted as value zero (0). + If the argument evaluates to TRUE, it is counted as one (1). Note that + empty cells are not counted. Excel compatible. +

Examples

+Let us assume that the cells A1, A2, ..., A5 contain numbers and + strings 11.4, 17.3, "missing", 25.9, and 40.1. Then +

+ VARA(A1..A5) equals 228.613. +

varp

Synopsis

+varp(b1, b2, ...) +

Description

+VARP calculates the variance of a set of numbers where each number is + a member of a population and the set is the entire population. +

+ (VARP is also known as the N-variance.) +

Examples

+Let us assume that the cells A1, A2, ..., A5 contain numbers 11.4, + 17.3, 21.3, 25.9, and 40.1. Then +

+ VARP(A1..A5) equals 94.112. +

varpa

Synopsis

+varpa(number1,number2,...) +

Description

+VARPA returns the variance based on the entire population. Numbers, + text and logical values are included in the calculation too. If the + cell contains text or the argument evaluates to FALSE, it is counted + as value zero (0). If the argument evaluates to TRUE, it is counted as + one (1). Note that empty cells are not counted. This function is Excel + compatible. +

Examples

-Ulric Eriksson - September 2000 - ulric@siag.nu +Ulric Eriksson - November 2000 - ulric@siag.nu diff -urNP ../siag-3.4.3/siag/fileio_siag.c ./siag/fileio_siag.c --- ../siag-3.4.3/siag/fileio_siag.c Sat Aug 12 20:39:41 2000 +++ ./siag/fileio_siag.c Sat Nov 11 02:36:20 2000 @@ -258,6 +258,9 @@ fprintf(fp, "%d %d %d\tm%s\n", i, j, fmt, ret_text(buf, s, i, j)); break; + case MNUMBER: + case MTEXT: + break; /* not stored at all */ /* ERRORs and CONSTANTs are stored as EXPRESSION */ default: /* EXPRESSION */ /* Special case SIOD and C for backward compatibility. */ diff -urNP ../siag-3.4.3/siag/functions.scm ./siag/functions.scm --- ../siag-3.4.3/siag/functions.scm Mon Oct 30 09:04:13 2000 +++ ./siag/functions.scm Wed Nov 8 01:09:07 2000 @@ -5408,7 +5408,7 @@ ; ; If ref contains less than two data items ZTEST returns error. ; Excel compatible. -;@Let us assume that the cells A1, A2,... A5 contain numbers 11.4, +;XXX@Let us assume that the cells A1, A2,... A5 contain numbers 11.4, ; 17.3, 21.3, 25.9, and 40.1. Then ; ; ZTEST(A1..A5,20) equals 0.254717826. diff -urNP ../siag-3.4.3/siag/lago.c ./siag/lago.c --- ../siag-3.4.3/siag/lago.c Thu Jan 1 01:00:00 1970 +++ ./siag/lago.c Mon Nov 13 13:43:25 2000 @@ -0,0 +1,105 @@ +/* + Siag, Scheme In A Grid + Copyright (C) 2000 Ulric Eriksson + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, + MA 02111-1307, USA. + */ + +#include "../config.h" + +#ifdef HAVE_LIBLAGO + +/* Highly experimental! */ + +#include +#include +#include +#include "../siod/siod.h" +#include "calc.h" + +static char *host = "127.0.0.1"; +static char *port = "7412"; +static char *database = "siag"; +static char *user = "siag"; +static char *password = "siag"; + +static LISP store_result(buffer *buf, int sht, int row, int col, LRST resultset) +{ + int i, n; + cval val; + char *p; + LISP res = NIL; + + val.number = 0; + if (resultset == 0) return NIL; + n = Lgetncols(resultset); + if (n == 0) printf("no columns in resultset\n"); + + while (Lfetch(resultset) == LFETCH_MORE) { + for (i = 1; i <= n; i++) { + p = (char *)Lgetasstr(resultset, i); + if (res == NIL) { + res = strcons(strlen(p), p); + } else { + ins_data(buf, siod_interpreter, + p, val, MTEXT, sht, row, col+i-1); + } + } + row++; + } + return res; +} + +static LISP lago_query(LISP query) +{ + int row, col, sht; + buffer *buf; + int n; + char *q = get_c_string(query); + LCTX context = Lnewctx(); + LRST resultset; + LISP res; + get_siod_coords(&row, &col, &sht, &buf); + n = Lconnect(context, host, port, database, user, password); + if (n) { + Ldelctx(context); + return NIL; + } + + resultset = Lquery(context, q); + if (resultset == 0) { + Ldelctx(context); + return NIL; + } + res = store_result(buf, sht, row, col, resultset); + Ldelctx(context); + return res; +} + +void init_lago(void) +{ + init_subr_1("lago_query", lago_query); +} + +#else + +void init_lago(void) +{ + ; +} + +#endif /* LAGO */ + diff -urNP ../siag-3.4.3/siag/main.c ./siag/main.c --- ../siag-3.4.3/siag/main.c Sun Oct 8 22:35:47 2000 +++ ./siag/main.c Fri Nov 10 16:58:18 2000 @@ -52,6 +52,8 @@ extern void init_stocks(void); /* stocks.c */ extern void init_gmp(void); /* gmp.c */ extern void init_ccmath(void); /* ccmath.c */ +extern void init_lago(void); /* lago.c */ +extern void init_mysql(void); /* mysql.c */ extern void init_mathfunc(void); /* mathfunc.c */ static char *siagrc; @@ -119,6 +121,8 @@ init_stocks(); init_gmp(); init_ccmath(); + init_lago(); + init_mysql(); init_mathfunc(); buf = new_buffer("noname.siag", "noname.siag"); diff -urNP ../siag-3.4.3/siag/matrix.c ./siag/matrix.c --- ../siag-3.4.3/siag/matrix.c Sat Aug 12 20:39:41 2000 +++ ./siag/matrix.c Sun Nov 12 04:40:04 2000 @@ -490,7 +490,7 @@ if (type == ERROR) { return strcpy(buf, "ERROR"); } - if (type == LABEL || type == EMBED) { + if (type == LABEL || type == EMBED || type == MTEXT) { return strncpy(buf, ret_text(b, s, row, col), 1000); } @@ -746,18 +746,18 @@ int tr = ret_type(b, s, r1+1, c1); int tc = ret_type(b, s, r1, c1+1); - af = ((type == EXPRESSION || type == CONSTANT) - && (r1 == r2 || tr == EXPRESSION || tr == CONSTANT) - && (c1 == c2 || tc == EXPRESSION || tc == CONSTANT)); + af = (IS_NUMBER(type) + && (r1 == r2 || IS_NUMBER(tr)) + && (c1 == c2 || IS_NUMBER(tc))); - if (type == EXPRESSION || type == CONSTANT) { + if (IS_NUMBER(type)) { d1 = value.number; /* figure out row delta */ - if (tr == EXPRESSION || tr == CONSTANT) { + if (IS_NUMBER(tr)) { d2 = ret_val(b, s, r1+1, c1).number; dr = d2-d1; } - if (tc == EXPRESSION || tc == CONSTANT) { + if (IS_NUMBER(tc)) { d2 = ret_val(b, s, r1, c1+1).number; dc = d2-d1; } diff -urNP ../siag-3.4.3/siag/mysql.c ./siag/mysql.c --- ../siag-3.4.3/siag/mysql.c Thu Jan 1 01:00:00 1970 +++ ./siag/mysql.c Mon Nov 13 13:43:08 2000 @@ -0,0 +1,109 @@ +/* + Siag, Scheme In A Grid + Copyright (C) 2000 Ulric Eriksson + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, + MA 02111-1307, USA. + */ + +#include "../config.h" + +#ifdef HAVE_LIBMYSQLCLIENT + +/* Highly experimental! */ + +#include +#include +#include +#include "../siod/siod.h" +#include "calc.h" + +static char *host = "127.0.0.1"; +static char *database = "siag"; +static char *user = "siag"; +static char *password = "siag"; + +#define FAIL(m, p) {\ + fprintf(stderr, "error '%s': %s\n", p, mysql_error(m));\ + return NIL;\ +} + +static LISP store_result(buffer *buf, int sht, int row, int col, MYSQL *mysql) +{ + int i, n; + cval val; + char *p; + LISP res = NIL; + MYSQL_RES *mysql_res; + MYSQL_FIELD *mysql_field; + MYSQL_ROW mysql_row; + + val.number = 0; + if (mysql == NULL) FAIL(mysql, "mysql is null"); + mysql_res = mysql_store_result(mysql); + n = mysql_field_count(mysql); + if (n == 0) FAIL(mysql, "no columns in result"); + + while ((mysql_row = mysql_fetch_row(mysql_res))) { + for (i = 0; i < n; i++) { + p = (char *)mysql_row[i]; + if (res == NIL) { + res = strcons(strlen(p), p); + } else { + ins_data(buf, siod_interpreter, + p, val, MTEXT, sht, row, col+i); + } + } + row++; + } + mysql_free_result(mysql_res); + return res; +} + +static LISP lmysql_query(LISP query) +{ + int row, col, sht; + buffer *buf; + char *q = get_c_string(query); + MYSQL mysql; + LISP res; + + get_siod_coords(&row, &col, &sht, &buf); + mysql_init(&mysql); + if (!mysql_real_connect(&mysql, host, user, password, + database, 0, NULL, 0)) + FAIL(&mysql, "connect"); + + if (mysql_real_query(&mysql, q, strlen(q))) + FAIL(&mysql, "query"); + res = store_result(buf, sht, row, col, &mysql); + mysql_close(&mysql); + return res; +} + +void init_mysql(void) +{ + init_subr_1("mysql_query", lmysql_query); +} + +#else + +void init_mysql(void) +{ + ; +} + +#endif /* MYSQL */ + diff -urNP ../siag-3.4.3/siag/railway.c ./siag/railway.c --- ../siag-3.4.3/siag/railway.c Sat Aug 12 20:39:41 2000 +++ ./siag/railway.c Sun Nov 12 05:47:27 2000 @@ -182,16 +182,32 @@ register int row, col; int lc; int lastr; + int t; + + cval value; + value.number = 0; errorflag = FALSE; lastr = 1; + + /* delete transient matrix and db tables */ + for (row = 1; row <= line_last_used(b, s); row++) { + lc = col_last_used(b, s, row); + for (col = 1; col <= lc; col++) { + t = ret_type(b, s, row, col); + if (t == MNUMBER || t == MTEXT) { + ins_data(b, siod_interpreter, NULL, + value, EMPTY, s, row, col); + /* don't change the cell's format */ + } + } + } /* we must call line_last_used for every line, because it is possible that functions have been stuffing cells */ for (row = 1; row <= line_last_used(b, s); row++) { lc = col_last_used(b, s, row); for (col = 1; col <= lc; col++) { switch (ret_type(b, s, row, col)) { - cval value; case STRING: case EXPRESSION: case ERROR: @@ -207,6 +223,8 @@ break; case LABEL: case CONSTANT: + case MTEXT: + case MNUMBER: lastr = row; break; default: diff -urNP ../siag-3.4.3/siag/siag.scm ./siag/siag.scm --- ../siag-3.4.3/siag/siag.scm Wed Oct 25 22:02:22 2000 +++ ./siag/siag.scm Sat Nov 11 03:07:19 2000 @@ -40,6 +40,8 @@ (define EXPRESSION 4) (define STRING 5) (define EMBED 6) +(define MNUMBER 7) +(define MTEXT 8) (setq P-MIN (make-position 1 1)) (setq P-MAX (make-position 100000 100000)) @@ -326,7 +328,9 @@ (cons CONSTANT "CONSTANT") (cons EXPRESSION "EXPRESSION") (cons STRING "STRING") - (cons EMBED "EMBED"))) + (cons EMBED "EMBED") + (cons MNUMBER "MNUMBER") + (cons MTEXT "MTEXT"))) (define (type->string type) (or diff -urNP ../siag-3.4.3/siag/siodi.c ./siag/siodi.c --- ../siag-3.4.3/siag/siodi.c Thu Oct 12 23:08:45 2000 +++ ./siag/siodi.c Sat Nov 11 03:03:57 2000 @@ -562,7 +562,6 @@ static LISP lset_array_value(LISP row, LISP col, LISP value) { cval val; - int type = CONSTANT; int r = get_c_long(row), c = get_c_long(col); char i[100]; @@ -570,9 +569,11 @@ val.number = get_c_double(value); sprintf(i, "%g", val.number); ins_data(siag_buffer, C_interpreter, - i, val, type, siag_sht, r, c); + i, val, MNUMBER, siag_sht, r, c); } else if (TYPEP(value, tc_string)) { - ; + val.text = get_c_string(value); + ins_data(siag_buffer, C_interpreter, + val.text, val, MTEXT, siag_sht, r, c); } else { ; } diff -urNP ../siag-3.4.3/siag/tcli.c ./siag/tcli.c --- ../siag-3.4.3/siag/tcli.c Sat Aug 12 20:39:41 2000 +++ ./siag/tcli.c Sat Nov 11 03:04:15 2000 @@ -154,7 +154,7 @@ int c = args[1].intValue; int type = ret_type(siag_buffer, siag_sht, r, c); - if (type == EXPRESSION || type == CONSTANT) + if (IS_NUMBER(type)) resultPtr->doubleValue = ret_val(siag_buffer, siag_sht, r, c).number; else resultPtr->doubleValue = 0; diff -urNP ../siag-3.4.3/siod/Makefile.in ./siod/Makefile.in --- ../siag-3.4.3/siod/Makefile.in Mon Nov 6 13:12:00 2000 +++ ./siod/Makefile.in Mon Nov 13 14:04:41 2000 @@ -316,15 +316,6 @@ || exit 1; \ fi; \ done -md5.o: md5.c md5.h -ndbm.o: ndbm.c -regex.o: regex.c siod.h -slib.o: slib.c siod.h siodp.h silence.i ../common/traceme.h -sliba.o: sliba.c siod.h siodp.h -slibu.o: slibu.c ../config.h siod.h siodp.h md5.h -ss.o: ss.c siod.h ss.h -tar.o: tar.c siod.h -trace.o: trace.c siod.h siodp.h info-am: info: info-recursive diff -urNP ../siag-3.4.3/tsiag/Makefile.in ./tsiag/Makefile.in --- ../siag-3.4.3/tsiag/Makefile.in Mon Nov 6 13:12:47 2000 +++ ./tsiag/Makefile.in Mon Nov 13 14:04:49 2000 @@ -233,14 +233,6 @@ || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done -fonts.o: fonts.c ../common/common.h ../common/cmalloc.h \ - ../common/oldfonts.h ../common/fonts.h fonts.h -tsiag.o: tsiag.c ../common/common.h ../common/cmalloc.h ../siod/siod.h \ - ../siag/calc.h ../siag/../common/traceme.h \ - ../siag/user_interface.h tsiag.h -window.o: window.c ../config.h ../common/cmalloc.h ../common/common.h \ - ../common/fonts.h ../siag/calc.h ../siag/../common/traceme.h \ - ../siag/user_interface.h ../siod/siod.h tsiag.h info-am: info: info-am diff -urNP ../siag-3.4.3/xcommon/Makefile.in ./xcommon/Makefile.in --- ../siag-3.4.3/xcommon/Makefile.in Mon Nov 6 13:12:30 2000 +++ ./xcommon/Makefile.in Mon Nov 13 14:04:46 2000 @@ -316,68 +316,6 @@ || exit 1; \ fi; \ done -Animator.o: Animator.c ../common/cmalloc.h ../common/common.h \ - ../common/fonts.h xcommon.h xfonts.h ../config.h AnimatorP.h \ - Animator.h ../egon/types.h -Canvas.o: Canvas.c ../common/fonts.h xfonts.h ../config.h CanvasP.h \ - Canvas.h -Check.o: Check.c ../common/common.h ../common/cmalloc.h CheckP.h Check.h \ - check_motif_off.xpm check_motif_on.xpm radio_motif_off.xpm \ - radio_motif_on.xpm tickbox_off.xpm tickbox_on.xpm \ - radio_16_off.xpm radio_16_on.xpm -Combo.o: Combo.c TextField.h ComboP.h Combo.h combo.xpm -DragAndDrop.o: DragAndDrop.c DragAndDrop.h DragAndDropTypes.h \ - cursor/file.xbm cursor/file_mask.xbm cursor/files.xbm \ - cursor/files_mask.xbm cursor/dir.xbm cursor/dir_mask.xbm \ - cursor/text.xbm cursor/text_mask.xbm cursor/grey.xbm \ - cursor/grey_mask.xbm cursor/link.xbm cursor/link_mask.xbm \ - cursor/app.xbm cursor/app_mask.xbm cursor/url.xbm \ - cursor/url_mask.xbm cursor/mime.xbm cursor/mime_mask.xbm -Frame.o: Frame.c FrameP.h Frame.h Gcs.h -Gcs.o: Gcs.c Gcs.h -Ghostview.o: Ghostview.c GhostviewP.h Ghostview.h -Handle.o: Handle.c HandleP.h Handle.h ../XawM/LabelP.h ../XawM/Label.h \ - ../XawM/ThreeDP.h ../XawM/ThreeD.h ../XawM/SimpleP.h \ - ../XawM/Simple.h xcommon.h -Image.o: Image.c ../common/fonts.h xfonts.h ../config.h ImageP.h Image.h -Notebook.o: Notebook.c ../common/common.h ../common/cmalloc.h \ - NotebookP.h Notebook.h -Richtext.o: Richtext.c ../common/cmalloc.h ../common/fonts.h xfonts.h \ - ../config.h embed.h Ruler.h ../common/traceme.h RichtextP.h \ - Richtext.h -Rudegrid.o: Rudegrid.c RudegridP.h Rudegrid.h -Ruler.o: Ruler.c ../common/cmalloc.h ../common/fonts.h xcommon.h \ - xfonts.h ../config.h RulerP.h Ruler.h -Tabbing.o: Tabbing.c ../common/common.h ../common/cmalloc.h TabbingP.h \ - Tabbing.h -Table.o: Table.c ../common/cmalloc.h ../common/fonts.h xfonts.h \ - ../config.h embed.h TableP.h Table.h -Tabs.o: Tabs.c TabsP.h Tabs.h Gcs.h -TextField.o: TextField.c TextFieldP.h ../config.h TextField.h -Tooltip.o: Tooltip.c TooltipP.h Tooltip.h ../common/cmalloc.h -dialogs.o: dialogs.c ../common/common.h ../common/bitmaps/unknown.xpm \ - dialogs.h xcommon.h TextField.h Rudegrid.h Frame.h Image.h -embed.o: embed.c ../common/cmalloc.h embed.h -filesel.o: filesel.c ../config.h ../Nws/Menu.h ../Nws/cvt.h \ - ../Nws/MenuBar.h ../Nws/Row.h ../Nws/BaseConst.h \ - ../Nws/MenuButton.h ../Nws/Button.h ../Nws/SButton.h \ - ../Nws/Base.h ../Nws/LabelME.h ../Nws/BaseME.h ../Nws/LineME.h \ - ../common/cmalloc.h ../common/common.h TextField.h xcommon.h \ - dialogs.h filesel.h Rudegrid.h Frame.h -fonts.o: fonts.c ../config.h ../common/common.h ../common/cmalloc.h \ - ../common/oldfonts.h ../common/fonts.h ../common/traceme.h \ - xfonts.h -forminput.o: forminput.c ../Nws/Menu.h ../Nws/cvt.h ../Nws/MenuBar.h \ - ../Nws/Row.h ../Nws/BaseConst.h ../Nws/MenuButton.h \ - ../Nws/Button.h ../Nws/SButton.h ../Nws/Base.h ../Nws/LabelME.h \ - ../Nws/BaseME.h ../Nws/LineME.h ../Nws/SubME.h ../siod/siod.h \ - ../common/cmalloc.h ../common/common.h TextField.h Check.h \ - xcommon.h dialogs.h -icon.o: icon.c -plugin.o: plugin.c ../common/common.h ../common/cmalloc.h plugin.h \ - ../common/plugin.h ../common/traceme.h -tooltip.o: tooltip.c ../common/common.h xcommon.h -xcommon.o: xcommon.c ../common/common.h info-am: info: info-recursive diff -urNP ../siag-3.4.3/xed/Makefile.in ./xed/Makefile.in --- ../siag-3.4.3/xed/Makefile.in Mon Nov 6 13:13:06 2000 +++ ./xed/Makefile.in Mon Nov 13 14:04:53 2000 @@ -306,46 +306,6 @@ || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done -commands.o: commands.c xedit.h ../Nws/Menu.h ../Nws/cvt.h \ - ../Nws/MenuBar.h ../Nws/Row.h ../Nws/BaseConst.h \ - ../Nws/MBButton.h ../Nws/LabelME.h ../Nws/BaseME.h \ - ../Nws/LineME.h -dnd.o: dnd.c xedit.h ../Nws/Menu.h ../Nws/cvt.h ../Nws/MenuBar.h \ - ../Nws/Row.h ../Nws/BaseConst.h ../Nws/MBButton.h \ - ../Nws/LabelME.h ../Nws/BaseME.h ../Nws/LineME.h \ - ../xcommon/DragAndDrop.h ../xcommon/DragAndDropTypes.h -edit.o: edit.c xedit.h ../Nws/Menu.h ../Nws/cvt.h ../Nws/MenuBar.h \ - ../Nws/Row.h ../Nws/BaseConst.h ../Nws/MBButton.h \ - ../Nws/LabelME.h ../Nws/BaseME.h ../Nws/LineME.h -file.o: file.c xedit.h ../Nws/Menu.h ../Nws/cvt.h ../Nws/MenuBar.h \ - ../Nws/Row.h ../Nws/BaseConst.h ../Nws/MBButton.h \ - ../Nws/LabelME.h ../Nws/BaseME.h ../Nws/LineME.h \ - ../common/common.h -file_sel.o: file_sel.c ../common/cmalloc.h ../xcommon/filesel.h -jump.o: jump.c xedit.h ../Nws/Menu.h ../Nws/cvt.h ../Nws/MenuBar.h \ - ../Nws/Row.h ../Nws/BaseConst.h ../Nws/MBButton.h \ - ../Nws/LabelME.h ../Nws/BaseME.h ../Nws/LineME.h -search.o: search.c xedit.h ../Nws/Menu.h ../Nws/cvt.h ../Nws/MenuBar.h \ - ../Nws/Row.h ../Nws/BaseConst.h ../Nws/MBButton.h \ - ../Nws/LabelME.h ../Nws/BaseME.h ../Nws/LineME.h -special.o: special.c xedit.h ../Nws/Menu.h ../Nws/cvt.h ../Nws/MenuBar.h \ - ../Nws/Row.h ../Nws/BaseConst.h ../Nws/MBButton.h \ - ../Nws/LabelME.h ../Nws/BaseME.h ../Nws/LineME.h \ - ../common/common.h ../xcommon/xcommon.h ../xcommon/dialogs.h -warning.o: warning.c xedit.h ../Nws/Menu.h ../Nws/cvt.h ../Nws/MenuBar.h \ - ../Nws/Row.h ../Nws/BaseConst.h ../Nws/MBButton.h \ - ../Nws/LabelME.h ../Nws/BaseME.h ../Nws/LineME.h \ - ../common/common.h -xedit.o: xedit.c xedit.h ../Nws/Menu.h ../Nws/cvt.h ../Nws/MenuBar.h \ - ../Nws/Row.h ../Nws/BaseConst.h ../Nws/MBButton.h \ - ../Nws/LabelME.h ../Nws/BaseME.h ../Nws/LineME.h \ - ../common/bitmaps/xedplus.xpm ../common/common.h \ - ../xcommon/icon.h ../xcommon/Frame.h ../xcommon/Rudegrid.h \ - ../xcommon/Tooltip.h ../xcommon/Handle.h ../xcommon/xcommon.h \ - ../xcommon/DragAndDrop.h ../xcommon/DragAndDropTypes.h \ - ../xcommon/dialogs.h ../xcommon/xcommon-ad.h \ - ../xcommon/dialogs-ad.h ../xcommon/filesel-ad.h \ - ../xcommon/nws-ad.h app-defaults.h info-am: info: info-am diff -urNP ../siag-3.4.3/xegon/Makefile.in ./xegon/Makefile.in --- ../siag-3.4.3/xegon/Makefile.in Mon Nov 6 13:13:02 2000 +++ ./xegon/Makefile.in Mon Nov 13 14:04:52 2000 @@ -237,40 +237,6 @@ || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done -drop.o: drop.c ../common/common.h drop.h -fileio_gif.o: fileio_gif.c ../xcommon/Animator.h \ - ../xcommon/../egon/types.h ../egon/egon.h \ - ../egon/../common/fonts.h ../egon/types.h xegon.h \ - ../common/common.h ../xcommon/embed.h ../common/cmalloc.h -fileio_ps.o: fileio_ps.c ../egon/egon.h ../egon/../common/fonts.h \ - ../egon/types.h ../common/common.h ../xcommon/xcommon.h \ - ../xcommon/Animator.h ../xcommon/../egon/types.h \ - ../xcommon/xfonts.h ../xcommon/../config.h xegon.h -selection.o: selection.c ../common/common.h ../egon/types.h \ - ../xcommon/Animator.h ../xcommon/../egon/types.h ../egon/egon.h \ - ../egon/../common/fonts.h -window.o: window.c ../Nws/Menu.h ../Nws/cvt.h ../Nws/MenuBar.h \ - ../Nws/Row.h ../Nws/BaseConst.h ../Nws/MBButton.h \ - ../Nws/LabelME.h ../Nws/BaseME.h ../Nws/LineME.h ../Nws/SubME.h \ - ../siod/siod.h ../egon/types.h ../xcommon/Animator.h \ - ../xcommon/../egon/types.h ../egon/egon.h \ - ../egon/../common/fonts.h xegon.h drop.h ../common/common.h \ - ../xcommon/xfonts.h ../xcommon/../config.h ../xcommon/embed.h \ - ../common/cmalloc.h ../xcommon/xcommon.h ../xcommon/Combo.h \ - ../xcommon/Frame.h ../xcommon/plugin.h \ - ../xcommon/../common/plugin.h ../common/bitmaps/egon.xpm \ - ../xcommon/icon.h ../xcommon/dialogs.h ../xcommon/filesel.h \ - ../xcommon/Rudegrid.h ../xcommon/Tooltip.h ../xcommon/Handle.h \ - ../xcommon/Tabbing.h ../xcommon/DragAndDrop.h \ - ../xcommon/DragAndDropTypes.h ../xcommon/xcommon-ad.h \ - ../xcommon/dialogs-ad.h ../xcommon/filesel-ad.h \ - ../xcommon/nws-ad.h app-defaults.h -xegon.o: xegon.c ../siod/siod.h ../common/common.h ../common/cmalloc.h \ - ../xcommon/Animator.h ../xcommon/../egon/types.h \ - ../xcommon/dialogs.h ../xcommon/plugin.h \ - ../xcommon/../common/plugin.h ../xcommon/filesel.h \ - ../egon/egon.h ../egon/../common/fonts.h ../egon/types.h \ - xegon.h info-am: info: info-am diff -urNP ../siag-3.4.3/xfiler/Makefile.in ./xfiler/Makefile.in --- ../siag-3.4.3/xfiler/Makefile.in Mon Nov 6 13:13:09 2000 +++ ./xfiler/Makefile.in Mon Nov 13 14:04:54 2000 @@ -441,79 +441,6 @@ || exit 1; \ fi; \ done -Bitmaps.o: Bitmaps.c bitmaps/xfm_file.xbm bitmaps/xfm_filemsk.xbm \ - bitmaps/xfm_files.xbm bitmaps/xfm_filesmsk.xbm \ - bitmaps/xfm_noentry.xbm bitmaps/xfm_noentrymsk.xbm \ - bitmaps/xfm_dir.xbm bitmaps/xfm_dirmsk.xbm bitmaps/xfm_exec.xbm \ - bitmaps/xfm_execmsk.xbm bitmaps/xfm_watch.xbm \ - bitmaps/xfm_watchmsk.xbm bitmaps/xfm_lline.xbm \ - bitmaps/xfm_tline.xbm bitmaps/xfm_fline.xbm \ - bitmaps/xfm_cline.xbm bitmaps/xfm_larrow.xbm \ - bitmaps/xfm_rarrow.xbm bitmaps/xfm_wavy_arrow.xbm \ - bitmaps/xfm_tick.xbm bitmaps/xfm_notick.xbm \ - bitmaps/xfm_excl.xbm pixmaps/xfm_file.xpm pixmaps/xfm_dir.xpm \ - pixmaps/xfm_updir.xpm pixmaps/xfm_exec.xpm \ - pixmaps/xfm_files.xpm pixmaps/xfm_symlnk.xpm \ - pixmaps/xfm_dirlnk.xpm pixmaps/xfm_execlnk.xpm \ - pixmaps/xfm_blackhole.xpm pixmaps/xfm_icon.xpm Files.h \ - ../config.h ../xcommon/DragAndDrop.h \ - ../xcommon/DragAndDropTypes.h -Chmod.o: Chmod.c Files.h ../config.h ../xcommon/DragAndDrop.h \ - ../xcommon/DragAndDropTypes.h ../common/common.h \ - ../xcommon/xcommon.h -Comms.o: Comms.c Files.h ../config.h ../xcommon/DragAndDrop.h \ - ../xcommon/DragAndDropTypes.h Comms.h -Confirm.o: Confirm.c ../xcommon/xcommon.h Files.h ../config.h \ - ../xcommon/DragAndDrop.h ../xcommon/DragAndDropTypes.h -Delete.o: Delete.c Files.h ../config.h ../xcommon/DragAndDrop.h \ - ../xcommon/DragAndDropTypes.h -Dirs.o: Dirs.c Files.h ../config.h ../xcommon/DragAndDrop.h \ - ../xcommon/DragAndDropTypes.h -Dnd.o: Dnd.c Files.h ../config.h ../xcommon/DragAndDrop.h \ - ../xcommon/DragAndDropTypes.h -Errors.o: Errors.c ../xcommon/xcommon.h Files.h ../config.h \ - ../xcommon/DragAndDrop.h ../xcommon/DragAndDropTypes.h -Exec.o: Exec.c Files.h ../config.h ../xcommon/DragAndDrop.h \ - ../xcommon/DragAndDropTypes.h -Fw.o: Fw.c ../Nws/MenuBar.h ../Nws/Row.h ../Nws/BaseConst.h ../Nws/cvt.h \ - Files.h ../config.h ../xcommon/DragAndDrop.h \ - ../xcommon/DragAndDropTypes.h ../common/common.h \ - ../common/cmalloc.h ../xcommon/Frame.h ../xcommon/Handle.h \ - ../xcommon/Tooltip.h ../xcommon/Rudegrid.h \ - ../xcommon/TextField.h ../xcommon/xcommon.h -FwActions.o: FwActions.c Files.h ../config.h ../xcommon/DragAndDrop.h \ - ../xcommon/DragAndDropTypes.h ../common/common.h -FwCb.o: FwCb.c Files.h ../config.h ../xcommon/DragAndDrop.h \ - ../xcommon/DragAndDropTypes.h ../common/common.h \ - ../common/cmalloc.h ../xcommon/dialogs.h -Info.o: Info.c Files.h ../config.h ../xcommon/DragAndDrop.h \ - ../xcommon/DragAndDropTypes.h ../common/common.h \ - ../xcommon/xcommon.h -Main.o: Main.c Files.h ../config.h ../xcommon/DragAndDrop.h \ - ../xcommon/DragAndDropTypes.h ../common/common.h \ - ../xcommon/xcommon.h ../xcommon/Tooltip.h \ - ../xcommon/xcommon-ad.h ../xcommon/dialogs-ad.h \ - ../xcommon/nws-ad.h xfiler-ad.h -Ops.o: Ops.c Files.h ../config.h ../xcommon/DragAndDrop.h \ - ../xcommon/DragAndDropTypes.h ../common/common.h -Popup.o: Popup.c Files.h ../config.h ../xcommon/DragAndDrop.h \ - ../xcommon/DragAndDropTypes.h ../common/common.h \ - ../xcommon/dialogs.h ../xcommon/TextField.h -Utils.o: Utils.c ../Nws/utils.h ../Nws/cvt.h ../Nws/MenuBar.h \ - ../Nws/Row.h ../Nws/BaseConst.h ../Nws/Menu.h ../Nws/MBButton.h \ - ../Nws/LabelME.h ../Nws/BaseME.h ../Nws/LineME.h \ - ../xcommon/TextField.h Files.h ../config.h \ - ../xcommon/DragAndDrop.h ../xcommon/DragAndDropTypes.h \ - ../common/common.h ../common/cmalloc.h blank.xpm dot.xpm -exec.o: exec.c Files.h ../config.h ../xcommon/DragAndDrop.h \ - ../xcommon/DragAndDropTypes.h -magic.o: magic.c magic.h regexp.h -regerror.o: regerror.c -regexp.o: regexp.c regexp.h regmagic.h -regsub.o: regsub.c regexp.h regmagic.h -runcmd.o: runcmd.c ../common/common.h ../xcommon/xcommon.h \ - ../xcommon/xcommon-ad.h runcmd-ad.h -tycoon.o: tycoon.c info-am: info: info-recursive diff -urNP ../siag-3.4.3/xpw/Makefile.in ./xpw/Makefile.in --- ../siag-3.4.3/xpw/Makefile.in Mon Nov 6 13:12:55 2000 +++ ./xpw/Makefile.in Mon Nov 13 14:04:51 2000 @@ -236,32 +236,6 @@ || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done -drop.o: drop.c ../common/common.h drop.h -selection.o: selection.c ../common/common.h ../common/cmalloc.h \ - ../pw/pw.h ../pw/../common/fonts.h ../pw/../common/traceme.h \ - ../pw/user_interface.h xpw.h -window.o: window.c ../Nws/Menu.h ../Nws/cvt.h ../Nws/MenuBar.h \ - ../Nws/Row.h ../Nws/BaseConst.h ../Nws/MBButton.h \ - ../Nws/LabelME.h ../Nws/BaseME.h ../Nws/LineME.h ../Nws/SubME.h \ - ../common/common.h ../common/cmalloc.h ../common/bitmaps/pw.xpm \ - ../common/fonts.h ../xcommon/xcommon.h ../xcommon/xfonts.h \ - ../xcommon/../config.h ../xcommon/embed.h ../xcommon/Ruler.h \ - ../xcommon/Richtext.h ../xcommon/Combo.h ../xcommon/Frame.h \ - ../xcommon/Tabbing.h ../xcommon/Rudegrid.h \ - ../xcommon/DragAndDrop.h ../xcommon/DragAndDropTypes.h \ - ../xcommon/plugin.h ../xcommon/../common/plugin.h \ - ../xcommon/icon.h ../xcommon/Tooltip.h ../xcommon/Handle.h \ - ../xcommon/dialogs.h ../pw/pw.h ../pw/../common/fonts.h \ - ../pw/../common/traceme.h ../pw/user_interface.h xpw.h drop.h \ - ../siod/siod.h ../xcommon/xcommon-ad.h ../xcommon/dialogs-ad.h \ - ../xcommon/filesel-ad.h ../xcommon/nws-ad.h app-defaults.h -xpw.o: xpw.c ../siod/siod.h ../pw/pw.h ../pw/../common/fonts.h \ - ../pw/../common/traceme.h ../pw/user_interface.h \ - ../common/cmalloc.h ../common/common.h ../xcommon/xfonts.h \ - ../xcommon/../config.h ../xcommon/dialogs.h ../xcommon/embed.h \ - ../xcommon/plugin.h ../xcommon/../common/plugin.h \ - ../xcommon/filesel.h ../xcommon/xcommon.h ../xcommon/Richtext.h \ - xpw.h info-am: info: info-am diff -urNP ../siag-3.4.3/xsiag/Makefile.in ./xsiag/Makefile.in --- ../siag-3.4.3/xsiag/Makefile.in Mon Nov 6 13:12:46 2000 +++ ./xsiag/Makefile.in Mon Nov 13 14:04:49 2000 @@ -236,31 +236,6 @@ || cp -p $$d/$$file $(distdir)/$$file || :; \ fi; \ done -drop.o: drop.c ../common/common.h drop.h -selection.o: selection.c ../common/cmalloc.h ../common/common.h \ - ../siag/calc.h ../siag/../common/traceme.h \ - ../siag/user_interface.h ../siag/selection.h xsiag.h -window.o: window.c ../Nws/Menu.h ../Nws/cvt.h ../Nws/MenuBar.h \ - ../Nws/Row.h ../Nws/BaseConst.h ../Nws/MBButton.h \ - ../Nws/LabelME.h ../Nws/BaseME.h ../Nws/LineME.h ../Nws/SubME.h \ - ../siod/siod.h ../common/common.h ../common/cmalloc.h \ - ../common/fonts.h ../common/bitmaps/siag.xpm \ - ../xcommon/xfonts.h ../xcommon/../config.h ../xcommon/Table.h \ - ../xcommon/embed.h ../xcommon/dialogs.h \ - ../xcommon/DragAndDrop.h ../xcommon/DragAndDropTypes.h \ - ../xcommon/icon.h ../xcommon/xcommon.h ../xcommon/plugin.h \ - ../xcommon/../common/plugin.h ../xcommon/Richtext.h \ - ../xcommon/Tabbing.h ../xcommon/Combo.h ../xcommon/Frame.h \ - ../xcommon/Rudegrid.h ../xcommon/Tooltip.h ../xcommon/Handle.h \ - ../siag/calc.h ../siag/../common/traceme.h \ - ../siag/user_interface.h xsiag.h drop.h ../xcommon/xcommon-ad.h \ - ../xcommon/filesel-ad.h ../xcommon/dialogs-ad.h \ - ../xcommon/nws-ad.h app-defaults.h -xsiag.o: xsiag.c ../siod/siod.h ../common/common.h ../common/cmalloc.h \ - ../common/fonts.h ../xcommon/xfonts.h ../xcommon/../config.h \ - ../xcommon/dialogs.h ../xcommon/embed.h ../xcommon/filesel.h \ - ../siag/calc.h ../siag/../common/traceme.h \ - ../siag/user_interface.h xsiag.h info-am: info: info-am diff -urNP ../siag-3.4.3/xsiag/window.c ./xsiag/window.c --- ../siag-3.4.3/xsiag/window.c Mon Nov 6 02:19:43 2000 +++ ./xsiag/window.c Sun Nov 12 04:45:06 2000 @@ -247,18 +247,24 @@ type = ret_type(w_list->buf, s, r, c); intp = ret_interpreter(w_list->buf, s, r, c); switch (type) { - case EXPRESSION: - case STRING: - sprintf(b, "%s", interpreter2name(intp)); + case EMPTY: + strcpy(b, "EMPTY"); break; case LABEL: strcpy(b, "LABEL"); break; + case EXPRESSION: + case STRING: + sprintf(b, "%s", interpreter2name(intp)); + break; case CONSTANT: strcpy(b, "CONSTANT"); break; - case EMPTY: - strcpy(b, "EMPTY"); + case MNUMBER: + strcpy(b, "MNUMBER"); + break; + case MTEXT: + strcpy(b, "MTEXT"); break; default: strcpy(b, "ERROR"); diff -urNP ../siag-3.4.3/xsiag/xsiag.c ./xsiag/xsiag.c --- ../siag-3.4.3/xsiag/xsiag.c Wed Jul 26 02:11:54 2000 +++ ./xsiag/xsiag.c Tue Nov 7 11:11:12 2000 @@ -178,6 +178,7 @@ for (c = block_upper(w_list).col; c <= block_lower(w_list).col; c++) { set_width(buf, s, c, 10); for (r = block_upper(w_list).row; r <= block_lower(w_list).row; r++) { + if (r > buf->sht[s].alloc_lines) continue; p = ret_pvalue(NULL, buf, s, r, c, -1); rc = rc_makerich(p, ret_format(buf, s, r, c)); text_width = rc_strwidth(rc, -1)+10; @@ -204,6 +205,7 @@ for (r = block_upper(w_list).row; r <= block_lower(w_list).row; r++) { set_height(buffer_of_window(w_list), s, r, 10); for (c = block_upper(w_list).col; c <= block_lower(w_list).col; c++) { + if (c > w_list->buf->sht[s].longest_line) continue; font_index = ret_font(buffer_of_window(w_list), s, r, c); p = ret_pvalue(NULL, buffer_of_window(w_list), s, r, c, -1); text_height = font_height(font_index) + 10;

SPC	(set_block)
C-@	(set_mark_command)
ESC SPC	(unset_block)
C-a	(beginning_of_line)
C-b	(backward_cell)
C-d	(delete_cell)
C-e	(end_of_line)
C-f	(forward_cell)
C-g	(keyboard_quit)
C-l	(recenter)
C-n	(next_line)
C-p	(previous_line)
C-o	(insert_line)
C-r	(search_backward)
C-s	(search_forward)
C-u	(universal_argument)
C-v	(scroll_up)
M-v	(scroll_down)
ESC v	(scroll_down)
M-x	(execute_extended_command)
ESC x	(execute_extended_command)
?	(what_cursor_position)
C-x ?	(what_cursor_position)
!	(recalc_matrix)
=	(edit_expression)
"	(edit_label)
(	(execute_extended_command)
<	(beginning_of_buffer)
M-<	(beginning_of_buffer)
ESC <	(beginning_of_buffer)
>	(end_of_buffer)
M->	(end_of_buffer)
ESC >	(end_of_buffer)
ESC	(prefix)
ESC C-g	(keyboard_quit)
ESC b	(scroll_right)
ESC f	(scroll_left)
ESC g	(go_to)
ESC p	(top_of_buffer)
ESC n	(bottom_of_buffer)
ESC -	(argument_sign)
ESC 0	(argument_digit)
ESC 1	(argument_digit)
ESC 2	(argument_digit)
ESC 3	(argument_digit)
ESC 4	(argument_digit)
ESC 5	(argument_digit)
ESC 6	(argument_digit)
ESC 7	(argument_digit)
ESC 8	(argument_digit)
ESC 9	(argument_digit)
C-x	(prefix)
C-x C-c	(quit_program)
C-x C-f	(load_buffer)
C-x C-g	(keyboard_quit)
C-x C-s	(save_buffer)
C-x C-w	(save_buffer_as)
C-x C-x	(exchange_point_and_mark)
C-x b	(switch_to_buffer)
C-x e	(call_last_kbd_macro)
C-x k	(kill_buffer 1)
C-x o	(other_window)
C-x 0	(delete_window)
C-x 1	(delete_other_windows)
C-x 2	(split_window_vertically)
C-x =	(what_cursor_position)
C-x (	(start_kbd_macro)
C-x )	(end_kbd_macro)
C-c	(prefix)
C-c C-d	(delete_cell)
C-c C-g	(keyboard_quit)
C-c !	(recalc_matrix)
C-c g	(go_to)
C-c l	(edit_label)
C-c x	(edit_expression)
C-c =	(interpreter_test 'C)
C-c b	(prefix)
C-c b ?	(llpr "One of SPC c d i p s")
C-c b C-g	(keyboard_quit)
C-c b SPC	(set_block)
C-c b c	(copy_block)
C-c b d	(delete_block)
C-c b f	(fill_block)
C-c b p	(print)
C-c c	(prefix)
C-c c C-g	(keyboard_quit)
C-c c ?	(llpr "One of g s t")
C-c s	(prefix)
C-c s ?	(llpr "One of l r c w h")
C-c s C-g	(keyboard_quit)
C-c v	(print_version)
C-c x	(prefix)
C-c x C-g	(keyboard_quit)
C-c x ?	(llpr "One of c g s t")
C-c x c	(edit_c)
C-c x g	(edit_guile)
C-c x s	(edit_siod)
C-c x t	(edit_tcl)
C-c ?	(prefix)
C-c ? ?	(llpr "One of m s c p")
C-c C-g	(keyboard_quit)
C-c ? p	(show_pool_info)
C-h	(prefix)
C-h C-g	(keyboard_quit)
C-h C-c	(help_contents)
C-h v	(print_version)
C-h C-h	(help_for_help)
C-h ?	(llpr "One of a b C-c c f k v w C-h")
RET	(hyperlink)
C-z	(suspend_function)
digits	(edit_expression)
letters	(edit_label)
SPC	(set_block)
C-@	(set_mark_command)
ESC SPC	(unset_block)
C-a	(beginning_of_line)
C-b	(backward_cell)
C-d	(delete_cell)
C-e	(end_of_line)
C-f	(forward_cell)
C-g	(keyboard_quit)
C-l	(recenter)
C-n	(next_line)
C-p	(previous_line)
C-o	(insert_line)
C-r	(search_backward)
C-s	(search_forward)
C-u	(universal_argument)
C-v	(scroll_up)
M-v	(scroll_down)
ESC v	(scroll_down)
M-x	(execute_extended_command)
ESC x	(execute_extended_command)
?	(what_cursor_position)
C-x ?	(what_cursor_position)
!	(recalc_matrix)
=	(edit_expression)
"	(edit_label)
(	(execute_extended_command)
<	(beginning_of_buffer)
M-<	(beginning_of_buffer)
ESC <	(beginning_of_buffer)
>	(end_of_buffer)
M->	(end_of_buffer)
ESC >	(end_of_buffer)
ESC	(prefix)
ESC C-g	(keyboard_quit)
ESC b	(scroll_right)
ESC f	(scroll_left)
ESC g	(go_to)
ESC p	(top_of_buffer)
ESC n	(bottom_of_buffer)
ESC -	(argument_sign)
ESC 0	(argument_digit)
ESC 1	(argument_digit)
ESC 2	(argument_digit)
ESC 3	(argument_digit)
ESC 4	(argument_digit)
ESC 5	(argument_digit)
ESC 6	(argument_digit)
ESC 7	(argument_digit)
ESC 8	(argument_digit)
ESC 9	(argument_digit)
C-x	(prefix)
C-x C-c	(quit_program)
C-x C-f	(load_buffer)
C-x C-g	(keyboard_quit)
C-x C-s	(save_buffer)
C-x C-w	(save_buffer_as)
C-x C-x	(exchange_point_and_mark)
C-x b	(switch_to_buffer)
C-x e	(call_last_kbd_macro)
C-x k	(kill_buffer 1)
C-x o	(other_window)
C-x 0	(delete_window)
C-x 1	(delete_other_windows)
C-x 2	(split_window_vertically)
C-x =	(what_cursor_position)
C-x (	(start_kbd_macro)
C-x )	(end_kbd_macro)
C-c	(prefix)
C-c C-d	(delete_cell)
C-c C-g	(keyboard_quit)
C-c !	(recalc_matrix)
C-c g	(go_to)
C-c l	(edit_label)
C-c x	(edit_expression)
C-c =	(interpreter_test 'C)
C-c b	(prefix)
C-c b ?	(llpr "One of SPC c d i p s")
C-c b C-g	(keyboard_quit)
C-c b SPC	(set_block)
C-c b c	(copy_block)
C-c b d	(delete_block)
C-c b f	(fill_block)
C-c b p	(print)
C-c c	(prefix)
C-c c C-g	(keyboard_quit)
C-c c ?	(llpr "One of g s t")
C-c s	(prefix)
C-c s ?	(llpr "One of l r c w h")
C-c s C-g	(keyboard_quit)
C-c v	(print_version)
C-c x	(prefix)
C-c x C-g	(keyboard_quit)
C-c x ?	(llpr "One of c g s t")
C-c x c	(edit_c)
C-c x g	(edit_guile)
C-c x s	(edit_siod)
C-c x t	(edit_tcl)
C-c ?	(prefix)
C-c ? ?	(llpr "One of m s c p")
C-c C-g	(keyboard_quit)
C-c ? p	(show_pool_info)
C-h	(prefix)
C-h C-g	(keyboard_quit)
C-h C-c	(help_contents)
C-h v	(print_version)
C-h C-h	(help_for_help)
C-h ?	(llpr "One of a b C-c c f k v w C-h")
RET	(hyperlink)
C-z	(suspend_function)
digits	(edit_expression)
letters	(edit_label)

Adding Format Handlers

Menu Commands

File

Edit

Block

Format

Data

Window

Plot

Tools

Plugin

Help

Shortcuts

Function Reference

abs

Synopsis

Description

Examples

See Also

acos

Synopsis

Description

Examples

See Also

acosh

Synopsis

ash

Synopsis

Description

Examples

See Also

asin

Synopsis

Description

Examples

See Also

asinh

Synopsis

atan

Synopsis

Description

Examples

See Also

atan2

Synopsis

Description

Examples

See Also

atan_2

Synopsis

Description

Examples

See Also

atanh

Synopsis

base64decode

Synopsis

Description

Examples

See Also

base64encode

Synopsis

Description

Examples

See Also

besseli

Synopsis

cc_solv

Synopsis

Description

Examples

See Also

ceil

Synopsis

cos

Synopsis

Description

Examples

See Also

cosh