diff -urNP ../siag-3.4.5/ChangeLog ./ChangeLog --- ../siag-3.4.5/ChangeLog Mon Nov 20 21:53:09 2000 +++ ./ChangeLog Wed Nov 29 01:28:10 2000 @@ -1,4 +1,11 @@ +001129 Released 3.4.6. + +001128 Support for the Mimer SQL database. + +001124 Support for the Sqlite database. + Fixed bug in ps_set_font. + 001120 Released 3.4.5. 001114 Siag, PW: Use Psionio 3.71 or newer to read and write Data, diff -urNP ../siag-3.4.5/INSTALL ./INSTALL --- ../siag-3.4.5/INSTALL Sun Nov 12 01:10:05 2000 +++ ./INSTALL Fri Nov 24 17:56:30 2000 @@ -84,6 +84,11 @@ /etc/ld.so.conf and /sbin/ldconfig must be rerun. +Sqlite requires gdbm, so make sure it is installed before running + +./configure --with-gdbm --with-sqlite + + -------- Skipping the "make install" step or trying to move things around diff -urNP ../siag-3.4.5/acinclude.m4 ./acinclude.m4 --- ../siag-3.4.5/acinclude.m4 Fri Nov 10 15:12:47 2000 +++ ./acinclude.m4 Tue Nov 28 16:51:19 2000 @@ -171,6 +171,18 @@ AC_CHECK_LIB(mysqlclient, mysql_real_connect) fi ]) +AC_ARG_WITH(sqlite, + [ --with-sqlite enable Sqlite database queries], + [ if test "$withval" != "no"; then + AC_CHECK_LIB(sqlite, sqlite_open) + fi ]) + +AC_ARG_WITH(mimer, + [ --with-mimer enable Mimer database queries], + [ if test "$withval" != "no"; then + AC_CHECK_LIB(mimer, SQLAllocConnect) + 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, diff -urNP ../siag-3.4.5/aclocal.m4 ./aclocal.m4 --- ../siag-3.4.5/aclocal.m4 Tue Nov 14 09:13:57 2000 +++ ./aclocal.m4 Wed Nov 29 11:38:52 2000 @@ -183,6 +183,18 @@ AC_CHECK_LIB(mysqlclient, mysql_real_connect) fi ]) +AC_ARG_WITH(sqlite, + [ --with-sqlite enable Sqlite database queries], + [ if test "$withval" != "no"; then + AC_CHECK_LIB(sqlite, sqlite_open) + fi ]) + +AC_ARG_WITH(mimer, + [ --with-mimer enable Mimer database queries], + [ if test "$withval" != "no"; then + AC_CHECK_LIB(mimer, SQLAllocConnect) + 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, diff -urNP ../siag-3.4.5/common/bitmaps/Makefile.am ./common/bitmaps/Makefile.am --- ../siag-3.4.5/common/bitmaps/Makefile.am Sun Aug 6 17:10:34 2000 +++ ./common/bitmaps/Makefile.am Sun Nov 26 23:17:58 2000 @@ -18,7 +18,8 @@ center.xpm larger.xpm smaller.xpm portrait.xpm landscape.xpm \ editor.xpm SO3.xpm book-closed.xpm book-open.xpm handlebg.xpm \ xfiler.xpm gvu.xpm xedplus.xpm \ - ctab.xpm ltab.xpm rtab.xpm + ctab.xpm ltab.xpm rtab.xpm security.xpm \ + navigator.xpm mail.xpm news.xpm addressbook.xpm composer.xpm gifdir = $(prefix)/doc/siag/common/bitmaps gif_DATA = bold.gif borders.gif copyright.gif egon_fg.gif fld_open.gif \ diff -urNP ../siag-3.4.5/common/bitmaps/Makefile.in ./common/bitmaps/Makefile.in --- ../siag-3.4.5/common/bitmaps/Makefile.in Tue Nov 21 08:16:08 2000 +++ ./common/bitmaps/Makefile.in Wed Nov 29 11:52:49 2000 @@ -88,7 +88,7 @@ SUBDIRS = kde gnome xpmdir = $(datadir)/siag/common/bitmaps -xpm_DATA = blank.xpm bold.xpm borders.xpm copy.xpm copyright.xpm cut.xpm egon.xpm fld_open.xpm fld_closed.xpm fld_up.xpm fld_new.xpm save.xpm grid.xpm hcenter.xpm hfull.xpm hleft.xpm hright.xpm info.xpm insert.xpm italic.xpm lline.xpm new.xpm next.xpm none.xpm overwrite.xpm paste.xpm play.xpm plotter.xpm preview.xpm previous.xpm printer.xpm pw.xpm redo.xpm rline.xpm siag.xpm siagoffice.xpm sigma.xpm sortaz.xpm sortza.xpm spell.xpm stop.xpm uchar.xpm uline.xpm strike.xpm undo.xpm vbottom.xpm vtop.xpm back.xpm cancel.xpm home.xpm quit.xpm reload.xpm search.xpm xterm16.xpm viewmode.xpm sortmode.xpm table.xpm xedplus.xpm netscape.xpm icons.xpm image.xpm ghost.xpm compress.xpm fonts.xpm data.xpm unknown.xpm center.xpm larger.xpm smaller.xpm portrait.xpm landscape.xpm editor.xpm SO3.xpm book-closed.xpm book-open.xpm handlebg.xpm xfiler.xpm gvu.xpm xedplus.xpm ctab.xpm ltab.xpm rtab.xpm +xpm_DATA = blank.xpm bold.xpm borders.xpm copy.xpm copyright.xpm cut.xpm egon.xpm fld_open.xpm fld_closed.xpm fld_up.xpm fld_new.xpm save.xpm grid.xpm hcenter.xpm hfull.xpm hleft.xpm hright.xpm info.xpm insert.xpm italic.xpm lline.xpm new.xpm next.xpm none.xpm overwrite.xpm paste.xpm play.xpm plotter.xpm preview.xpm previous.xpm printer.xpm pw.xpm redo.xpm rline.xpm siag.xpm siagoffice.xpm sigma.xpm sortaz.xpm sortza.xpm spell.xpm stop.xpm uchar.xpm uline.xpm strike.xpm undo.xpm vbottom.xpm vtop.xpm back.xpm cancel.xpm home.xpm quit.xpm reload.xpm search.xpm xterm16.xpm viewmode.xpm sortmode.xpm table.xpm xedplus.xpm netscape.xpm icons.xpm image.xpm ghost.xpm compress.xpm fonts.xpm data.xpm unknown.xpm center.xpm larger.xpm smaller.xpm portrait.xpm landscape.xpm editor.xpm SO3.xpm book-closed.xpm book-open.xpm handlebg.xpm xfiler.xpm gvu.xpm xedplus.xpm ctab.xpm ltab.xpm rtab.xpm security.xpm navigator.xpm mail.xpm news.xpm addressbook.xpm composer.xpm gifdir = $(prefix)/doc/siag/common/bitmaps diff -urNP ../siag-3.4.5/common/bitmaps/addressbook.xpm ./common/bitmaps/addressbook.xpm --- ../siag-3.4.5/common/bitmaps/addressbook.xpm Thu Jan 1 01:00:00 1970 +++ ./common/bitmaps/addressbook.xpm Sun Nov 26 23:56:46 2000 @@ -0,0 +1,45 @@ +/* XPM */ +static char *toys[] = { +/* width height num_colors chars_per_pixel */ +" 25 18 20 1", +/* colors */ +". c #000000", +"# c #0000ff", +"a c #00373c", +"b c #008000", +"c c #008080", +"d c #00ff00", +"e c #222222", +"f c #333366", +"g c #444444", +"h c #6666cc", +"i c #7f7f7f", +"j c #800000", +"k c #808000", +"l c #808080", +"m c #9999ff", +"n c None", +"o c #ff0000", +"p c #ff6633", +"q c #ffff00", +"r c #ffffff", +/* pixels */ +"nnnnnnnnnnnnnnnnnnnnnnnnn", +"nnnnnnnnnnnnnnnnnnnnnnnnn", +"nnnnnnnnnnnnnnnnnnnnnnnnn", +"nnnnnnnnllldcccpooonnnnnn", +"nnnnnfffffffffjjjjjfinnnn", +"nnnnfrrrrrrrrrrrrrrfinnnn", +"nnnnfrrrrrrrrmfmrrrfinnnn", +"nnnnfrhhhhrrrfffrrrfinnnn", +"nnnnfrrrrrrrrmfmrrrfinnnn", +"nnnnfrhhhhrrfrrrfrrfinnnn", +"nnnnfrrrrrrfffrfffrfinnnn", +"nnnnfrhhhhrfffffffrfinnnn", +"nnnnfrrrrrrfffffffrfinnnn", +"nnnnfrrrrirrrrrirrrfinnnn", +"nnnnfffffnfffffnffffnnnnn", +"nnnnnnnnnnnnnnnnnnnnnnnnn", +"nnnnnnnnnnnnnnnnnnnnnnnnn", +"nnnnnnnnnnnnnnnnnnnnnnnnn", +}; diff -urNP ../siag-3.4.5/common/bitmaps/composer.xpm ./common/bitmaps/composer.xpm --- ../siag-3.4.5/common/bitmaps/composer.xpm Thu Jan 1 01:00:00 1970 +++ ./common/bitmaps/composer.xpm Sun Nov 26 23:57:06 2000 @@ -0,0 +1,45 @@ +/* XPM */ +static char *toys[] = { +/* width height num_colors chars_per_pixel */ +" 25 18 20 1", +/* colors */ +". c #000000", +"# c #0000ff", +"a c #00373c", +"b c #008000", +"c c #008080", +"d c #00ff00", +"e c #222222", +"f c #333366", +"g c #444444", +"h c #6666cc", +"i c #7f7f7f", +"j c #800000", +"k c #808000", +"l c #808080", +"m c #9999ff", +"n c None", +"o c #ff0000", +"p c #ff6633", +"q c #ffff00", +"r c #ffffff", +/* pixels */ +"nnnnnnnnnnnnnnnnnnnnnnnnn", +"nnnnnnnnnnnnnnnnnnnnnnnnn", +"nnnnnnnnnnnnnnnnnnnnnnnnn", +"nnnnnnnnnnnnnnn.nllnnnnnn", +"nnnnnnnnnnrnnn.nlc.nnnnnn", +"nnnnnnnrrrnrn.nlc..nnnnnn", +"nnnnnrrnrnrnqnlc..lnnnnnn", +"nnnfnrnqnqnqnln..lnnnnnnn", +"nnnlfnqnqnqnlc..lnqnnnnnn", +"nnnnlfnqnqnlc..qnqnqnnnnn", +"nnnnnlfnnnlc..qnqnqnq.nnn", +"nnnnnnlfnl...qnqnqn..rnnn", +"nnnnnnnlkq..qnqnq..nnnnnn", +"nnnnnnnkrkklnqn..rnnnnnnn", +"nnnnnnnjkjnff..nnnnnnnnnn", +"nnnnnnnnnnnnnnnnnnnnnnnnn", +"nnnnnnnnnnnnnnnnnnnnnnnnn", +"nnnnnnnnnnnnnnnnnnnnnnnnn", +}; diff -urNP ../siag-3.4.5/common/bitmaps/mail.xpm ./common/bitmaps/mail.xpm --- ../siag-3.4.5/common/bitmaps/mail.xpm Thu Jan 1 01:00:00 1970 +++ ./common/bitmaps/mail.xpm Sun Nov 26 23:56:02 2000 @@ -0,0 +1,45 @@ +/* XPM */ +static char *toys[] = { +/* width height num_colors chars_per_pixel */ +" 25 18 20 1", +/* colors */ +". c #000000", +"# c #0000ff", +"a c #00373c", +"b c #008000", +"c c #008080", +"d c #00ff00", +"e c #222222", +"f c #333366", +"g c #444444", +"h c #6666cc", +"i c #7f7f7f", +"j c #800000", +"k c #808000", +"l c #808080", +"m c #9999ff", +"n c None", +"o c #ff0000", +"p c #ff6633", +"q c #ffff00", +"r c #ffffff", +/* pixels */ +"nnnnnnnnnnnnnnnnnnnnnnnnn", +"nnnnnnnnnnnnnnnnnnnnnnnnn", +"nnnnnnnnnnnnnnnnnnnnnnnnn", +"nnnkkkannnnnnnnnnnnnnnnnn", +"nnnpqqennnnnirror#romnnnn", +"nnnpqqennnnni#rrrrrr#nnnn", +"nnnpqqennnnnirribrrrmnnnn", +"nkrqqqkpennniorbbrrronnnn", +"nnkrqqpennnnirrrrrrrmnnnn", +"nnnkrpenniffi#rrnrir#heen", +"nnnnkknnaefhirrrnrnrmeeen", +"nnnnnnnnhhhhhhhhhhhheeeen", +"nnnnnnnnhhhhhhhhhfhfeefin", +"nnnnnnnnhhfhfhfhfhfhefinn", +"nnnnnnnnnnnnnnnnnnnnnnnnn", +"nnnnnnnnnnnnnnnnnnnnnnnnn", +"nnnnnnnnnnnnnnnnnnnnnnnnn", +"nnnnnnnnnnnnnnnnnnnnnnnnn", +}; diff -urNP ../siag-3.4.5/common/bitmaps/navigator.xpm ./common/bitmaps/navigator.xpm --- ../siag-3.4.5/common/bitmaps/navigator.xpm Thu Jan 1 01:00:00 1970 +++ ./common/bitmaps/navigator.xpm Sun Nov 26 23:55:36 2000 @@ -0,0 +1,45 @@ +/* XPM */ +static char *toys[] = { +/* width height num_colors chars_per_pixel */ +" 25 18 20 1", +/* colors */ +". c #000000", +"# c #0000ff", +"a c #00373c", +"b c #008000", +"c c #008080", +"d c #00ff00", +"e c #222222", +"f c #333366", +"g c #444444", +"h c #6666cc", +"i c #7f7f7f", +"j c #800000", +"k c #808000", +"l c #808080", +"m c #9999ff", +"n c None", +"o c #ff0000", +"p c #ff6633", +"q c #ffff00", +"r c #ffffff", +/* pixels */ +"nnnnnnnnnnnnnnnnnnnnnnnnn", +"nnnnnnnnnnnnnnnnnnnnnnnnn", +"nnnnnnnnnnnnnnnnnnnnnnnnn", +"nnnnnqfnnnqflnnqhlnnnnnnn", +"nnnnnnrfqrnrnlqhennnnnnnn", +"nnnnnnnqrfqfqnkelnnnnnnnn", +"nnnnnnqrmerehnnlnnnnnnnnn", +"nnnnnnqmfmqmlfqellnnnnnnn", +"nnlqqrnqrqnqnrnrnnennnnnn", +"nnnlffqmfmqmefqkeelnnnnnn", +"nnnnnnrnhfnehlqflnmmmmmmn", +"nnnnnnlqneqfnqfehmhhhlmnn", +"nnnnnlrnqnnnqfqflhlllmnnn", +"nnnnnrnekeqfeehqelllmmnnn", +"nnnnnnelmmqehlnnelmnnnnnn", +"nnnnnnnnnnnnnnnnnnnnnnnnn", +"nnnnnnnnnnnnnnnnnnnnnnnnn", +"nnnnnnnnnnnnnnnnnnnnnnnnn", +}; diff -urNP ../siag-3.4.5/common/bitmaps/news.xpm ./common/bitmaps/news.xpm --- ../siag-3.4.5/common/bitmaps/news.xpm Thu Jan 1 01:00:00 1970 +++ ./common/bitmaps/news.xpm Sun Nov 26 23:56:25 2000 @@ -0,0 +1,45 @@ +/* XPM */ +static char *toys[] = { +/* width height num_colors chars_per_pixel */ +" 25 18 20 1", +/* colors */ +". c #000000", +"# c #0000ff", +"a c #00373c", +"b c #008000", +"c c #008080", +"d c #00ff00", +"e c #222222", +"f c #333366", +"g c #444444", +"h c #6666cc", +"i c #7f7f7f", +"j c #800000", +"k c #808000", +"l c #808080", +"m c #9999ff", +"n c None", +"o c #ff0000", +"p c #ff6633", +"q c #ffff00", +"r c #ffffff", +/* pixels */ +"nnnnnnnnnnnnnnnnnnnnnnnnn", +"nnnnnnnnnnnnnnnnnnnnnnnnn", +"nnnnnnnnnnnnnnnnnnnnnnnnn", +"nnnnnnnnnnnnnnhhhhhhhhnnn", +"nnnnnnnnnfnnnhnrrrnrnmhfn", +"nnnnnnnnhfnnnhncaaanrmhfn", +"nnnnnnnhmfnnnhnqrnrrrmhfn", +"nnhhhhhmnfnnnhrcarcarmhfn", +"nhnrrrnrnhfnnhnrnrnrnhhfn", +"nhrcarcarmhfnnhnmmmmmhfnn", +"nhnqrnrnrmhfnnfmffffffnnn", +"nhncaaarrmhfnnfhnnnnnnnnn", +"nhnrnrnrnmhfnnfnnnnnnnnnn", +"nnhhhhhhhhhfnnnnnnnnnnnnn", +"nnnffffffffnnnnnnnnnnnnnn", +"nnnnnnnnnnnnnnnnnnnnnnnnn", +"nnnnnnnnnnnnnnnnnnnnnnnnn", +"nnnnnnnnnnnnnnnnnnnnnnnnn", +}; diff -urNP ../siag-3.4.5/common/bitmaps/security.xpm ./common/bitmaps/security.xpm --- ../siag-3.4.5/common/bitmaps/security.xpm Thu Jan 1 01:00:00 1970 +++ ./common/bitmaps/security.xpm Wed Nov 29 11:52:35 2000 @@ -0,0 +1,37 @@ +/* XPM */ +static char *security[] = { +/* width height num_colors chars_per_pixel */ +" 18 18 12 1", +/* colors */ +". c #000000", +"# c #222222", +"a c #333366", +"b c #444444", +"c c #6666cc", +"d c #800000", +"e c #808000", +"f c #990066", +"g c #9999ff", +"h c None", +"i c #f5f5f5", +"j c #ffffff", +/* pixels */ +"hhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhcccaaahh", +"hhhhhhhhhchjjhhcah", +"hhhhhhhhhcjh.dcgah", +"hhhhhhhhhahchh#gah", +"hhhccccccahcchc..h", +"hhcj.eeeeccc.hhhhh", +"hhajjjjjjjgd.hhhhh", +"hhajgfffffdc.hhhhh", +"hhajjeeeeeed.hhhhh", +"hhajgfffffdc.hhhhh", +"hhajjeeeeeec.hhhhh", +"hhca######..chhhhh", +"hhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhhhhhh", +"hhhhhhhhhhhhhhhhhh" +}; diff -urNP ../siag-3.4.5/common/richchar.c ./common/richchar.c --- ../siag-3.4.5/common/richchar.c Tue Aug 15 11:06:36 2000 +++ ./common/richchar.c Thu Nov 23 12:15:53 2000 @@ -26,6 +26,7 @@ --- */ #include +#include #include "../common/cmalloc.h" #include "fonts.h" #include "traceme.h" diff -urNP ../siag-3.4.5/config.h.in ./config.h.in --- ../siag-3.4.5/config.h.in Fri Nov 10 16:10:52 2000 +++ ./config.h.in Tue Nov 28 16:21:39 2000 @@ -220,6 +220,9 @@ /* Define if you have the m library (-lm). */ #undef HAVE_LIBM +/* Define if you have the mimer library (-lmimer). */ +#undef HAVE_LIBMIMER + /* Define if you have the mysqlclient library (-lmysqlclient). */ #undef HAVE_LIBMYSQLCLIENT @@ -231,6 +234,9 @@ /* Define if you have the socket library (-lsocket). */ #undef HAVE_LIBSOCKET + +/* Define if you have the sqlite library (-lsqlite). */ +#undef HAVE_LIBSQLITE /* Define if you have the stocks library (-lstocks). */ #undef HAVE_LIBSTOCKS diff -urNP ../siag-3.4.5/configure ./configure --- ../siag-3.4.5/configure Sun Nov 19 16:35:52 2000 +++ ./configure Wed Nov 29 11:38:58 2000 @@ -32,6 +32,10 @@ ac_help="$ac_help --with-mysql enable Mysql database queries" ac_help="$ac_help + --with-sqlite enable Sqlite database queries" +ac_help="$ac_help + --with-mimer enable Mimer database queries" +ac_help="$ac_help --with-ccmath enable the CCMATH mathematics library" ac_help="$ac_help --enable-profiling enable profiling" @@ -581,7 +585,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:585: checking for a BSD compatible install" >&5 +echo "configure:589: 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 @@ -634,7 +638,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:638: checking whether build environment is sane" >&5 +echo "configure:642: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -691,7 +695,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:695: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:699: 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 @@ -720,7 +724,7 @@ PACKAGE=siag -VERSION=3.4.5 +VERSION=3.4.6 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; } @@ -737,7 +741,7 @@ missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:741: checking for working aclocal" >&5 +echo "configure:745: 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. @@ -750,7 +754,7 @@ fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:754: checking for working autoconf" >&5 +echo "configure:758: 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. @@ -763,7 +767,7 @@ fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:767: checking for working automake" >&5 +echo "configure:771: 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. @@ -776,7 +780,7 @@ fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:780: checking for working autoheader" >&5 +echo "configure:784: 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. @@ -789,7 +793,7 @@ fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:793: checking for working makeinfo" >&5 +echo "configure:797: 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. @@ -809,7 +813,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:813: checking for $ac_word" >&5 +echo "configure:817: 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 @@ -841,7 +845,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:845: checking for $ac_word" >&5 +echo "configure:849: 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 @@ -871,7 +875,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:875: checking for $ac_word" >&5 +echo "configure:879: 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 @@ -922,7 +926,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:926: checking for $ac_word" >&5 +echo "configure:930: 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 @@ -954,7 +958,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:958: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:962: 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. @@ -965,12 +969,12 @@ cat > conftest.$ac_ext << EOF -#line 969 "configure" +#line 973 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:978: \"$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 @@ -996,12 +1000,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:1000: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1004: 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:1005: checking whether we are using GNU C" >&5 +echo "configure:1009: 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 @@ -1010,7 +1014,7 @@ yes; #endif EOF -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 +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1018: \"$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 @@ -1029,7 +1033,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1033: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1037: 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 @@ -1072,7 +1076,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:1076: checking for a BSD compatible install" >&5 +echo "configure:1080: 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 @@ -1125,7 +1129,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1129: checking whether ln -s works" >&5 +echo "configure:1133: 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 @@ -1148,7 +1152,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:1152: checking for $ac_word" >&5 +echo "configure:1156: 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 @@ -1176,7 +1180,7 @@ fi echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 -echo "configure:1180: checking for POSIXized ISC" >&5 +echo "configure:1184: 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 @@ -1199,7 +1203,7 @@ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1203: checking how to run the C preprocessor" >&5 +echo "configure:1207: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1214,13 +1218,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:1224: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1228: \"$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 : @@ -1231,13 +1235,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:1241: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1245: \"$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 : @@ -1248,13 +1252,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:1258: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1262: \"$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 : @@ -1283,7 +1287,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:1287: checking for X" >&5 +echo "configure:1291: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -1345,12 +1349,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:1354: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1358: \"$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* @@ -1419,14 +1423,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:1434: \"$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. @@ -1532,17 +1536,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:1536: checking whether -R must be followed by a space" >&5 +echo "configure:1540: 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:1550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -1558,14 +1562,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:1573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -1597,7 +1601,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:1601: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:1605: 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 @@ -1605,7 +1609,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:1624: \"$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 @@ -1638,7 +1642,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:1642: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:1646: 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 @@ -1646,7 +1650,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:1665: \"$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 @@ -1686,12 +1690,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:1690: checking for gethostbyname" >&5 +echo "configure:1694: 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:1722: \"$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 @@ -1735,7 +1739,7 @@ if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:1739: checking for gethostbyname in -lnsl" >&5 +echo "configure:1743: 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 @@ -1743,7 +1747,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:1762: \"$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 @@ -1784,12 +1788,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:1788: checking for connect" >&5 +echo "configure:1792: 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:1820: \"$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 @@ -1833,7 +1837,7 @@ if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:1837: checking for connect in -lsocket" >&5 +echo "configure:1841: 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 @@ -1841,7 +1845,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:1860: \"$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 @@ -1876,12 +1880,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:1880: checking for remove" >&5 +echo "configure:1884: 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:1912: \"$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 @@ -1925,7 +1929,7 @@ if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:1929: checking for remove in -lposix" >&5 +echo "configure:1933: 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 @@ -1933,7 +1937,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:1952: \"$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 @@ -1968,12 +1972,12 @@ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:1972: checking for shmat" >&5 +echo "configure:1976: 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:2004: \"$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 @@ -2017,7 +2021,7 @@ if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:2021: checking for shmat in -lipc" >&5 +echo "configure:2025: 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 @@ -2025,7 +2029,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:2044: \"$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 @@ -2069,7 +2073,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:2073: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:2077: 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 @@ -2077,7 +2081,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:2096: \"$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 @@ -2117,12 +2121,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:2121: checking for $ac_hdr that defines DIR" >&5 +echo "configure:2125: 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> @@ -2130,7 +2134,7 @@ DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:2134: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2138: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -2155,7 +2159,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:2159: checking for opendir in -ldir" >&5 +echo "configure:2163: 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 @@ -2163,7 +2167,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:2182: \"$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 @@ -2196,7 +2200,7 @@ else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:2200: checking for opendir in -lx" >&5 +echo "configure:2204: 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 @@ -2204,7 +2208,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:2223: \"$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 @@ -2238,12 +2242,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:2242: checking for ANSI C header files" >&5 +echo "configure:2246: 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 @@ -2251,7 +2255,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2255: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2259: \"$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* @@ -2268,7 +2272,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 @@ -2286,7 +2290,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 @@ -2307,7 +2311,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -2318,7 +2322,7 @@ exit (0); } EOF -if { (eval echo configure:2322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -2342,19 +2346,19 @@ fi echo $ac_n "checking whether sys/types.h defines makedev""... $ac_c" 1>&6 -echo "configure:2346: checking whether sys/types.h defines makedev" >&5 +echo "configure:2350: 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:2358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2362: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_sys_types_h_makedev=yes else @@ -2372,17 +2376,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:2376: checking for sys/mkdev.h" >&5 +echo "configure:2380: 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:2386: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2390: \"$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* @@ -2410,17 +2414,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:2414: checking for sys/sysmacros.h" >&5 +echo "configure:2418: 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:2424: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2428: \"$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* @@ -2450,12 +2454,12 @@ echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:2454: checking for size_t" >&5 +echo "configure:2458: 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 @@ -2483,12 +2487,12 @@ fi echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 -echo "configure:2487: checking for st_blksize in struct stat" >&5 +echo "configure:2491: 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 @@ -2496,7 +2500,7 @@ struct stat s; s.st_blksize; ; return 0; } EOF -if { (eval echo configure:2500: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2504: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blksize=yes else @@ -2517,12 +2521,12 @@ fi echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&6 -echo "configure:2521: checking for st_blocks in struct stat" >&5 +echo "configure:2525: 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 @@ -2530,7 +2534,7 @@ struct stat s; s.st_blocks; ; return 0; } EOF -if { (eval echo configure:2534: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2538: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blocks=yes else @@ -2553,12 +2557,12 @@ fi echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6 -echo "configure:2557: checking for st_rdev in struct stat" >&5 +echo "configure:2561: 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 @@ -2566,7 +2570,7 @@ struct stat s; s.st_rdev; ; return 0; } EOF -if { (eval echo configure:2570: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2574: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_rdev=yes else @@ -2587,12 +2591,12 @@ fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:2591: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:2595: 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 @@ -2601,7 +2605,7 @@ struct tm *tp; ; return 0; } EOF -if { (eval echo configure:2605: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2609: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -2622,12 +2626,12 @@ fi echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:2626: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:2630: 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 @@ -2635,7 +2639,7 @@ struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:2639: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2643: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -2657,7 +2661,7 @@ echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6 -echo "configure:2661: checking whether getpgrp takes no argument" >&5 +echo "configure:2665: 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 @@ -2665,7 +2669,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:2728: \"$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 @@ -2744,7 +2748,7 @@ fi echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:2748: checking for 8-bit clean memcmp" >&5 +echo "configure:2752: 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 @@ -2752,7 +2756,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:2770: \"$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 @@ -2780,12 +2784,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:2784: checking return type of signal handlers" >&5 +echo "configure:2788: 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 @@ -2802,7 +2806,7 @@ int i; ; return 0; } EOF -if { (eval echo configure:2806: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2810: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -2821,12 +2825,12 @@ echo $ac_n "checking for strftime""... $ac_c" 1>&6 -echo "configure:2825: checking for strftime" >&5 +echo "configure:2829: 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:2857: \"$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 @@ -2871,7 +2875,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:2875: checking for strftime in -lintl" >&5 +echo "configure:2879: 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 @@ -2879,7 +2883,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:2898: \"$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 @@ -2917,7 +2921,7 @@ fi echo $ac_n "checking whether utime accepts a null argument""... $ac_c" 1>&6 -echo "configure:2921: checking whether utime accepts a null argument" >&5 +echo "configure:2925: 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 @@ -2927,7 +2931,7 @@ ac_cv_func_utime_null=no else cat > conftest.$ac_ext < #include @@ -2938,7 +2942,7 @@ && t.st_mtime - s.st_mtime < 120)); } EOF -if { (eval echo configure:2942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2946: \"$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 @@ -2962,12 +2966,12 @@ fi echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:2966: checking for vprintf" >&5 +echo "configure:2970: 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:2998: \"$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 @@ -3014,12 +3018,12 @@ if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:3018: checking for _doprnt" >&5 +echo "configure:3022: 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:3050: \"$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 @@ -3085,12 +3089,12 @@ strtol do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3089: checking for $ac_func" >&5 +echo "configure:3093: 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:3121: \"$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 @@ -3140,12 +3144,12 @@ echo $ac_n "checking for fnmatch""... $ac_c" 1>&6 -echo "configure:3144: checking for fnmatch" >&5 +echo "configure:3148: 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:3176: \"$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 @@ -3189,7 +3193,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gmatch in -lgen""... $ac_c" 1>&6 -echo "configure:3193: checking for gmatch in -lgen" >&5 +echo "configure:3197: 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 @@ -3197,7 +3201,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:3216: \"$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 @@ -3236,12 +3240,12 @@ fi echo $ac_n "checking for gmatch""... $ac_c" 1>&6 -echo "configure:3240: checking for gmatch" >&5 +echo "configure:3244: 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:3272: \"$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 @@ -3307,7 +3311,7 @@ if test "$withval" != "no"; then echo $ac_n "checking for dbm_open in -l$MAYBE_LIBNDBM""... $ac_c" 1>&6 -echo "configure:3311: checking for dbm_open in -l$MAYBE_LIBNDBM" >&5 +echo "configure:3315: 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 @@ -3315,7 +3319,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:3334: \"$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 @@ -3345,7 +3349,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dbm_open in -ldb""... $ac_c" 1>&6 -echo "configure:3349: checking for dbm_open in -ldb" >&5 +echo "configure:3353: 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 @@ -3353,7 +3357,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:3372: \"$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 @@ -3383,7 +3387,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dbm_open in -lgdbm""... $ac_c" 1>&6 -echo "configure:3387: checking for dbm_open in -lgdbm" >&5 +echo "configure:3391: 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 @@ -3391,7 +3395,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:3410: \"$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 @@ -3421,7 +3425,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dbm_open in -lndbm""... $ac_c" 1>&6 -echo "configure:3425: checking for dbm_open in -lndbm" >&5 +echo "configure:3429: 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 @@ -3429,7 +3433,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:3448: \"$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 @@ -3471,12 +3475,12 @@ LIBS="$LIBDB $LIBS" fi echo $ac_n "checking for dbm_dirfno""... $ac_c" 1>&6 -echo "configure:3475: checking for dbm_dirfno" >&5 +echo "configure:3479: 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:3507: \"$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 @@ -3522,12 +3526,12 @@ fi echo $ac_n "checking for dbm_pagfno""... $ac_c" 1>&6 -echo "configure:3526: checking for dbm_pagfno" >&5 +echo "configure:3530: 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:3558: \"$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 @@ -3573,12 +3577,12 @@ fi echo $ac_n "checking for dbm_rdonly""... $ac_c" 1>&6 -echo "configure:3577: checking for dbm_rdonly" >&5 +echo "configure:3581: 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:3609: \"$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 @@ -3624,12 +3628,12 @@ fi echo $ac_n "checking for dbm_open""... $ac_c" 1>&6 -echo "configure:3628: checking for dbm_open" >&5 +echo "configure:3632: 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:3660: \"$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 @@ -3679,7 +3683,7 @@ echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 -echo "configure:3683: checking for main in -lm" >&5 +echo "configure:3687: 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 @@ -3687,14 +3691,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:3702: \"$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 @@ -3723,12 +3727,12 @@ echo $ac_n "checking for acosh""... $ac_c" 1>&6 -echo "configure:3727: checking for acosh" >&5 +echo "configure:3731: 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:3759: \"$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 @@ -3774,12 +3778,12 @@ fi echo $ac_n "checking for asinh""... $ac_c" 1>&6 -echo "configure:3778: checking for asinh" >&5 +echo "configure:3782: 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:3810: \"$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 @@ -3825,12 +3829,12 @@ fi echo $ac_n "checking for log1p""... $ac_c" 1>&6 -echo "configure:3829: checking for log1p" >&5 +echo "configure:3833: 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:3861: \"$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 @@ -3876,12 +3880,12 @@ fi echo $ac_n "checking for expm1""... $ac_c" 1>&6 -echo "configure:3880: checking for expm1" >&5 +echo "configure:3884: 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:3912: \"$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 @@ -3927,12 +3931,12 @@ fi echo $ac_n "checking for cbrt""... $ac_c" 1>&6 -echo "configure:3931: checking for cbrt" >&5 +echo "configure:3935: 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:3963: \"$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 @@ -3978,12 +3982,12 @@ fi echo $ac_n "checking for drem""... $ac_c" 1>&6 -echo "configure:3982: checking for drem" >&5 +echo "configure:3986: 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:4014: \"$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 @@ -4029,12 +4033,12 @@ fi echo $ac_n "checking for atanh""... $ac_c" 1>&6 -echo "configure:4033: checking for atanh" >&5 +echo "configure:4037: 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:4065: \"$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 @@ -4081,7 +4085,7 @@ echo $ac_n "checking for main in -lcrypt""... $ac_c" 1>&6 -echo "configure:4085: checking for main in -lcrypt" >&5 +echo "configure:4089: 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 @@ -4089,14 +4093,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:4104: \"$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 @@ -4118,7 +4122,7 @@ if test "$LIBSYSDEP" = ""; then echo $ac_n "checking for main in -lposix4""... $ac_c" 1>&6 -echo "configure:4122: checking for main in -lposix4" >&5 +echo "configure:4126: 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 @@ -4126,14 +4130,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:4141: \"$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 @@ -4160,7 +4164,7 @@ echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6 -echo "configure:4164: checking for main in -lnsl" >&5 +echo "configure:4168: 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 @@ -4168,14 +4172,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:4183: \"$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 @@ -4203,7 +4207,7 @@ fi echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:4207: checking for connect in -lsocket" >&5 +echo "configure:4211: 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 @@ -4211,7 +4215,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:4230: \"$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 @@ -4254,17 +4258,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4258: checking for $ac_hdr" >&5 +echo "configure:4262: 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:4268: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4272: \"$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* @@ -4295,12 +4299,12 @@ usleep lchown strptime putpwent getwd do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4299: checking for $ac_func" >&5 +echo "configure:4303: 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:4331: \"$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 @@ -4369,7 +4373,7 @@ if test "$withval" != "no"; then echo $ac_n "checking for main in -ldl""... $ac_c" 1>&6 -echo "configure:4373: checking for main in -ldl" >&5 +echo "configure:4377: 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 @@ -4377,14 +4381,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:4392: \"$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 @@ -4405,7 +4409,7 @@ fi echo $ac_n "checking for Tcl_Main in -l$MAYBE_LIBTCL""... $ac_c" 1>&6 -echo "configure:4409: checking for Tcl_Main in -l$MAYBE_LIBTCL" >&5 +echo "configure:4413: 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 @@ -4413,7 +4417,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:4432: \"$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 @@ -4473,7 +4477,7 @@ withval="$with_guile" if test "$withval" != "no"; then echo $ac_n "checking for gh_enter in -lguile""... $ac_c" 1>&6 -echo "configure:4477: checking for gh_enter in -lguile" >&5 +echo "configure:4481: 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 @@ -4481,7 +4485,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:4500: \"$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 @@ -4527,7 +4531,7 @@ withval="$with_python" if test "$withval" != "no"; then echo $ac_n "checking for main in -lpthread""... $ac_c" 1>&6 -echo "configure:4531: checking for main in -lpthread" >&5 +echo "configure:4535: 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 @@ -4535,14 +4539,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:4550: \"$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 @@ -4570,7 +4574,7 @@ fi echo $ac_n "checking for PyFloat_AsDouble in -lpython1.5""... $ac_c" 1>&6 -echo "configure:4574: checking for PyFloat_AsDouble in -lpython1.5" >&5 +echo "configure:4578: 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 @@ -4578,7 +4582,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:4597: \"$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 @@ -4623,7 +4627,7 @@ withval="$with_stocks" if test "$withval" != "no"; then echo $ac_n "checking for main in -lstocks""... $ac_c" 1>&6 -echo "configure:4627: checking for main in -lstocks" >&5 +echo "configure:4631: 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 @@ -4631,14 +4635,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:4646: \"$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 @@ -4674,7 +4678,7 @@ withval="$with_gmp" if test "$withval" != "no"; then echo $ac_n "checking for main in -lgmp""... $ac_c" 1>&6 -echo "configure:4678: checking for main in -lgmp" >&5 +echo "configure:4682: 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 @@ -4682,14 +4686,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:4697: \"$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 @@ -4725,7 +4729,7 @@ 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 +echo "configure:4733: 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 @@ -4733,7 +4737,7 @@ ac_save_LIBS="$LIBS" LIBS="-llago $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4752: \"$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 @@ -4780,7 +4784,7 @@ 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 +echo "configure:4788: 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 @@ -4788,7 +4792,7 @@ ac_save_LIBS="$LIBS" LIBS="-lmysqlclient $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4807: \"$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 @@ -4830,6 +4834,116 @@ fi +# Check whether --with-sqlite or --without-sqlite was given. +if test "${with_sqlite+set}" = set; then + withval="$with_sqlite" + if test "$withval" != "no"; then + echo $ac_n "checking for sqlite_open in -lsqlite""... $ac_c" 1>&6 +echo "configure:4843: checking for sqlite_open in -lsqlite" >&5 +ac_lib_var=`echo sqlite'_'sqlite_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 +else + ac_save_LIBS="$LIBS" +LIBS="-lsqlite $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 sqlite | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h <&6 +fi + + fi +fi + + +# Check whether --with-mimer or --without-mimer was given. +if test "${with_mimer+set}" = set; then + withval="$with_mimer" + if test "$withval" != "no"; then + echo $ac_n "checking for SQLAllocConnect in -lmimer""... $ac_c" 1>&6 +echo "configure:4898: checking for SQLAllocConnect in -lmimer" >&5 +ac_lib_var=`echo mimer'_'SQLAllocConnect | 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="-lmimer $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 mimer | 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. @@ -4839,14 +4953,14 @@ ac_save_LIBS=$LIBS LIBS="-lccm $LIBS" cat > conftest.$ac_ext < int main() { main(); ; return 0; } EOF -if { (eval echo configure:4850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBCCMATH=-lccm else @@ -4873,7 +4987,7 @@ ac_save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $X_LIBS" echo $ac_n "checking for main in -lXext""... $ac_c" 1>&6 -echo "configure:4877: checking for main in -lXext" >&5 +echo "configure:4991: 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 @@ -4881,14 +4995,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:5006: \"$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 @@ -4911,7 +5025,7 @@ echo $ac_n "checking for main in -lXmu""... $ac_c" 1>&6 -echo "configure:4915: checking for main in -lXmu" >&5 +echo "configure:5029: 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 @@ -4919,14 +5033,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:5044: \"$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 @@ -4948,7 +5062,7 @@ echo $ac_n "checking for XCreateIC in -lX11""... $ac_c" 1>&6 -echo "configure:4952: checking for XCreateIC in -lX11" >&5 +echo "configure:5066: 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 @@ -4956,7 +5070,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:5085: \"$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 @@ -4992,7 +5106,7 @@ echo $ac_n "checking for main in -lXawM""... $ac_c" 1>&6 -echo "configure:4996: checking for main in -lXawM" >&5 +echo "configure:5110: 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 @@ -5000,14 +5114,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:5125: \"$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 @@ -5059,12 +5173,12 @@ echo $ac_n "checking for vsnprintf""... $ac_c" 1>&6 -echo "configure:5063: checking for vsnprintf" >&5 +echo "configure:5177: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vsnprintf=yes" else @@ -5112,7 +5226,7 @@ ac_save_LDFLAGS="$LDFLAGS" echo $ac_n "checking for main in -ltermcap""... $ac_c" 1>&6 -echo "configure:5116: checking for main in -ltermcap" >&5 +echo "configure:5230: 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 @@ -5120,14 +5234,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:5245: \"$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 @@ -5148,7 +5262,7 @@ fi echo $ac_n "checking for wgetch in -lncurses""... $ac_c" 1>&6 -echo "configure:5152: checking for wgetch in -lncurses" >&5 +echo "configure:5266: 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 @@ -5156,7 +5270,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:5285: \"$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 @@ -5186,7 +5300,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for wgetch in -lcurses""... $ac_c" 1>&6 -echo "configure:5190: checking for wgetch in -lcurses" >&5 +echo "configure:5304: 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 @@ -5194,7 +5308,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:5323: \"$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 @@ -5231,12 +5345,12 @@ for ac_func in resizeterm beep immedok keypad do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5235: checking for $ac_func" >&5 +echo "configure:5349: 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:5377: \"$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 @@ -5291,7 +5405,7 @@ withval="$with_t1lib" if test "$withval" != "no"; then echo $ac_n "checking for main in -lt1""... $ac_c" 1>&6 -echo "configure:5295: checking for main in -lt1" >&5 +echo "configure:5409: 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 @@ -5299,14 +5413,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:5424: \"$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 @@ -5333,7 +5447,7 @@ fi echo $ac_n "checking for main in -lt1x""... $ac_c" 1>&6 -echo "configure:5337: checking for main in -lt1x" >&5 +echo "configure:5451: 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 @@ -5341,14 +5455,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:5466: \"$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.5/configure.in ./configure.in --- ../siag-3.4.5/configure.in Tue Nov 14 08:55:00 2000 +++ ./configure.in Fri Nov 24 16:08:52 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.5) +AM_INIT_AUTOMAKE(siag, 3.4.6) dnl Set of available languages dnl ALL_LINGUAS="" diff -urNP ../siag-3.4.5/siag/Makefile.am ./siag/Makefile.am --- ../siag-3.4.5/siag/Makefile.am Fri Nov 10 09:00:14 2000 +++ ./siag/Makefile.am Tue Nov 28 16:53:52 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 lago.c mysql.c + mathfunc.c roman.c lago.c mysql.c sqlite.c mimer.c noinst_HEADERS = calc.h fileio.h user_interface.h \ selection.h mathfunc.h diff -urNP ../siag-3.4.5/siag/Makefile.in ./siag/Makefile.in --- ../siag-3.4.5/siag/Makefile.in Tue Nov 21 08:16:13 2000 +++ ./siag/Makefile.in Wed Nov 29 11:52:56 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 lago.c mysql.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 sqlite.c mimer.c noinst_HEADERS = calc.h fileio.h user_interface.h selection.h mathfunc.h @@ -123,7 +123,7 @@ 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 lago.o \ -mysql.o +mysql.o sqlite.o mimer.o AR = ar CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -362,6 +362,8 @@ 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 +mimer.o: mimer.c ../config.h ../siod/siod.h calc.h ../common/traceme.h \ + user_interface.h mysql.o: mysql.c ../config.h position.o: position.c calc.h ../common/traceme.h user_interface.h pythoni.o: pythoni.c @@ -372,6 +374,7 @@ ../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 +sqlite.o: sqlite.c ../config.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 diff -urNP ../siag-3.4.5/siag/main.c ./siag/main.c --- ../siag-3.4.5/siag/main.c Fri Nov 10 16:58:18 2000 +++ ./siag/main.c Tue Nov 28 16:52:45 2000 @@ -54,6 +54,8 @@ extern void init_ccmath(void); /* ccmath.c */ extern void init_lago(void); /* lago.c */ extern void init_mysql(void); /* mysql.c */ +extern void init_sqlite(void); /* sqlite.c */ +extern void init_mimer(void); /* mimer.c */ extern void init_mathfunc(void); /* mathfunc.c */ static char *siagrc; @@ -123,6 +125,8 @@ init_ccmath(); init_lago(); init_mysql(); + init_sqlite(); + init_mimer(); init_mathfunc(); buf = new_buffer("noname.siag", "noname.siag"); diff -urNP ../siag-3.4.5/siag/mimer.c ./siag/mimer.c --- ../siag-3.4.5/siag/mimer.c Thu Jan 1 01:00:00 1970 +++ ./siag/mimer.c Wed Nov 29 01:24:48 2000 @@ -0,0 +1,899 @@ + /*****************************************************************/ + /* MIMER (R) Embedded SQL Preprocessor Version 8.2.0C Beta Test */ + /*****************************************************************/ + +static int sql001[4] = +{ + 0,0,0,0 +}; +static const int sql002[1] = +{ + 0 +}; +static const int sql003[13] = +{ + 3, + 40,-3,128,0, + 38,-3,128,0, + 39,-3,18,0 +}; +static int sql004[4] = +{ + 0,0,0,0 +}; +static const int sql005[9] = +{ + 2, + 42,-3,128,0, + 6,-1,8191,0 +}; +static const int sql006[5] = +{ + 1, + 1,-3,128,0 +}; +static int sql007[4] = +{ + 0,0,0,0 +}; +static const int sql008[9] = +{ + 2, + 42,-3,128,0, + 1,-3,128,0 +}; +static const int sql009[9] = +{ + 2, + 1,-3,128,0, + 3,4,sizeof(int),0 +}; +static const int sql010[5] = +{ + 1, + 1,-3,128,0 +}; +static const int sql011[9] = +{ + 2, + 1,-3,128,0, + 3,4,sizeof(int),0 +}; +static int sql012[4] = +{ + 0,0,0,0 +}; +static const int sql013[9] = +{ + 2, + 42,-3,128,0, + 1,-3,128,0 +}; +static const int sql014[9] = +{ + 2, + 1,-3,128,0, + 3,4,sizeof(int),0 +}; +static int sql015[4] = +{ + 0,0,0,0 +}; +static const int sql016[5] = +{ + 1, + 42,-3,128,0 +}; +static int sql017[4] = +{ + 0,0,0,0 +}; +static const int sql018[5] = +{ + 1, + 42,-3,128,0 +}; +static const int sql019[5] = +{ + 1, + 1,-3,128,0 +}; +static const int sql020[17] = +{ + 4, + 1,-3,128,0, + 2,4,sizeof(int),0, + 10,4,sizeof(int),0, + 11,4,sizeof(int),0 +}; +static int sql021[4] = +{ + 0,0,0,0 +}; +static const int sql022[9] = +{ + 2, + 43,-3,128,0, + 42,-3,128,0 +}; +static int sql023[4] = +{ + 0,0,0,0 +}; +static const int sql024[5] = +{ + 1, + 43,-3,128,0 +}; +static int sql025[4] = +{ + 0,0,0,0 +}; +static const int sql026[9] = +{ + 2, + 43,-3,128,0, + 1,-3,128,0 +}; +static const int sql027[9] = +{ + 2, + 1,-3,128,0, + 3,4,sizeof(int),0 +}; +static const int sql028[21] = +{ + 5, + 1,-3,128,0, + 2,4,sizeof(int),0, + 9,-1,8191,0, + 18,4,sizeof(int),0, + 15,4,sizeof(int),0 +}; +static int sql029[4] = +{ + 0,0,0,0 +}; +static const int sql030[5] = +{ + 1, + 43,-3,128,0 +}; +static int sql031[4] = +{ + 0,0,0,0 +}; +static const int sql032[5] = +{ + 1, + 42,-3,128,0 +}; +static const int sql033[5] = +{ + 1, + 1,-3,128,0 +}; +static const int sql034[5] = +{ + 1, + 20,4,sizeof(int),0 +}; +static const int sql035[17] = +{ + 4, + 30,4,sizeof(int),0, + 26,-1,8191,0, + 27,4,sizeof(int),0, + 23,-1,5,0 +}; +static void* sqlpaa[5]; +static int sqlrcv[6]; +static char sqlstg[6]; + +#define __MIMESQLH +#ifdef _WIN32 +#define MIMAPI __stdcall +#else +#define MIMAPI +#endif + +#ifdef __cplusplus +extern "C" { +#endif +void MIMAPI dbapi4(int*,char*,int*,const int*,void**); +void MIMAPI dberm4(int*,char*,int*); +#ifdef __cplusplus +} +#endif + +/* + 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_LIBMIMER + +#include +#include +#include +#include +#include "../siod/siod.h" +#include "calc.h" + +#define SQL_VARCHAR 12 + +#define SQL_SUCCESS "00000" +#define SQL_INSUFFICIENT_ITEM_DESCRIPTOR_AREAS "01005" +#define SQL_NO_DATA "02000" +#define SQL_CONNECTION_REJECTED "28000" + +/**** +exec sql begin declare section; + ****/ +static char statement [129]; /* Extended statement name */ +static char cursor [129]; /* Extended cursor name */ +static char descriptor [129]; /* SQL descriptor name */ +static char sqlstate [6]; /* SQLSTATE */ +static char buf [8192]; /* Data buffer */ +/**** +exec sql end declare section; + ****/ + +static int seqno = 0; /* Sequence number for generating unique names */ + +static char *db = "siag"; +static char *user = "sysadm"; +static char *pass = "sysadm"; + +#define FAIL(msg) {\ + fprintf(stderr, "error '%s'\n", msg);\ +} + +struct cb_data { + buffer *buf; + int sht, row, col; + int r; + LISP res; +}; + +static int DsqlConnect(void) +{ +/**** + * exec sql whenever sqlerror goto exception; + ****/ + /* Entry SQL-92 */ +/**** + * exec sql begin declare section; + ****/ + char database [129] = ""; + char username [129] = ""; + char password [19] = ""; +/**** + * exec sql end declare section; + ****/ + char* p; + + strcpy(database, db); + strcpy(username, user); + strcpy(password, pass); + + for (p = username; *p; p++) *p = (char)toupper((int)*p); + +/**** + * exec sql connect to :database user :username using :password; + ****/ + /* MIMER Extended SQL */ + { + sqlpaa[0] = (void*)database; + sqlpaa[1] = (void*)username; + sqlpaa[2] = (void*)password; + sqlrcv[0] = 119; + dbapi4(sqlrcv,sqlstate,sql001,sql003,sqlpaa); + sqlstate[5] = '\0'; + if (sqlrcv[4] == 3) goto exception; + } + + return 1; + +exception: + + if (strcmp(sqlstate,SQL_CONNECTION_REJECTED) == 0) { + return 0; + } + return -1; +} + +static int DsqlDisconnect(void) +{ +/**** + * exec sql whenever sqlerror goto exception; + ****/ + /* Entry SQL-92 */ + +/**** + * exec sql disconnect; + ****/ + /* MIMER Extended SQL */ + { + sqlrcv[0] = 52; + dbapi4(sqlrcv,sqlstate,sql001,sql002,sqlpaa); + sqlstate[5] = '\0'; + if (sqlrcv[4] == 3) goto exception; + } + return 0; + +exception: + + return -1; +} + +static int DsqlExecute(char* sqlstmt) +{ +/**** + * exec sql whenever sqlerror goto exception; + ****/ + /* Entry SQL-92 */ +/**** + * exec sql begin declare section; + ****/ + int count; + int n; + int type; + int length; +/**** + * exec sql end declare section; + ****/ + + if (sqlstmt == NULL) return -1; + /* + * Make unique statement and descriptor names. + */ + seqno++; + sprintf(statement, "%d",seqno); + sprintf(descriptor,"%d",seqno); + + strncpy(buf,sqlstmt,sizeof(buf)); + buf[sizeof(buf) - 1] = '\0'; + +/**** + * exec sql prepare :statement from :buf; + ****/ + /* Full SQL-92 */ + { + sqlpaa[0] = (void*)statement; + sqlpaa[1] = (void*)buf; + sqlrcv[0] = 1; + dbapi4(sqlrcv,sqlstate,sql004,sql005,sqlpaa); + sqlstate[5] = '\0'; + if (sqlrcv[4] == 3) goto exception; + } + +/**** + * exec sql allocate descriptor :descriptor; + ****/ + /* Full SQL-92 */ + { + sqlpaa[0] = (void*)descriptor; + sqlrcv[0] = 83; + dbapi4(sqlrcv,sqlstate,sql001,sql006,sqlpaa); + sqlstate[5] = '\0'; + if (sqlrcv[4] == 3) goto exception; + } + +/**** + * exec sql describe output :statement using sql descriptor :descriptor; + ****/ + /* Full SQL-92 */ + { + sqlpaa[0] = (void*)statement; + sqlpaa[1] = (void*)descriptor; + sqlrcv[0] = 81; + dbapi4(sqlrcv,sqlstate,sql007,sql008,sqlpaa); + sqlstate[5] = '\0'; + if (sqlrcv[4] == 3) goto exception; + } + if (strcmp(sqlstate,SQL_INSUFFICIENT_ITEM_DESCRIPTOR_AREAS) == 0) { + /* + * The descriptor area was insufficient. + * Allocate a new one with appropriate size. + */ +/**** + * exec sql get descriptor :descriptor :count = count; + ****/ + /* Full SQL-92 */ + { + sqlpaa[0] = (void*)descriptor; + sqlpaa[1] = (void*)&count; + sqlrcv[0] = 85; + dbapi4(sqlrcv,sqlstate,sql001,sql009,sqlpaa); + sqlstate[5] = '\0'; + if (sqlrcv[4] == 3) goto exception; + } +/**** + * exec sql deallocate descriptor :descriptor; + ****/ + /* Full SQL-92 */ + { + sqlpaa[0] = (void*)descriptor; + sqlrcv[0] = 84; + dbapi4(sqlrcv,sqlstate,sql001,sql010,sqlpaa); + sqlstate[5] = '\0'; + if (sqlrcv[4] == 3) goto exception; + } +/**** + * exec sql allocate descriptor :descriptor with max :count; + ****/ + /* Full SQL-92 */ + { + sqlpaa[0] = (void*)descriptor; + sqlpaa[1] = (void*)&count; + sqlrcv[0] = 83; + dbapi4(sqlrcv,sqlstate,sql001,sql011,sqlpaa); + sqlstate[5] = '\0'; + if (sqlrcv[4] == 3) goto exception; + } +/**** + * exec sql describe output :statement using sql descriptor :descriptor; + ****/ + /* Full SQL-92 */ + { + sqlpaa[0] = (void*)statement; + sqlpaa[1] = (void*)descriptor; + sqlrcv[0] = 81; + dbapi4(sqlrcv,sqlstate,sql012,sql013,sqlpaa); + sqlstate[5] = '\0'; + if (sqlrcv[4] == 3) goto exception; + } + } + /* + * Get descriptor count to see if this was a select statement or not. + */ +/**** + * exec sql get descriptor :descriptor :count = count; + ****/ + /* Full SQL-92 */ + { + sqlpaa[0] = (void*)descriptor; + sqlpaa[1] = (void*)&count; + sqlrcv[0] = 85; + dbapi4(sqlrcv,sqlstate,sql001,sql014,sqlpaa); + sqlstate[5] = '\0'; + if (sqlrcv[4] == 3) goto exception; + } + if (count == 0) { + /* + * Non-select statement. Execute. + */ +/**** + * exec sql execute :statement; + ****/ + /* Full SQL-92 */ + { + sqlpaa[0] = (void*)statement; + sqlrcv[0] = 5; + dbapi4(sqlrcv,sqlstate,sql015,sql016,sqlpaa); + sqlstate[5] = '\0'; + if (sqlrcv[4] == 3) goto exception; + } + /* + * Deallocate statement and descriptor. + */ +/**** + * exec sql deallocate prepare :statement; + ****/ + /* Full SQL-92 */ + { + sqlpaa[0] = (void*)statement; + sqlrcv[0] = 77; + dbapi4(sqlrcv,sqlstate,sql017,sql018,sqlpaa); + sqlstate[5] = '\0'; + if (sqlrcv[4] == 3) goto exception; + } +/**** + * exec sql deallocate descriptor :descriptor; + ****/ + /* Full SQL-92 */ + { + sqlpaa[0] = (void*)descriptor; + sqlrcv[0] = 84; + dbapi4(sqlrcv,sqlstate,sql001,sql019,sqlpaa); + sqlstate[5] = '\0'; + if (sqlrcv[4] == 3) goto exception; + } + /* + * Return successful completion of non-select statement. + */ + return 0; + } else { + /* + * Select statement. Set all columns to VARCHAR(512). + * MIMER/SQL automatic type conversion will + * handle numeric data. + */ + type = SQL_VARCHAR; + length = 512; + for (n = 1; n <= count; n++) { +/**** + * exec sql set descriptor :descriptor value :n type = :type, + * length = :length; + ****/ + /* Full SQL-92 */ + { + sqlpaa[0] = (void*)descriptor; + sqlpaa[1] = (void*)&n; + sqlpaa[2] = (void*)&type; + sqlpaa[3] = (void*)&length; + sqlrcv[0] = 86; + dbapi4(sqlrcv,sqlstate,sql001,sql020,sqlpaa); + sqlstate[5] = '\0'; + if (sqlrcv[4] == 3) goto exception; + } + } + /* + * Make a unique cursor name. + */ + sprintf(cursor,"%d",seqno); + +/**** + * exec sql allocate :cursor cursor for :statement; + ****/ + /* Full SQL-92 */ + { + sqlpaa[0] = (void*)cursor; + sqlpaa[1] = (void*)statement; + sqlrcv[0] = 76; + dbapi4(sqlrcv,sqlstate,sql021,sql022,sqlpaa); + sqlstate[5] = '\0'; + if (sqlrcv[4] == 3) goto exception; + } +/**** + * exec sql open :cursor; + ****/ + /* Full SQL-92 */ + { + sqlpaa[0] = (void*)cursor; + sqlrcv[0] = 13; + dbapi4(sqlrcv,sqlstate,sql023,sql024,sqlpaa); + sqlstate[5] = '\0'; + if (sqlrcv[4] == 3) goto exception; + } + + return seqno; + } + +exception: + + return -1; +} + +static int DsqlFetch(struct cb_data *cbd, int c,char* record,int len) +{ +/**** + * exec sql whenever sqlerror goto exception; + ****/ + /* Entry SQL-92 */ +/**** + * exec sql begin declare section; + ****/ + int count; + int length; + int isnull; + int n; +/**** + * exec sql end declare section; + ****/ + cval val; + + val.number = 0; + + /* + * Check arguments. + */ + if (record == NULL || len < 32) return -1; + /* + * Build cursor and descriptor names. + */ + sprintf(cursor, "%d",c); + sprintf(descriptor,"%d",c); + /* + * Fetch next row from result table. + */ +/**** + * exec sql fetch next from :cursor into sql descriptor :descriptor; + ****/ + /* Full SQL-92 */ + { + sqlpaa[0] = (void*)cursor; + sqlpaa[1] = (void*)descriptor; + sqlrcv[0] = 88; + dbapi4(sqlrcv,sqlstate,sql025,sql026,sqlpaa); + sqlstate[5] = '\0'; + if (sqlrcv[4] == 3) goto exception; + } + if (strcmp(sqlstate,SQL_SUCCESS) == 0) { + /* + * Get number of columns. + */ +/**** + * exec sql get descriptor :descriptor :count = count; + ****/ + /* Full SQL-92 */ + { + sqlpaa[0] = (void*)descriptor; + sqlpaa[1] = (void*)&count; + sqlrcv[0] = 85; + dbapi4(sqlrcv,sqlstate,sql001,sql027,sqlpaa); + sqlstate[5] = '\0'; + if (sqlrcv[4] == 3) goto exception; + } + for (n = 1; n <= count; n++) { + /* + * Get one column value. + */ +/**** + * exec sql get descriptor :descriptor value :n :buf = data, + * :length = returned_length, + * :isnull = indicator; + ****/ + /* Full SQL-92 */ + { + sqlpaa[0] = (void*)descriptor; + sqlpaa[1] = (void*)&n; + sqlpaa[2] = (void*)buf; + sqlpaa[3] = (void*)&length; + sqlpaa[4] = (void*)&isnull; + sqlrcv[0] = 85; + dbapi4(sqlrcv,sqlstate,sql001,sql028,sqlpaa); + sqlstate[5] = '\0'; + if (sqlrcv[4] == 3) goto exception; + } + /* + * Check NULL indicator, trim spaces and append a tab. + */ + if (isnull == -1) { + ; /* ignore */ + } else { + buf[length] = '\0'; + if (cbd->res == NIL) { + cbd->res = strcons(length, buf); + } else { + ins_data(cbd->buf, siod_interpreter, + buf, val, MTEXT, cbd->sht, + cbd->row+cbd->r, cbd->col+n-1); + } + } + } + cbd->r++; + return count; + } else if (strcmp(sqlstate,SQL_NO_DATA) == 0) { + /* + * No more data. + */ + return 0; + } + +exception: + + return -1; +} + +static int DsqlClose(int c) +{ +/**** + * exec sql whenever sqlerror goto exception; + ****/ + /* Entry SQL-92 */ + + sprintf(cursor, "%d",c); + sprintf(statement, "%d",c); + sprintf(descriptor,"%d",c); + +/**** + * exec sql close :cursor; + ****/ + /* Full SQL-92 */ + { + sqlpaa[0] = (void*)cursor; + sqlrcv[0] = 101; + dbapi4(sqlrcv,sqlstate,sql029,sql030,sqlpaa); + sqlstate[5] = '\0'; + if (sqlrcv[4] == 3) goto exception; + } + +/**** + * exec sql deallocate prepare :statement; + ****/ + /* Full SQL-92 */ + { + sqlpaa[0] = (void*)statement; + sqlrcv[0] = 77; + dbapi4(sqlrcv,sqlstate,sql031,sql032,sqlpaa); + sqlstate[5] = '\0'; + if (sqlrcv[4] == 3) goto exception; + } +/**** + * exec sql deallocate descriptor :descriptor; + ****/ + /* Full SQL-92 */ + { + sqlpaa[0] = (void*)descriptor; + sqlrcv[0] = 84; + dbapi4(sqlrcv,sqlstate,sql001,sql033,sqlpaa); + sqlstate[5] = '\0'; + if (sqlrcv[4] == 3) goto exception; + } + return 0; + +exception: + + return -1; +} + +static int DsqlError(char* message,int len) +{ +/**** + * exec sql whenever sqlerror goto exception; + ****/ + /* Entry SQL-92 */ +/**** + * exec sql begin declare section; + ****/ + int count; + int length; + char state [6]; /* returned_sqlstate may not be stored sqlstate */ + int n; +/**** + * exec sql end declare section; + ****/ + char* p; + + if (message == NULL || len < 32) return -1; + /* + * Get number of errors. + */ +/**** + * exec sql get diagnostics :count = number; + ****/ + /* Transitional SQL-92 */ + { + sqlpaa[0] = (void*)&count; + sqlrcv[0] = 75; + dbapi4(sqlrcv,sqlstate,sql001,sql034,sqlpaa); + sqlstate[5] = '\0'; + if (sqlrcv[4] == 3) goto exception; + } + for (n = 1; n <= count; n++) { + /* + * Get diagnostics of an error. + */ +/**** + * exec sql get diagnostics exception :n :buf = message_text, + * :length = message_length, + * :state = returned_sqlstate; + ****/ + /* Transitional SQL-92 */ + { + sqlpaa[0] = (void*)&n; + sqlpaa[1] = (void*)buf; + sqlpaa[2] = (void*)&length; + sqlpaa[3] = (void*)state; + sqlrcv[0] = 75; + dbapi4(sqlrcv,sqlstate,sql001,sql035,sqlpaa); + sqlstate[5] = '\0'; + if (sqlrcv[4] == 3) goto exception; + } + /* + * Prepare message area. + */ + if (length > len - 18) length = len - 18; + memcpy(message,buf,length); + p = strchr(message,':'); + if (p) *p = '\n'; + if (length > 64) { + p = strchr(&message[64],' '); + if (p) *p = '\n'; + } + message += length; + len -= length; + *message++ = '\n'; + /* + * Add SQLSTATE code. + */ + strcpy(message,"SQLSTATE:"); + message += 9; + strcpy(message,state); + message += 5; + *message++ = '\n'; + *message++ = '\n'; + len -= 17; + if (len < 32) break; + } + *message = '\0'; + return 0; + +exception: + + strcpy(message,"cannot get diagnostics\n\n"); + return -1; +} + +/* MAIN */ + +static char sqlbuf[4096]; + +static void error(void) +{ + DsqlError(sqlbuf,sizeof(sqlbuf)); + printf("%s\n",sqlbuf); +} + + +static LISP lmimer_query(LISP query) +{ + char *q = get_c_string(query); + struct cb_data cbd; + int rc; + int cursor; + int rowcount; + + get_siod_coords(&cbd.row, &cbd.col, &cbd.sht, &cbd.buf); + cbd.r = 0; + cbd.res = NIL; + + rc = DsqlConnect(); + if (rc <= 0) { + error(); + return NIL; + } + + /* + * Exec argv[4] as an SQL statement + */ + strcpy(sqlbuf, q); + + cursor = DsqlExecute(sqlbuf); + if (cursor > 0) { + rowcount = 0; + while ((rc = DsqlFetch(&cbd, cursor,sqlbuf,sizeof(sqlbuf))) > 0); + if (rc < 0 || DsqlClose(cursor) < 0) error(); + } else if (cursor == 0) { + printf("*** SQL statement executed successfully! ***\n\n"); + } else { + error(); + } + + if (DsqlDisconnect() < 0) error(); + return cbd.res; +} + +void init_mimer(void) +{ + init_subr_1("mimer_query", lmimer_query); +} + +#else + +void init_mimer(void) +{ + ; +} + +#endif /* MIMER */ + diff -urNP ../siag-3.4.5/siag/sqlite.c ./siag/sqlite.c --- ../siag-3.4.5/siag/sqlite.c Thu Jan 1 01:00:00 1970 +++ ./siag/sqlite.c Fri Nov 24 15:52:49 2000 @@ -0,0 +1,102 @@ +/* + 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_LIBSQLITE + +/* Highly experimental! */ + +#include +#include +#include +#include "../siod/siod.h" +#include "calc.h" + +static char *database = "siag"; + +#define FAIL(db, msg) {\ + fprintf(stderr, "error '%s'\n", msg);\ + sqlite_close(db);\ + return NIL;\ +} + +struct cb_data { + buffer *buf; /* buffer we're filling in */ + int sht, row, col; /* where */ + int r; /* row within query result */ + LISP res; /* to be returned from function */ +}; + +static int store_result(void *data, int n, char **p, char **q) +{ + struct cb_data *cbd = (struct cb_data *)data; + + int i; + cval val; + + val.number = 0; + + for (i = 0; i < n; i++) { + if (cbd->res == NIL) { + cbd->res = strcons(strlen(p[i]), p[i]); + } else { + ins_data(cbd->buf, siod_interpreter, + p[i], val, MTEXT, cbd->sht, + cbd->row+cbd->r, cbd->col+i); + } + } + cbd->r++; + return 0; +} + +static LISP lsqlite_query(LISP query) +{ + int n; + char *q = get_c_string(query); + sqlite *db; + char *errmsg; + struct cb_data cbd; + + get_siod_coords(&cbd.row, &cbd.col, &cbd.sht, &cbd.buf); + cbd.r = 0; + cbd.res = NIL; + db = sqlite_open(database, 0666, &errmsg); + if (!db) FAIL(db, errmsg); + n = sqlite_exec(db, q, store_result, &cbd, &errmsg); + if (n != 0) FAIL(db, errmsg); + sqlite_close(db); + return cbd.res; +} + +void init_sqlite(void) +{ + init_subr_1("sqlite_query", lsqlite_query); +} + +#else + +void init_sqlite(void) +{ + ; +} + +#endif /* SQLITE */ + diff -urNP ../siag-3.4.5/xcommon/fonts.c ./xcommon/fonts.c --- ../siag-3.4.5/xcommon/fonts.c Fri Oct 27 01:54:11 2000 +++ ./xcommon/fonts.c Fri Nov 24 20:03:56 2000 @@ -702,7 +702,8 @@ return; /* starter mark */ } - name = font_table[newfont].name; + name = font_table[format_table[newfont].font].name; + fprintf(fp, "/%s%s findfont\n", ps_fontname(newfont), fontname_table[name].iso8859_1?"-ISOLatin1":"");