diff -urNP ../siag-3.3.10/ChangeLog ./ChangeLog --- ../siag-3.3.10/ChangeLog Sun Jun 18 22:35:15 2000 +++ ./ChangeLog Mon Jun 26 23:40:49 2000 @@ -1,4 +1,25 @@ +000626 Siag: Added support for the immensely cool libstocks library, + which fetches stock quotes from Yahoo. New module stocks.c. + New SIOD functions stock_test, stock_price, stock_yesterday, + stock_open, stock_min, stock_max, stock_var, stock_volume. + Implemented a simple stock quote cache to prevent that the + same quote is fetched over and over again. Not only would that + be an antisocial thing to do, but it would also be terribly slow + for the user. Now the same quote is never fetched more than once + every five minutes. + Egon: XSynchronize seems to eliminate the X errors. + New translation: Brazilian Portuguese by arfreitas@ig.com.br. + +000623 Egon, Siag: Save as PDF. + Egon: Plaintext loader created object names containing spaces. + Egon, PW, Siag: Remove plugin directory on exit. Moved plugin_basedir + to common/common.c. + +000622 PW: Load and save PDF using pdftohtml and ps2pdf. + +000619 Egon: Plaintext loader scales the text to fit the window. + 000618 Egon: Load and save HTML and load MS Powerpoint using pptHtml. Load Magicpoint as plaintext using the new converter mgptotxt. Keyboard control. Docs for keybindings and file formats slightly diff -urNP ../siag-3.3.10/TODO ./TODO --- ../siag-3.3.10/TODO Sun May 28 23:10:55 2000 +++ ./TODO Thu Jun 22 15:26:57 2000 @@ -1,4 +1,6 @@ +The external loader/saver stuff doesn't really work;: + LaTeX plugin: wrap a single line in this: \documentclass{article} \pagestyle{empty} diff -urNP ../siag-3.3.10/acinclude.m4 ./acinclude.m4 --- ../siag-3.3.10/acinclude.m4 Thu Jun 15 07:04:20 2000 +++ ./acinclude.m4 Tue Jun 27 06:45:03 2000 @@ -134,6 +134,12 @@ AC_SUBST(PYTHON) AC_SUBST(LIBPYTHON) +AC_ARG_WITH(stocks, + [ --with-stocks enable libstocks], + [ if test "$withval" != "no"; then + AC_CHECK_LIB(stocks, main) + fi ]) + dnl No Perl LIBPERL="" AC_SUBST(LIBPERL) diff -urNP ../siag-3.3.10/aclocal.m4 ./aclocal.m4 --- ../siag-3.3.10/aclocal.m4 Sun Jun 18 22:43:45 2000 +++ ./aclocal.m4 Tue Jun 27 08:31:32 2000 @@ -146,6 +146,12 @@ AC_SUBST(PYTHON) AC_SUBST(LIBPYTHON) +AC_ARG_WITH(stocks, + [ --with-stocks enable libstocks], + [ if test "$withval" != "no"; then + AC_CHECK_LIB(stocks, main) + fi ]) + dnl No Perl LIBPERL="" AC_SUBST(LIBPERL) diff -urNP ../siag-3.3.10/common/Makefile.am ./common/Makefile.am --- ../siag-3.3.10/common/Makefile.am Thu May 18 11:12:58 2000 +++ ./common/Makefile.am Mon Jun 26 10:02:19 2000 @@ -23,7 +23,7 @@ fonts.txt rgb.txt t1lib.config FontDataBase IsoLatin1.enc IsoLatin2.enc \ dictionary.sv dictionary.es dictionary.de dictionary.fr \ dictionary.no dictionary.hr dictionary.da dictionary.pl \ - dictionary.gl dictionary.ru dictionary.cs + dictionary.gl dictionary.ru dictionary.cs dictionary.pt_BR common_SCRIPTS = any2xpm readpfa diff -urNP ../siag-3.3.10/common/Makefile.in ./common/Makefile.in --- ../siag-3.3.10/common/Makefile.in Sun Jun 18 22:46:13 2000 +++ ./common/Makefile.in Tue Jun 27 08:32:38 2000 @@ -100,7 +100,7 @@ CLEANFILES = rgb comments commondir = $(datadir)/siag/common -common_DATA = common.scm position.scm tools.scm fonts.txt rgb.txt t1lib.config FontDataBase IsoLatin1.enc IsoLatin2.enc dictionary.sv dictionary.es dictionary.de dictionary.fr dictionary.no dictionary.hr dictionary.da dictionary.pl dictionary.gl dictionary.ru dictionary.cs +common_DATA = common.scm position.scm tools.scm fonts.txt rgb.txt t1lib.config FontDataBase IsoLatin1.enc IsoLatin2.enc dictionary.sv dictionary.es dictionary.de dictionary.fr dictionary.no dictionary.hr dictionary.da dictionary.pl dictionary.gl dictionary.ru dictionary.cs dictionary.pt_BR common_SCRIPTS = any2xpm readpfa diff -urNP ../siag-3.3.10/common/common.c ./common/common.c --- ../siag-3.3.10/common/common.c Sun Jun 18 14:55:55 2000 +++ ./common/common.c Mon Jun 26 00:42:53 2000 @@ -225,14 +225,6 @@ return c; } -/* --- -Delete all temp directories whose processes are no longer around. -NB: Doesn't do anything at all. -*/ - -void stale_dirs(char *dn) -{ -} /* a little bookkeeping to keep track of temp files and make sure they are deleted when child processes terminate */ @@ -523,5 +515,16 @@ { while (*p && isspace(*p)) p++; return (*p == '\0'); +} + +char *plugin_basedir(char *dir, char *bufname) +{ + int i; + pid_t pid = getpid(); + + sprintf(dir, "%s/%ld/%s", siag_basedir, (long)pid, bufname); + for (i = strlen(dir)-strlen(bufname); dir[i]; i++) + if (!isalnum(dir[i])) dir[i] = '_'; + return dir; } diff -urNP ../siag-3.3.10/common/common.h ./common/common.h --- ../siag-3.3.10/common/common.h Sun Jun 18 14:56:19 2000 +++ ./common/common.h Fri Jun 23 22:20:56 2000 @@ -37,7 +37,6 @@ extern int cstrcmp(const char *, const char *); extern int cstrcasecmp(const char *, const char *); extern int cstrncasecmp(const char *, const char *, size_t); -extern void stale_dirs(char *); extern void deletia_add(long, char *); extern void deletia_mark(long); extern void deletia_reap(void); @@ -48,6 +47,7 @@ extern void quotecpy(char *, char *, char *); extern pid_t spawn(const char *); extern int only_space(char *); +extern char *plugin_basedir(char *, char *); #undef _ #define _ translate diff -urNP ../siag-3.3.10/common/dictionary.pt_BR ./common/dictionary.pt_BR --- ../siag-3.3.10/common/dictionary.pt_BR Thu Jan 1 01:00:00 1970 +++ ./common/dictionary.pt_BR Mon Jun 26 10:01:48 2000 @@ -0,0 +1,382 @@ + +%s command: %s comando: +%s expression: %s expressão: +About Egon Animator Sobre o programa de animação Egon +About Pathetic Writer Sobre o Pathetic Writer +About Siag Sobre o Siag +Abstract Abstrair +Add Arc Adicionar arco +Add Ellipse Adicionar elipse +Add Filled Arc Adicionar preenchimento de arco +Add Filled Ellipse Adicionar preenchimento de elipse +Add Filled Rectangle Adicionar preenchimento de retângulo +Add Image Adicionar imagem +Add Line Adicionar linha +Add Object Adicionar objeto +Add Point Adicionar ponto +Add Property Adicionar Propriedade +Add Rectangle Adicionar Retângulo +Add Sheet Adicionar página +Add String Adicionar seqüência de caracteres +Add Tick Adicionar marca +Add the contents of the block Adicionar o conteúdo do bloco +Add tick Adicionar marca +Address Endereço +Adjustment Ajustar +Advanced Avançar +Already defining kbd macro! Já definindo macro de teclado! +Another Form Test Outro formulário de teste +Another Form Test Still Ainda outro formulário de teste +Arc Arco +Archive Arquivo +Attempt to delete sole ordinary window Tentativa de remover janela só +Attributes Atributos +Begin Empty Animation Começar uma animação vazia +Beginning of buffer Iniciando o buffer +Black Preto +Block Block Bloco +Block Average Média do bloco +Block Color Cor do bloco +Block Format Formato do bloco +Block Maximum Bloco máximo +Block Minimum Bloco mínimo +Block Style Estilo de bloco +Block Sum Soma de bloco +Blue Azul +Bold Negrito +Bold text Texto em negrito +Borders Bordas +Borders Bordas +Both Ambos +Bottom No topo +Bottom of buffer Topo do buffer +Box Caixa +Box Animation Demo Demo de caixa de animação +Boxes Caixas +C Command Comando C +C Expression Expressão C +C command: Comando C: +C expression: Expressão C: +Can't execute anonymous macro while defining one Não posso executar uma macro anônima enquanto estiver definindo uma +Can't open loader file Não posso abrir arquivo carregador +Can't open saver file Não posso abrir arquivo de salvamento +Cancel Cancelar +Cell Color Cor da célula +Cell Format Formato da celúla +Cell Protection Proteção da célula +Cell Style Estilo da célula +Center Centro +Centered text Texto centralizado +Change Buffer Mudar buffer +Change Buffer: Mudar buffer: +Change Default Interpreter Mudar Interpretador Padrão +Change Object Type Mudar tipo de objeto +Change Window Mudar janela +Change default interpreter Mudar interpretador padrão +Change the color Mudar a cor +Change the display style Mudar o formato da tela +Change the font family Mudar o tipo da fonte +Change the font size Mudar o tamanho da fonte +Circle Círculo +Circle Animation Demo Demo de Animação de Círculo +Cleanup Limpar +Color: Cor: +Column Width Largura da coluna +Columns Ascending as Numbers Colunas Ascendentes como Números +Columns Ascending as Text Colunas Ascendentes como Texto +Columns Descending as Numbers Colunas Descendentes como Números +Columns Descending as Text Colunas Descendentes como Texto +Combination Combinação +Combo Animation Demo Demo de Animação Combo +Comma Comma +Command Comando +Compressed Archive Arquivo comprimido +Compressed File Arquivo comprimido +Contents Conteúdo +Copy Copiar +Copy Block Copiar bloco +Copying Copiando +Couldn't kill last buffer Não foi possível matar último buffer +Couldn't save Não foi possível salvar +Currency Corrente +Cut Cortar +Cyan Cyan +Data Dados +Data Entry Entrada de dados +Date Data +Default Padrão +Define Style Definir estilo +Defining kbd macro... Definir macro kbd ... +Delete Apagar +Delete Block Apagar bloco +Delete Buffer Apagar buffer +Delete Object Apagar objeto +Delete Tick Apagar seleção +Directory: Diretório +Disable Desabilitar +Disable Helptexts Desabilitar textos de ajuda +Display the Egon online documentation Mostrar a documentação online do Egon +Display the Gnu general public license Mostrar a licença de uso público Gnu +Display the PW online documentation Mostrar a documentação online do PW +Display the Siag online documentation Mostrar a documentação online do SIAG +Dots Pontos +Draw borders around the block Desenhar bordas em volta do bloco +Draw grid lines in the block Desenhar linhas de grade no bloco +Dump Words Despejar palavras +Edit Editar +Edit Properties Editar propriedades +Edit Record Editar gravação +Ellipse Elipse +Embed Encaixar +Embed Object Encaixar objeto +End of buffer Final do buffer +Enter user data Entre com dados do usuário +Examples Exemplos +Exit Saída +Export Exportar +Expression Expressão +Expression style: Estilo de expressão +External Program: Programa externo: +External program failed Programa externo falhou +Extra Extra +Family Name Nome da família +File Arquivo +File Manager Gerenciador de arquivos +File Name: Nome do arquivo: +File saved Arquivo salvo +Fill Block Preencher bloco +Filled Arc Arco preenchido +Filled Ellipse Elipse preenchida +Filled Rectangle Retangulo preenchido +Find Procurar +Find Backward Procurar anterior +Find pattern: Procurar padrão: +First name Primeiro nome +Fit Block Ajustar bloco +Fit Block Height Ajustar altura do bloco +Fit Block Width Ajustar largura do bloco +Fixed Fixo +Form Test Formulário de teste +Format Formato +Generic Genérico +Go To Vá Para +Go to: Vá para: +Green Verde +Grid Grade +Grid Lines Linhas de grade +Guile Command Comando do Guile +Guile Expression Expressão do Guile +Guile command: Comando do Guile: +Guile expression: Expressão do Guile: +Header 1 Cabeçário 1 +Header 2 Cabeçário 2 +Header 3 Cabeçário 3 +Header 4 Cabeçário 4 +Header 5 Cabeçário 5 +Header 6 Cabeçário 6 +Height: Altura: +Help Ajuda +Help for Help Ajuda para a Ajuda +Helptexts Textos de ajuda +Hex Feitiço +Hide Esconder +Hide Editor Esconder Editor +Hide editor Esconder editor +Home Início +Identify Cell Identificar célula +Ignore Ignorar +Image Imagem +Import Importar +Import Plugin Importar plugin +Impulses Impulsos +Input buffer overflow; macro execution terminated Inserir inundação de buffer; execução de macro terminada +Insert Column Inserir coluna +Insert Line Inserir linha +Integer Inteiro +Invisible Invisível +Italic Itálico +Italic text Texto itálico +Key Chave +Keyboard macro defined Macro de teclado definida +Kill Buffer: Matar o buffer: +Label Etiqueta +Label: Etiqueta: +Landscape Paisagem +Last name Último nome +Left Esquerda +Left adjusted text Texto alinhado à esquerda +Line Linha +Line Animation Demo Demo de animação de linha +Line Color Cor da linha +Line Format Formato da linha +Line Height Altura da linha +Line Style Estilo da linha +Lines Linhas +Linespoints Pontos de linha +Link Link +List Selection Seleção de lista +Load External Carregar externo +Load auto startup code? Carregar código auto iniciável? +Loading Carregando +Local File Arquivo local +Magenta Magenta +Mail Correio +Misc Miscelânia +Move Mover +Move Plugin Mover plugin +New Novo +New expression interpreter: Novo interpretador de expressão +New file Novo arquivo +Next animation frame Próximo quadro da animação +Next frame Próximo quadro +No Não +No files found Nenhum arquivo encontrado +No such buffer Buffer não existente +None Nenhum +Not defining kbd macro Macro de teclado não definida +OK OK +Object file: Arquivo de objeto: +One Window Uma janela +Open Abrir +Open Object Abrir objeto +Open a Pathetic Writer document Abrir um documento do Pathetic Writer +Open a Siag document Abrir um documento do Siag +Open an Egon Animator document Abrir um documento do Egon Animator +Open file Abrir arquivo +Orientation Orientação +Other Outro +Overwrite existing %s? Sobrescrever %s existentes? +Parameters: Parâmetros: +Paste Colar +Pause the animation Pausar a animação +Percent Porcentagem +Pick one: Selecionar um: +Pixmap Pixmap +Play Animation Rodar Animação +Play animation Rodar animação +Play the animation Rodar a animação +Plot Plotar +Plot the contents of the block using lines Plotar o conteúdo do bloco usando linhas +Plugin Plugin +Point Ponto +Points Pontos +Pop down animation Minimizar animação +Portrait Imagem +Preformatted Pré-formatado +Preview Visualização rápida +Preview the contents of the current buffer Visualizar o conteúdo do buffer atual +Previous animation frame Quadro de animação anterior +Previous frame Quadro anterior +Print Imprimir +Print Format Imprimir o formato +Print the contents of the current buffer Imprimir o conteúdo do buffer atual +Protect Cells Proteger células +Quit Sair +Quit Egon Sair do Egon +Quit animation Sair da animação +Recalculate Recalcular +Rectangle Retângulo +Red Vermelho +Reference Style Estilo de referência +Remove Column Remover coluna +Remove Line Remover linha +Remove Object Remover objeto +Remove Protection Remover proteção +Remove Sheet Remover planilha +Remove Window Remover janela +Remove grid lines from the block Remover grades de linha do bloco +Rename Sheet Renomear planilha +Replace Repor +Respect Relação +Right Direita +Right adjusted text Texto ajustado a direita +Row Height Altura da linha +Rows Ascending as Numbers Linhas ascendentes como Números +Rows Ascending as Text Linhas ascendentes como Texto +Rows Descending as Numbers Linhas descendentes como Números +Rows Descending as Text Linhas descendentes como Texto +SIOD Command Comando SIOD +SIOD Expression Expressão SIOD +SIOD command: Comando SIOD: +SIOD expression: Comando SIOD: +Save Salvar +Save %s? Salvar %s? +Save As Salvar como +Save External Salvar documento externo +Save Object Salvar objeto +Save Preferences Salvar preferências +Save file Salvar arquivo +Save the contents of the current buffer Salvar o conteúdo do buffer atual +Scientific Científico +Search Procurar +Search: Procurar: +Segment Color Segmento de cor +Segment Format Formato do segmento +Segment Style Estilo do segmento +Select All Selecionar tudo +Select File Selecionar arquivo +Select Plugin: Selecionar plugin: +Select everything Selecionar tudo +Set Configurar +Set Background Configurar fundo +Set Block Configurar bloco +Set Default Configurar como padrão +Set Default Format Configurar como formato padrão +Set Geometry Configurar geometria +Set Mark Configurar marca +Sheet %d Planilha %d +Show Mostrar +Show Editor Mostrar Editor +Show editor Mostrar editor +Siag-net Siag-net +Size Tamanho +Smart Fill Block Preenchimento de bloco inteligente +Sort Classificar +Sort ascending Classificar em ascendente +Sort descending Classificar em descendente +Spell Ortografia +Spell Test Teste de ortografia +Spelling checker Verificar ortografia +Split Window Dividir Janela +Start another instance of Egon Animator Iniciar outra instância do Egon Animator +Start another instance of Pathetic Writer Iniciar outra instância do Pathetic Writer +Start another instance of Siag Iniciar outra instância do Siag +Steps Passos +Stop animation Parar animação +String Seqüência de caracteres +Subscript Sobescrito +Sum Soma +Superscript Sobrescrito +Surface Superfície +Tcl Command Comando Tcl +Tcl Expression Expressão Tcl +Tcl command: Comando Tcl: +Tcl expression: Expressão Tcl: +This window is too small to split Esta janela é muito pequena para dividir +Time Tempo +Timing Controlador de tempo +Title Título +To: Para: +Tools Ferramentas +Top Topo +Top of buffer Topo do buffer +Underline Sublinhado +Underline the block Sublinhar o bloco +Underlined text Sublinhar o texto +Undo Desfazer +Unset Block Desconfigurar o bloco +Use Uso +User 1 Usuário 1 +User 2 Usuário 2 +User 3 Usuário 3 +User 4 Usuário 4 +User 5 Usuário 5 +Value Valor +Web Server Servidor Web +White Branco +Width: Largura: +Window Janela +Yellow Amarelo +Yes Sim +Yet Another Form Test Ainda outro teste de formulário +color cor diff -urNP ../siag-3.3.10/config.h.in ./config.h.in --- ../siag-3.3.10/config.h.in Thu Jun 15 07:05:08 2000 +++ ./config.h.in Mon Jun 26 16:33:55 2000 @@ -219,6 +219,9 @@ /* Define if you have the socket library (-lsocket). */ #undef HAVE_LIBSOCKET +/* Define if you have the stocks library (-lstocks). */ +#undef HAVE_LIBSTOCKS + /* Name of package */ #undef PACKAGE diff -urNP ../siag-3.3.10/configure ./configure --- ../siag-3.3.10/configure Sun Jun 18 22:43:50 2000 +++ ./configure Tue Jun 27 08:31:37 2000 @@ -22,6 +22,8 @@ ac_help="$ac_help --with-python enable python commands and expressions" ac_help="$ac_help + --with-stocks enable libstocks" +ac_help="$ac_help --with-t1lib enable t1lib" # Initialize some variables set by options. @@ -567,7 +569,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:571: checking for a BSD compatible install" >&5 +echo "configure:573: 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 @@ -620,7 +622,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:624: checking whether build environment is sane" >&5 +echo "configure:626: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -677,7 +679,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:681: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:683: 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 @@ -706,7 +708,7 @@ PACKAGE=siag -VERSION=3.3.10 +VERSION=3.3.11 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; } @@ -723,7 +725,7 @@ missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:727: checking for working aclocal" >&5 +echo "configure:729: 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. @@ -736,7 +738,7 @@ fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:740: checking for working autoconf" >&5 +echo "configure:742: 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. @@ -749,7 +751,7 @@ fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:753: checking for working automake" >&5 +echo "configure:755: 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. @@ -762,7 +764,7 @@ fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:766: checking for working autoheader" >&5 +echo "configure:768: 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. @@ -775,7 +777,7 @@ fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:779: checking for working makeinfo" >&5 +echo "configure:781: 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. @@ -795,7 +797,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:799: checking for $ac_word" >&5 +echo "configure:801: 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 @@ -827,7 +829,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:831: checking for $ac_word" >&5 +echo "configure:833: 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 @@ -857,7 +859,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:861: checking for $ac_word" >&5 +echo "configure:863: 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 @@ -908,7 +910,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:912: checking for $ac_word" >&5 +echo "configure:914: 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 @@ -940,7 +942,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:944: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:946: 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. @@ -951,12 +953,12 @@ cat > conftest.$ac_ext << EOF -#line 955 "configure" +#line 957 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:960: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:962: \"$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 @@ -982,12 +984,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:986: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:988: 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:991: checking whether we are using GNU C" >&5 +echo "configure:993: 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 @@ -996,7 +998,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1000: \"$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:1002: \"$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 @@ -1015,7 +1017,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1019: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1021: 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 @@ -1058,7 +1060,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:1062: checking for a BSD compatible install" >&5 +echo "configure:1064: 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 @@ -1111,7 +1113,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1115: checking whether ln -s works" >&5 +echo "configure:1117: 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 @@ -1134,7 +1136,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:1138: checking for $ac_word" >&5 +echo "configure:1140: 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 @@ -1162,7 +1164,7 @@ fi echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 -echo "configure:1166: checking for POSIXized ISC" >&5 +echo "configure:1168: 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 @@ -1185,7 +1187,7 @@ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1189: checking how to run the C preprocessor" >&5 +echo "configure:1191: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1200,13 +1202,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:1210: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1212: \"$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 : @@ -1217,13 +1219,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:1227: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1229: \"$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 : @@ -1234,13 +1236,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:1244: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1246: \"$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 : @@ -1269,7 +1271,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:1273: checking for X" >&5 +echo "configure:1275: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -1331,12 +1333,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:1340: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1342: \"$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* @@ -1405,14 +1407,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:1418: \"$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. @@ -1518,17 +1520,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:1522: checking whether -R must be followed by a space" >&5 +echo "configure:1524: 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:1534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -1544,14 +1546,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:1557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -1583,7 +1585,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:1587: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:1589: 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 @@ -1591,7 +1593,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:1608: \"$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 @@ -1624,7 +1626,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:1628: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:1630: 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 @@ -1632,7 +1634,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:1649: \"$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 @@ -1672,12 +1674,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:1676: checking for gethostbyname" >&5 +echo "configure:1678: 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:1706: \"$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 @@ -1721,7 +1723,7 @@ if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:1725: checking for gethostbyname in -lnsl" >&5 +echo "configure:1727: 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 @@ -1729,7 +1731,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:1746: \"$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 @@ -1770,12 +1772,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:1774: checking for connect" >&5 +echo "configure:1776: 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:1804: \"$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 @@ -1819,7 +1821,7 @@ if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:1823: checking for connect in -lsocket" >&5 +echo "configure:1825: 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 @@ -1827,7 +1829,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:1844: \"$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 @@ -1862,12 +1864,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:1866: checking for remove" >&5 +echo "configure:1868: 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:1896: \"$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 @@ -1911,7 +1913,7 @@ if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:1915: checking for remove in -lposix" >&5 +echo "configure:1917: 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 @@ -1919,7 +1921,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:1936: \"$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 @@ -1954,12 +1956,12 @@ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:1958: checking for shmat" >&5 +echo "configure:1960: 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:1988: \"$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 @@ -2003,7 +2005,7 @@ if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:2007: checking for shmat in -lipc" >&5 +echo "configure:2009: 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 @@ -2011,7 +2013,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:2028: \"$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 @@ -2055,7 +2057,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:2059: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:2061: 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 @@ -2063,7 +2065,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:2080: \"$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 @@ -2103,12 +2105,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:2107: checking for $ac_hdr that defines DIR" >&5 +echo "configure:2109: 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> @@ -2116,7 +2118,7 @@ DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:2120: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2122: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -2141,7 +2143,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:2145: checking for opendir in -ldir" >&5 +echo "configure:2147: 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 @@ -2149,7 +2151,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:2166: \"$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 @@ -2182,7 +2184,7 @@ else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:2186: checking for opendir in -lx" >&5 +echo "configure:2188: 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 @@ -2190,7 +2192,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:2207: \"$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 @@ -2224,12 +2226,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:2228: checking for ANSI C header files" >&5 +echo "configure:2230: 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 @@ -2237,7 +2239,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2241: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2243: \"$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* @@ -2254,7 +2256,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 @@ -2272,7 +2274,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 @@ -2293,7 +2295,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -2304,7 +2306,7 @@ exit (0); } EOF -if { (eval echo configure:2308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -2328,19 +2330,19 @@ fi echo $ac_n "checking whether sys/types.h defines makedev""... $ac_c" 1>&6 -echo "configure:2332: checking whether sys/types.h defines makedev" >&5 +echo "configure:2334: 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:2344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2346: \"$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 @@ -2358,17 +2360,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:2362: checking for sys/mkdev.h" >&5 +echo "configure:2364: 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:2372: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2374: \"$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* @@ -2396,17 +2398,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:2400: checking for sys/sysmacros.h" >&5 +echo "configure:2402: 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:2410: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2412: \"$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* @@ -2436,12 +2438,12 @@ echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:2440: checking for size_t" >&5 +echo "configure:2442: 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 @@ -2469,12 +2471,12 @@ fi echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 -echo "configure:2473: checking for st_blksize in struct stat" >&5 +echo "configure:2475: 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 @@ -2482,7 +2484,7 @@ struct stat s; s.st_blksize; ; return 0; } EOF -if { (eval echo configure:2486: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2488: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blksize=yes else @@ -2503,12 +2505,12 @@ fi echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&6 -echo "configure:2507: checking for st_blocks in struct stat" >&5 +echo "configure:2509: 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 @@ -2516,7 +2518,7 @@ struct stat s; s.st_blocks; ; return 0; } EOF -if { (eval echo configure:2520: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2522: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blocks=yes else @@ -2539,12 +2541,12 @@ fi echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6 -echo "configure:2543: checking for st_rdev in struct stat" >&5 +echo "configure:2545: 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 @@ -2552,7 +2554,7 @@ struct stat s; s.st_rdev; ; return 0; } EOF -if { (eval echo configure:2556: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2558: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_rdev=yes else @@ -2573,12 +2575,12 @@ fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:2577: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:2579: 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 @@ -2587,7 +2589,7 @@ struct tm *tp; ; return 0; } EOF -if { (eval echo configure:2591: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2593: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -2608,12 +2610,12 @@ fi echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:2612: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:2614: 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 @@ -2621,7 +2623,7 @@ struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:2625: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2627: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -2643,7 +2645,7 @@ echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6 -echo "configure:2647: checking whether getpgrp takes no argument" >&5 +echo "configure:2649: 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 @@ -2651,7 +2653,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:2712: \"$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 @@ -2730,7 +2732,7 @@ fi echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:2734: checking for 8-bit clean memcmp" >&5 +echo "configure:2736: 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 @@ -2738,7 +2740,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:2754: \"$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 @@ -2766,12 +2768,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:2770: checking return type of signal handlers" >&5 +echo "configure:2772: 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 @@ -2788,7 +2790,7 @@ int i; ; return 0; } EOF -if { (eval echo configure:2792: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2794: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -2807,12 +2809,12 @@ echo $ac_n "checking for strftime""... $ac_c" 1>&6 -echo "configure:2811: checking for strftime" >&5 +echo "configure:2813: 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:2841: \"$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 @@ -2857,7 +2859,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:2861: checking for strftime in -lintl" >&5 +echo "configure:2863: 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 @@ -2865,7 +2867,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:2882: \"$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 @@ -2903,7 +2905,7 @@ fi echo $ac_n "checking whether utime accepts a null argument""... $ac_c" 1>&6 -echo "configure:2907: checking whether utime accepts a null argument" >&5 +echo "configure:2909: 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 @@ -2913,7 +2915,7 @@ ac_cv_func_utime_null=no else cat > conftest.$ac_ext < #include @@ -2924,7 +2926,7 @@ && t.st_mtime - s.st_mtime < 120)); } EOF -if { (eval echo configure:2928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2930: \"$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 @@ -2948,12 +2950,12 @@ fi echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:2952: checking for vprintf" >&5 +echo "configure:2954: 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:2982: \"$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 @@ -3000,12 +3002,12 @@ if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:3004: checking for _doprnt" >&5 +echo "configure:3006: 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:3034: \"$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 @@ -3071,12 +3073,12 @@ strtol do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3075: checking for $ac_func" >&5 +echo "configure:3077: 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:3105: \"$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 @@ -3126,12 +3128,12 @@ echo $ac_n "checking for fnmatch""... $ac_c" 1>&6 -echo "configure:3130: checking for fnmatch" >&5 +echo "configure:3132: 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:3160: \"$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 @@ -3175,7 +3177,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gmatch in -lgen""... $ac_c" 1>&6 -echo "configure:3179: checking for gmatch in -lgen" >&5 +echo "configure:3181: 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 @@ -3183,7 +3185,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:3200: \"$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 @@ -3222,12 +3224,12 @@ fi echo $ac_n "checking for gmatch""... $ac_c" 1>&6 -echo "configure:3226: checking for gmatch" >&5 +echo "configure:3228: 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:3256: \"$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 @@ -3293,7 +3295,7 @@ if test "$withval" != "no"; then echo $ac_n "checking for dbm_open in -l$MAYBE_LIBNDBM""... $ac_c" 1>&6 -echo "configure:3297: checking for dbm_open in -l$MAYBE_LIBNDBM" >&5 +echo "configure:3299: 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 @@ -3301,7 +3303,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:3318: \"$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 @@ -3331,7 +3333,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dbm_open in -ldb""... $ac_c" 1>&6 -echo "configure:3335: checking for dbm_open in -ldb" >&5 +echo "configure:3337: 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 @@ -3339,7 +3341,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:3356: \"$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 @@ -3369,7 +3371,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dbm_open in -lgdbm""... $ac_c" 1>&6 -echo "configure:3373: checking for dbm_open in -lgdbm" >&5 +echo "configure:3375: 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 @@ -3377,7 +3379,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:3394: \"$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 @@ -3407,7 +3409,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dbm_open in -lndbm""... $ac_c" 1>&6 -echo "configure:3411: checking for dbm_open in -lndbm" >&5 +echo "configure:3413: 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 @@ -3415,7 +3417,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:3432: \"$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 @@ -3457,12 +3459,12 @@ LIBS="$LIBDB $LIBS" fi echo $ac_n "checking for dbm_dirfno""... $ac_c" 1>&6 -echo "configure:3461: checking for dbm_dirfno" >&5 +echo "configure:3463: 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:3491: \"$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 @@ -3508,12 +3510,12 @@ fi echo $ac_n "checking for dbm_pagfno""... $ac_c" 1>&6 -echo "configure:3512: checking for dbm_pagfno" >&5 +echo "configure:3514: 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:3542: \"$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 @@ -3559,12 +3561,12 @@ fi echo $ac_n "checking for dbm_rdonly""... $ac_c" 1>&6 -echo "configure:3563: checking for dbm_rdonly" >&5 +echo "configure:3565: 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:3593: \"$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 @@ -3610,12 +3612,12 @@ fi echo $ac_n "checking for dbm_open""... $ac_c" 1>&6 -echo "configure:3614: checking for dbm_open" >&5 +echo "configure:3616: 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:3644: \"$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 @@ -3665,7 +3667,7 @@ echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 -echo "configure:3669: checking for main in -lm" >&5 +echo "configure:3671: 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 @@ -3673,14 +3675,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:3686: \"$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 @@ -3709,12 +3711,12 @@ echo $ac_n "checking for acosh""... $ac_c" 1>&6 -echo "configure:3713: checking for acosh" >&5 +echo "configure:3715: 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:3743: \"$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 @@ -3760,12 +3762,12 @@ fi echo $ac_n "checking for asinh""... $ac_c" 1>&6 -echo "configure:3764: checking for asinh" >&5 +echo "configure:3766: 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:3794: \"$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 @@ -3811,12 +3813,12 @@ fi echo $ac_n "checking for log1p""... $ac_c" 1>&6 -echo "configure:3815: checking for log1p" >&5 +echo "configure:3817: 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:3845: \"$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 @@ -3862,12 +3864,12 @@ fi echo $ac_n "checking for expm1""... $ac_c" 1>&6 -echo "configure:3866: checking for expm1" >&5 +echo "configure:3868: 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:3896: \"$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 @@ -3913,12 +3915,12 @@ fi echo $ac_n "checking for cbrt""... $ac_c" 1>&6 -echo "configure:3917: checking for cbrt" >&5 +echo "configure:3919: 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:3947: \"$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 @@ -3964,12 +3966,12 @@ fi echo $ac_n "checking for drem""... $ac_c" 1>&6 -echo "configure:3968: checking for drem" >&5 +echo "configure:3970: 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:3998: \"$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 @@ -4016,7 +4018,7 @@ echo $ac_n "checking for main in -lcrypt""... $ac_c" 1>&6 -echo "configure:4020: checking for main in -lcrypt" >&5 +echo "configure:4022: 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 @@ -4024,14 +4026,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:4037: \"$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 @@ -4053,7 +4055,7 @@ if test "$LIBSYSDEP" = ""; then echo $ac_n "checking for main in -lposix4""... $ac_c" 1>&6 -echo "configure:4057: checking for main in -lposix4" >&5 +echo "configure:4059: 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 @@ -4061,14 +4063,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:4074: \"$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 @@ -4095,7 +4097,7 @@ echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6 -echo "configure:4099: checking for main in -lnsl" >&5 +echo "configure:4101: 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 @@ -4103,14 +4105,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:4116: \"$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 @@ -4138,7 +4140,7 @@ fi echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:4142: checking for connect in -lsocket" >&5 +echo "configure:4144: 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 @@ -4146,7 +4148,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:4163: \"$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 @@ -4189,17 +4191,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4193: checking for $ac_hdr" >&5 +echo "configure:4195: 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:4203: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4205: \"$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* @@ -4230,12 +4232,12 @@ usleep lchown strptime putpwent getwd do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4234: checking for $ac_func" >&5 +echo "configure:4236: 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:4264: \"$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 @@ -4304,7 +4306,7 @@ if test "$withval" != "no"; then echo $ac_n "checking for main in -ldl""... $ac_c" 1>&6 -echo "configure:4308: checking for main in -ldl" >&5 +echo "configure:4310: 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 @@ -4312,14 +4314,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:4325: \"$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 @@ -4340,7 +4342,7 @@ fi echo $ac_n "checking for Tcl_Main in -l$MAYBE_LIBTCL""... $ac_c" 1>&6 -echo "configure:4344: checking for Tcl_Main in -l$MAYBE_LIBTCL" >&5 +echo "configure:4346: 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 @@ -4348,7 +4350,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:4365: \"$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 @@ -4393,7 +4395,7 @@ withval="$with_guile" if test "$withval" != "no"; then echo $ac_n "checking for gh_enter in -lguile""... $ac_c" 1>&6 -echo "configure:4397: checking for gh_enter in -lguile" >&5 +echo "configure:4399: 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 @@ -4401,7 +4403,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:4418: \"$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 @@ -4447,7 +4449,7 @@ withval="$with_python" if test "$withval" != "no"; then echo $ac_n "checking for main in -lpthread""... $ac_c" 1>&6 -echo "configure:4451: checking for main in -lpthread" >&5 +echo "configure:4453: 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 @@ -4455,14 +4457,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:4468: \"$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 @@ -4490,7 +4492,7 @@ fi echo $ac_n "checking for PyFloat_AsDouble in -lpython1.5""... $ac_c" 1>&6 -echo "configure:4494: checking for PyFloat_AsDouble in -lpython1.5" >&5 +echo "configure:4496: 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 @@ -4498,7 +4500,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:4515: \"$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 @@ -4538,6 +4540,57 @@ +# Check whether --with-stocks or --without-stocks was given. +if test "${with_stocks+set}" = set; then + withval="$with_stocks" + if test "$withval" != "no"; then + echo $ac_n "checking for main in -lstocks""... $ac_c" 1>&6 +echo "configure:4549: 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 +else + ac_save_LIBS="$LIBS" +LIBS="-lstocks $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 stocks | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h <&6 +fi + + fi +fi + + LIBPERL="" @@ -4546,7 +4599,7 @@ ac_save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $X_LIBS" echo $ac_n "checking for main in -lXext""... $ac_c" 1>&6 -echo "configure:4550: checking for main in -lXext" >&5 +echo "configure:4603: 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 @@ -4554,14 +4607,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:4618: \"$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 @@ -4584,7 +4637,7 @@ echo $ac_n "checking for main in -lXmu""... $ac_c" 1>&6 -echo "configure:4588: checking for main in -lXmu" >&5 +echo "configure:4641: 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 @@ -4592,14 +4645,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:4656: \"$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 @@ -4621,7 +4674,7 @@ echo $ac_n "checking for XCreateIC in -lX11""... $ac_c" 1>&6 -echo "configure:4625: checking for XCreateIC in -lX11" >&5 +echo "configure:4678: 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 @@ -4629,7 +4682,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: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 @@ -4665,7 +4718,7 @@ echo $ac_n "checking for main in -lXawM""... $ac_c" 1>&6 -echo "configure:4669: checking for main in -lXawM" >&5 +echo "configure:4722: 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 @@ -4673,14 +4726,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:4737: \"$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 @@ -4724,7 +4777,7 @@ ac_save_LDFLAGS="$LDFLAGS" echo $ac_n "checking for main in -ltermcap""... $ac_c" 1>&6 -echo "configure:4728: checking for main in -ltermcap" >&5 +echo "configure:4781: 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 @@ -4732,14 +4785,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:4796: \"$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 @@ -4760,7 +4813,7 @@ fi echo $ac_n "checking for wgetch in -lncurses""... $ac_c" 1>&6 -echo "configure:4764: checking for wgetch in -lncurses" >&5 +echo "configure:4817: 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 @@ -4768,7 +4821,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:4836: \"$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 @@ -4798,7 +4851,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for wgetch in -lcurses""... $ac_c" 1>&6 -echo "configure:4802: checking for wgetch in -lcurses" >&5 +echo "configure:4855: 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 @@ -4806,7 +4859,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:4874: \"$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 @@ -4843,12 +4896,12 @@ for ac_func in resizeterm beep immedok keypad do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4847: checking for $ac_func" >&5 +echo "configure:4900: 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:4928: \"$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 @@ -4903,7 +4956,7 @@ withval="$with_t1lib" if test "$withval" != "no"; then echo $ac_n "checking for main in -lt1""... $ac_c" 1>&6 -echo "configure:4907: checking for main in -lt1" >&5 +echo "configure:4960: 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 @@ -4911,14 +4964,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:4975: \"$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 @@ -4945,7 +4998,7 @@ fi echo $ac_n "checking for main in -lt1x""... $ac_c" 1>&6 -echo "configure:4949: checking for main in -lt1x" >&5 +echo "configure:5002: 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 @@ -4953,14 +5006,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:5017: \"$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.3.10/configure.in ./configure.in --- ../siag-3.3.10/configure.in Thu Jun 15 16:40:35 2000 +++ ./configure.in Tue Jun 27 02:06:56 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.3.10) +AM_INIT_AUTOMAKE(siag, 3.3.11) dnl Set of available languages dnl ALL_LINGUAS="" @@ -60,6 +60,7 @@ dnl Check things for Siag AC_CHECK_SIAG dnl AC_CHECK_XMAGICK +dnl AC_CHECK_STOCKS dnl Configure XawM AC_CONFIG_SUBDIRS(XawM) diff -urNP ../siag-3.3.10/egon/buffer.c ./egon/buffer.c --- ../siag-3.3.10/egon/buffer.c Thu Jun 15 06:58:04 2000 +++ ./egon/buffer.c Fri Jun 23 21:46:23 2000 @@ -212,6 +212,7 @@ buffer *free_buffer(buffer *b) { buffer *pb, *next; + char p[1024]; next = b->next; if (next == b) @@ -230,6 +231,10 @@ /* no buffers in the list => b_list = NULL */ if (b_list == b) b_list = NULL; + + plugin_basedir(p, b->name); + rmdir(p); + cfree((char *) b); return next; @@ -266,23 +271,6 @@ sprintf(to, "%d_%s", i, from); } -/* --- -figure out where to put the plugins -*/ - -char *plugin_basedir(buffer *buf, char *dir) -{ - int i; - static char b[1024]; - pid_t pid = getpid(); - - if (!dir) dir = b; - sprintf(dir, "%s/%ld/%s", siag_basedir, (long)pid, buf->name); - /* now, we don't want to keep any ugly characters */ - for (i = strlen(dir)-strlen(buf->name); dir[i]; i++) - if (!isalnum(dir[i])) dir[i] = '_'; - return dir; -} /* --- Returns the buffer with the name name, or NULL if it can't be found. diff -urNP ../siag-3.3.10/egon/cmds.c ./egon/cmds.c --- ../siag-3.3.10/egon/cmds.c Thu Jun 15 06:59:29 2000 +++ ./egon/cmds.c Fri Jun 23 21:37:22 2000 @@ -1179,10 +1179,9 @@ { static char path[1024], name[1024]; char fn[1024]; - char pn[1024]; + char p[1024], pn[1024]; char cmd[1024]; char fmt[80]; - char *p; buffer *buf = w_list->buf; int n; plugin_t plugin; @@ -1210,7 +1209,7 @@ if (mode == PLUGIN_COPY) { plugin.name = cstrdup(pn); /* copy the file */ - p = plugin_basedir(buf, NULL); + plugin_basedir(p, buf->name); sprintf(pn, "%s/%s", p, plugin.name); sprintf(cmd, "(mkdir %s;cp %s %s)2>/dev/null", p, fn, pn); system(cmd); @@ -1276,7 +1275,7 @@ static LISP lplugin_export(void) { int n; - char fn[1024], pn[1024], cmd[1024], path[1024], fmt[80]; + char p[1024], fn[1024], pn[1024], cmd[1024], path[1024], fmt[80]; buffer *buf = w_list->buf; int sht = w_list->sht; @@ -1291,7 +1290,7 @@ if (!select_file(path, fn, NULL, fmt, 1)) return NIL; /* save the file */ - sprintf(pn, "%s/%s", plugin_basedir(buf, NULL), + sprintf(pn, "%s/%s", plugin_basedir(p, buf->name), buf->sht[sht].plugin[n].name); sprintf(cmd, "cp %s %s/%s", pn, path, fn); system(cmd); diff -urNP ../siag-3.3.10/egon/docs/fileformats.html ./egon/docs/fileformats.html --- ../siag-3.3.10/egon/docs/fileformats.html Sun Jun 18 20:13:10 2000 +++ ./egon/docs/fileformats.html Fri Jun 23 20:20:09 2000 @@ -46,6 +46,9 @@
Presentations created for MS Powerpoint can be read if the pptHtml program is available. pptHtml is part of xlHtml by Steve Grubb, linux_4ever@yahoo.com. +
PDF +
Egon can save in Adobe's "Portable Document Format". + Requires the program ps2pdf.
diff -urNP ../siag-3.3.10/egon/egon.h ./egon/egon.h --- ../siag-3.3.10/egon/egon.h Tue Jun 13 19:28:09 2000 +++ ./egon/egon.h Fri Jun 23 21:37:52 2000 @@ -122,7 +122,6 @@ extern buffer *new_buffer(char *, char *); extern buffer *free_buffer(buffer *); extern void plugin_unique_name(char *, char *); -extern char *plugin_basedir(buffer *, char *); extern buffer *find_sheet_by_name(char *, buffer *, int *); extern buffer *find_buffer_by_name(char *); extern int buffer_plugin2index(buffer *, int); diff -urNP ../siag-3.3.10/egon/egon.scm ./egon/egon.scm --- ../siag-3.3.10/egon/egon.scm Sun Jun 18 14:52:20 2000 +++ ./egon/egon.scm Fri Jun 23 19:32:22 2000 @@ -367,6 +367,10 @@ (register-converter "MS Powerpoint (*.ppt)" "*.html" "pptHtml %s > %s" nil nil)) + (if (executable-file "ps2pdf") + (register-converter "PDF saver (*.pdf)" + nil nil + "*.ps" "ps2pdf %s %s")) (if (executable-file "mgptotxt") (register-converter "Magic Point (*.mgp)" "*.txt" "mgptotxt %s > %s" diff -urNP ../siag-3.3.10/egon/fileio_egon.c ./egon/fileio_egon.c --- ../siag-3.3.10/egon/fileio_egon.c Fri Jun 2 00:27:03 2000 +++ ./egon/fileio_egon.c Mon Jun 26 23:41:30 2000 @@ -69,7 +69,7 @@ static char *file_name(buffer *buf, char *n) { char b[1024]; - plugin_basedir(buf, b); + plugin_basedir(b, buf->name); strcat(b, "/"); strcat(b, n); return cstrdup(b); @@ -95,7 +95,7 @@ if (!fp) return 1; - plugin_basedir(buf, b); + plugin_basedir(b, buf->name); fprintf(fp, "# Creator: %s\n", version); fprintf(fp, "# %s\n", buf->name); @@ -154,7 +154,7 @@ if ((fp = fopen(fn, "r")) == NULL) return 1; - plugin_basedir(buf, b); + plugin_basedir(b, buf->name); buf->sht[sht].delta = 100; buf->sht[sht].duration = 4000; @@ -210,15 +210,29 @@ name[0] = string[0] = '\0'; if (nfmt == -1) { /* old */ int color, font; - sscanf(instring, + int n = sscanf(instring, ".object %d %s %d %d %[^\n]", &o->type, name, &color, &font, string); - f = fmt_old2new(color<type, name, &f, string); - f = fmts[f]; + if (n != 4) { + fprintf(stderr, "Wrong arg count\n"); + fclose(fp); + return 1; + } + f = fmts[f]; } o->fmt = f; o->name = cstrdup(name); @@ -332,14 +346,14 @@ static int load(char *fn, buffer *buf) { - char cmd[1024]; + char cmd[1024], b[1024]; char *p; int n; if (flatfile(fn) || !tryuntar(fn, "INDEX.egon")) return load_flat(fn, buf); - p = plugin_basedir(buf, NULL); + p = plugin_basedir(b, buf->name); sprintf(cmd, "mkdir -p %s;" "cat %s|(cd %s;tar xf -)", diff -urNP ../siag-3.3.10/egon/fileio_html.c ./egon/fileio_html.c --- ../siag-3.3.10/egon/fileio_html.c Sun Jun 18 19:21:48 2000 +++ ./egon/fileio_html.c Mon Jun 19 17:44:24 2000 @@ -62,6 +62,7 @@ fprintf(fp, "\n\n\n\n\n"); for (s = 0; s < buf->nsht; s++) { + if (s) fprintf(fp, "

\n"); for (o = buf->sht[s].cast; o; o = o->next) { if (o->type == ANI_STRING) { save_line(fp, o->string); @@ -88,20 +89,6 @@ static int y; static int nobj; -/* replace these two functions with the ecPrintChar from fileio_rtf.c, which - handles line breaking and formats properly - - Even better: don't touch anything until the bop code works. Then just - insert everything as it is and rebreak the whole document when we are - done. It will be faster and more reliable, and work for the RTF loader - as well. - - Store each paragraph on a long line and break it up afterwards. That - way we *know* that each line will be a bop, and we only need to change - the style in tag handlers that deal with such things. Preformatted - text needs special handling, as usual, but even such text get one - bop per line. -*/ static void emitchar(int c) { @@ -516,7 +503,7 @@ int result; result = ((ext = strrchr(fn, '.')) && - !cstrncasecmp(ext, ".txt", 4) && + !cstrncasecmp(ext, ".htm", 4) && (fp = fopen(fn, "r")) && fgets(b, sizeof b, fp)); if (fp) fclose(fp); diff -urNP ../siag-3.3.10/egon/fileio_txt.c ./egon/fileio_txt.c --- ../siag-3.3.10/egon/fileio_txt.c Sun Jun 18 18:49:37 2000 +++ ./egon/fileio_txt.c Fri Jun 23 20:59:19 2000 @@ -56,6 +56,33 @@ return 0; } +static void fixup_sizes(ani_object *o, int w, int h, int y) +{ + ani_object *p; + ani_script *s; + float f, g; + sfmt fmt; + int x; + + /* We know that the existing strings have size 140 decipoints. + We also know that they are 20 pixels apart. Calculate a suitable + scaling factor by dividing h (window height in pixels) with + y (height we have used). */ + f = (h-20.0)/(float)y; + for (p = o; p; p = p->next) { + x = 10+10*strlen(p->string); /* let's be sloppy */ + g = (w-20.0)/(float)x; + if (g < f) f = g; + } + for (p = o; p; p = p->next) { + decode_format(p->fmt, ~0, &fmt); + fmt.size *= f; + p->fmt = encode_format(~0, &fmt); + s = p->script; /* we know that there is only one tick */ + s->y *= f; + } +} + static int load(char *fn, buffer *buf) { FILE *fp; @@ -89,6 +116,8 @@ while (fgets(b, 1024, fp) != NULL) { if (b[0] == '\f') { + fixup_sizes(buf->sht[sht].cast, + buf->width, buf->height, y); sht++; if (sht >= buf->nsht) { buffer_add_sheet(buf, sht); @@ -110,7 +139,7 @@ o->next = NULL; o->type = ANI_STRING; o->fmt = f; - sprintf(name, "String %d", n++); + sprintf(name, "String%d", n++); o->name = cstrdup(name); o->string = cstrdup(b); s = (ani_script *)cmalloc(sizeof(ani_script)); @@ -125,6 +154,7 @@ y += 20; } } + fixup_sizes(buf->sht[sht].cast, buf->width, buf->height, y); fclose(fp); return 0; } diff -urNP ../siag-3.3.10/egon/menu.scm ./egon/menu.scm --- ../siag-3.3.10/egon/menu.scm Sat Jun 17 22:33:24 2000 +++ ./egon/menu.scm Mon Jun 26 01:04:58 2000 @@ -25,7 +25,7 @@ (add-menu "Edit") ;(add-menu-entry "Edit" "Show Editor" "(popup-editor)") -(add-menu-entry "Edit" "Hide Stage" "(popdown-stage)") +;(add-menu-entry "Edit" "Hide Stage" "(popdown-stage)") (add-menu-entry "Edit" "Begin Empty Animation" "(ani-begin)") (add-submenu "Edit" "Add Object") (add-submenu-entry "Edit" "Add Object" "Line" "(add-line)") diff -urNP ../siag-3.3.10/egon/mgptotxt ./egon/mgptotxt --- ../siag-3.3.10/egon/mgptotxt Sun Jun 18 18:59:34 2000 +++ ./egon/mgptotxt Mon Jun 19 20:47:34 2000 @@ -1,3 +1,3 @@ #!/bin/sh # Print formfeed for %page. Ignore all other directives. -cat $1 | awk '/^%page/ {print "\f"}; !/^%/' +awk '/^%page/ {print "\f"}; !/^%/' $1 diff -urNP ../siag-3.3.10/egon/siodi.c ./egon/siodi.c --- ../siag-3.3.10/egon/siodi.c Thu Apr 6 14:53:13 2000 +++ ./egon/siodi.c Mon Jun 26 06:53:15 2000 @@ -117,7 +117,7 @@ "-h20000:10", /* 100000:10 */ "-g0", "-o1000", - "-s100000", /* 200000 */ + "-s200000", /* 200000 */ "-n2048"}; static int siod_argc = sizeof siod_argv / sizeof siod_argv[0]; diff -urNP ../siag-3.3.10/pw/buffer.c ./pw/buffer.c --- ../siag-3.3.10/pw/buffer.c Tue Feb 15 23:46:56 2000 +++ ./pw/buffer.c Fri Jun 23 21:43:20 2000 @@ -233,6 +233,7 @@ buffer *pb, *next; int i; int s; + char p[1024]; next = b->next; if (next == b) @@ -260,6 +261,10 @@ } } + /* delete the plugin directory, if there is one */ + plugin_basedir(p, b->name); + rmdir(p); + cfree(b); return next; @@ -296,23 +301,6 @@ sprintf(to, "%d_%s", i, from); } -/* --- -figure out where to put the plugins -*/ - -char *plugin_basedir(buffer *buf, char *dir) -{ - int i; - static char b[1024]; - pid_t pid = getpid(); - - if (!dir) dir = b; - sprintf(dir, "%s/%ld/%s", siag_basedir, (long)pid, buf->name); - /* now, we don't want to keep any ugly characters */ - for (i = strlen(dir)-strlen(buf->name); dir[i]; i++) - if (!isalnum(dir[i])) dir[i] = '_'; - return dir; -} /* --- buffer *find_buffer_by_name(char *name) diff -urNP ../siag-3.3.10/pw/cmds.c ./pw/cmds.c --- ../siag-3.3.10/pw/cmds.c Fri May 5 13:03:07 2000 +++ ./pw/cmds.c Fri Jun 23 21:40:43 2000 @@ -1677,7 +1677,7 @@ char pn[1024]; char cmd[1024]; char fmt[80]; - char *p; + char p[1024]; buffer *buf = w_list->buf; int n; plugin_t plugin; @@ -1707,7 +1707,7 @@ if (mode == PLUGIN_COPY) { plugin.name = cstrdup(pn); /* copy the file */ - p = plugin_basedir(buf, NULL); + plugin_basedir(p, buf->name); sprintf(pn, "%s/%s", p, plugin.name); sprintf(cmd, "(mkdir %s;cp %s %s)2>/dev/null", p, fn, pn); system(cmd); @@ -1772,7 +1772,7 @@ static LISP lplugin_export(void) { int n; - char fn[1024], pn[1024], cmd[1024], path[1024], fmt[80]; + char p[1024], fn[1024], pn[1024], cmd[1024], path[1024], fmt[80]; buffer *buf = w_list->buf; int s = w_list->sht; @@ -1787,7 +1787,8 @@ if (!select_file(path, fn, NULL, fmt, 1)) return NIL; /* save the file */ - sprintf(pn, "%s/%s", plugin_basedir(buf, NULL), buf->sht[s].plugin[n].name); + sprintf(pn, "%s/%s", plugin_basedir(p, buf->name), + buf->sht[s].plugin[n].name); sprintf(cmd, "cp %s %s/%s", pn, path, fn); system(cmd); return NIL; diff -urNP ../siag-3.3.10/pw/docs/fileformats.html ./pw/docs/fileformats.html --- ../siag-3.3.10/pw/docs/fileformats.html Mon Jul 5 23:58:32 1999 +++ ./pw/docs/fileformats.html Thu Jun 22 23:46:54 2000 @@ -35,6 +35,9 @@
Documents can be saved in RTF format so that they can be opened in legacy Windows (TM) applications. PW can load RTF files, but some formatting information may be lost. +
PDF +
Adobe's "Portable Document Format". Loading requires the + program pdftohtml, saving requires ps2pdf.
Microsoft Word
If the catdoc utility is available on the system, PW can use it to import text from MS Word documents. diff -urNP ../siag-3.3.10/pw/fileio.c ./pw/fileio.c --- ../siag-3.3.10/pw/fileio.c Tue Feb 15 23:54:00 2000 +++ ./pw/fileio.c Thu Jun 22 17:14:24 2000 @@ -61,8 +61,9 @@ if (fmt == NULL) return siag_fmt; - for (i = 0; i < format_count; i++) + for (i = 0; i < format_count; i++) { if (!strcmp(_(fileformats[i].pattern), fmt)) return i; + } return -1; } diff -urNP ../siag-3.3.10/pw/fileio_html.c ./pw/fileio_html.c --- ../siag-3.3.10/pw/fileio_html.c Thu Apr 6 18:29:14 2000 +++ ./pw/fileio_html.c Sat Jun 24 00:03:48 2000 @@ -177,7 +177,7 @@ { if (mute) return; -/*putchar(c);*/ +putchar(c); if (c == '\n') { /* break the current line */ row++; set_bop(buf, sht, row, 1); @@ -187,6 +187,10 @@ } } +static void emitstr(char *p) +{ + while (*p) emitchar(*p++); +} /* &#xxx; => emitchar(atoi(xxx)) */ static void emitcchar(char *p) @@ -430,10 +434,17 @@ state = START; } else if (c == EOF) { errflag = 1; + tagbuf[tbi] = '\0'; + emitstr(tagbuf); + tbi = 0; state = END; + } else if (isspace(c) || tbi+10 >= sizeof tagbuf) { + tagbuf[tbi] = '\0'; + emitstr(tagbuf); + tbi = 0; + state = START; } else { - if (tbi+10 < sizeof tagbuf) - tagbuf[tbi++] = c; + tagbuf[tbi++] = c; } break; default: @@ -464,8 +475,9 @@ fmt = style_table[sty].format; while (state != END) html_char(getc(fp)); - for (row = 1; row <= line_last_used(buf, sht); row++) + for (row = 1; row <= line_last_used(buf, sht); row++) { rebreak_line(buf, sht, row); + } buf->change = 0; fclose(fp); return 0; diff -urNP ../siag-3.3.10/pw/fileio_pw.c ./pw/fileio_pw.c --- ../siag-3.3.10/pw/fileio_pw.c Wed Mar 22 12:46:42 2000 +++ ./pw/fileio_pw.c Fri Jun 23 21:33:43 2000 @@ -77,7 +77,7 @@ static char *file_name(buffer *buf, char *n) { char b[1024]; - plugin_basedir(buf, b); + plugin_basedir(b, buf->name); strcat(b, "/"); strcat(b, n); return cstrdup(b); @@ -464,14 +464,14 @@ static int load(char *fn, buffer *buf) { - char cmd[1024]; + char b[1024], cmd[1024]; char *p; int n; if (flatfile(fn) || !tryuntar(fn, "INDEX.pw")) return load_flat(fn, buf); - p = plugin_basedir(buf, NULL); + p = plugin_basedir(b, buf->name); sprintf(cmd, "mkdir -p %s;" "cat %s|(cd %s;tar xf -)", diff -urNP ../siag-3.3.10/pw/pw.h ./pw/pw.h --- ../siag-3.3.10/pw/pw.h Mon Mar 27 14:01:40 2000 +++ ./pw/pw.h Fri Jun 23 21:38:18 2000 @@ -206,7 +206,6 @@ extern void buffer_rename_sheet(buffer *, int, char *); extern buffer *new_buffer(char *, char *); extern buffer *free_buffer(buffer *); -extern char *plugin_basedir(buffer *, char *); extern void plugin_unique_name(char *, char *); extern buffer *find_buffer_by_name(char *); extern buffer *find_sheet_by_name(char *, buffer *, int *); diff -urNP ../siag-3.3.10/pw/pw.scm ./pw/pw.scm --- ../siag-3.3.10/pw/pw.scm Sat May 20 14:47:27 2000 +++ ./pw/pw.scm Thu Jun 22 14:32:37 2000 @@ -553,6 +553,14 @@ (register-converter "MS Powerpoint (*.ppt)" "*.html" "pptHtml %s > %s" nil nil)) + (if (executable-file "pdftohtml.bin") + (register-converter "PDF loader (*.pdf)" + "*.html" "pdftohtml.bin -i -noframes -stdout %s > %s" + nil nil)) + (if (executable-file "ps2pdf") + (register-converter "PDF saver (*.pdf)" + nil nil + "*.ps" "ps2pdf %s %s")) (if (executable-file "groff") (register-converter "Man page (*.[0-9])" "*.txt" "groff -Tascii -mandoc %s > %s" diff -urNP ../siag-3.3.10/siag/Makefile.am ./siag/Makefile.am --- ../siag-3.3.10/siag/Makefile.am Sat Mar 4 22:41:29 2000 +++ ./siag/Makefile.am Mon Jun 26 14:47:57 2000 @@ -7,7 +7,7 @@ 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 + window.c selection.c globals.c stocks.c noinst_HEADERS = calc.h fileio.h user_interface.h \ selection.h diff -urNP ../siag-3.3.10/siag/Makefile.in ./siag/Makefile.in --- ../siag-3.3.10/siag/Makefile.in Sun Jun 18 22:46:18 2000 +++ ./siag/Makefile.in Tue Jun 27 08:32:44 2000 @@ -87,7 +87,7 @@ noinst_LIBRARIES = libsiag.a -libsiag_a_SOURCES = railway.c matrix.c fileio.c cmds.c buffer.c mathwrap.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 +libsiag_a_SOURCES = railway.c matrix.c fileio.c cmds.c buffer.c mathwrap.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 noinst_HEADERS = calc.h fileio.h user_interface.h selection.h @@ -120,7 +120,7 @@ mathwrap.o fileio_siag.o fileio_txt.o fileio_html.o fileio_scm.o \ fileio_ps.o fileio_wk1.o fileio_tbl.o fileio_latex.o ci.o siodi.o \ guilei.o tcli.o pythoni.o position.o main.o window.o selection.o \ -globals.o +globals.o stocks.o AR = ar CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) diff -urNP ../siag-3.3.10/siag/buffer.c ./siag/buffer.c --- ../siag-3.3.10/siag/buffer.c Thu Apr 6 14:53:18 2000 +++ ./siag/buffer.c Fri Jun 23 21:46:05 2000 @@ -298,6 +298,7 @@ int i; buffer *pb, *next; int s; + char p[1024]; next = b->next; if (next == b) @@ -324,6 +325,10 @@ b->sht[s].plugin[i].displayed = 0; } } + + plugin_basedir(p, b->name); + rmdir(p); + cfree((char *) b); return next; @@ -360,23 +365,6 @@ sprintf(to, "%d_%s", i, from); } -/* --- -figure out where to put the plugins -*/ - -char *plugin_basedir(buffer *buf, char *dir) -{ - int i; - static char b[1024]; - pid_t pid = getpid(); - - if (!dir) dir = b; - sprintf(dir, "%s/%ld/%s", siag_basedir, (long)pid, buf->name); - /* now, we don't want to keep any ugly characters */ - for (i = strlen(dir)-strlen(buf->name); dir[i]; i++) - if (!isalnum(dir[i])) dir[i] = '_'; - return dir; -} /* --- buffer *find_buffer_by_name(char *name) diff -urNP ../siag-3.3.10/siag/calc.h ./siag/calc.h --- ../siag-3.3.10/siag/calc.h Thu Apr 6 14:53:19 2000 +++ ./siag/calc.h Fri Jun 23 21:38:25 2000 @@ -264,7 +264,6 @@ extern void buffer_rename_sheet(buffer *, int, char *); extern buffer *new_buffer(char *, char *); extern buffer *free_buffer(buffer *); -extern char *plugin_basedir(buffer *, char *); extern void plugin_unique_name(char *, char *); extern buffer *find_buffer_by_name(char *); extern buffer *find_sheet_by_name(char *, buffer *, int *); diff -urNP ../siag-3.3.10/siag/cmds.c ./siag/cmds.c --- ../siag-3.3.10/siag/cmds.c Fri May 5 13:02:36 2000 +++ ./siag/cmds.c Fri Jun 23 21:35:00 2000 @@ -1794,7 +1794,7 @@ char pn[1024]; char cmd[1024]; char fmt[80]; - char *p; + char p[1024]; buffer *buf = w_list->buf; int n; plugin_t plugin; @@ -1822,7 +1822,7 @@ if (mode == PLUGIN_COPY) { plugin.name = cstrdup(pn); /* copy the file */ - p = plugin_basedir(buf, NULL); + plugin_basedir(p, buf->name); sprintf(pn, "%s/%s", p, plugin.name); sprintf(cmd, "(mkdir %s;cp %s %s)2>/dev/null", p, fn, pn); system(cmd); @@ -1886,7 +1886,7 @@ static LISP lplugin_export(void) { int n; - char fn[1024], pn[1024], cmd[1024], path[1024], fmt[80]; + char p[1024], fn[1024], pn[1024], cmd[1024], path[1024], fmt[80]; buffer *buf = w_list->buf; int s = w_list->sht; @@ -1901,7 +1901,8 @@ if (!select_file(path, fn, NULL, fmt, 1)) return NIL; /* save the file */ - sprintf(pn, "%s/%s", plugin_basedir(buf, NULL), buf->sht[s].plugin[n].name); + sprintf(pn, "%s/%s", plugin_basedir(p, buf->name), + buf->sht[s].plugin[n].name); sprintf(cmd, "cp %s %s/%s", pn, path, fn); system(cmd); return NIL; diff -urNP ../siag-3.3.10/siag/docs/fileformats.html ./siag/docs/fileformats.html --- ../siag-3.3.10/siag/docs/fileformats.html Thu Jun 24 11:18:56 1999 +++ ./siag/docs/fileformats.html Fri Jun 23 20:19:23 2000 @@ -53,6 +53,9 @@ A better way to convert Excel files to Siag is to save them as Lotus worksheets (see below) in Excel and then load them in Siag. +
PDF +
Siag can save in Adobe's "Portable Document Format". + Requires the program ps2pdf.

Adding Format Handlers

diff -urNP ../siag-3.3.10/siag/fileio_siag.c ./siag/fileio_siag.c --- ../siag-3.3.10/siag/fileio_siag.c Thu Apr 6 14:53:20 2000 +++ ./siag/fileio_siag.c Fri Jun 23 21:35:43 2000 @@ -138,7 +138,7 @@ if (n[0] == '/') { /* link */ return cstrdup(n); } - plugin_basedir(buf, b); + plugin_basedir(b, buf->name); strcat(b, "/"); strcat(b, n); return cstrdup(b); @@ -628,7 +628,7 @@ static int load(char *fn, buffer *buf) { - char cmd[1024]; + char cmd[1024], b[1024]; char *p; int n; @@ -637,7 +637,7 @@ if (flatfile(fn) || !tryuntar(fn, "INDEX.siag")) return load_flat(fn, buf); - p = plugin_basedir(buf, NULL); + p = plugin_basedir(b, buf->name); sprintf(cmd, "mkdir -p %s;" "cat %s 2> /dev/null |(cd %s;tar xf -) 2> /dev/null", diff -urNP ../siag-3.3.10/siag/guilei.c ./siag/guilei.c --- ../siag-3.3.10/siag/guilei.c Thu Apr 6 14:53:21 2000 +++ ./siag/guilei.c Mon Jun 26 14:55:09 2000 @@ -1,6 +1,6 @@ /* Siag, Scheme In A Grid - Copyright (C) 1996-1999 Ulric Eriksson + Copyright (C) 1996-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 @@ -335,7 +335,10 @@ parse_guile_expr, execute_guile, update_Guile_references); } -#else /* for the compiler */ -int guile_is_not_used; +#else +int init_guile_parser(void) +{ + return -1; +} #endif /* GUILE */ diff -urNP ../siag-3.3.10/siag/main.c ./siag/main.c --- ../siag-3.3.10/siag/main.c Fri May 26 07:58:18 2000 +++ ./siag/main.c Tue Jun 27 06:49:23 2000 @@ -49,6 +49,7 @@ extern int init_parser(int, char **); /* siodi.c */ extern int init_guile_parser(void); /* guilei.c */ extern void init_interpreters(void); /* railway.c */ +extern void init_stocks(void); /* stocks.c */ static char *siagrc; @@ -69,9 +70,7 @@ } #endif -#ifdef PYTHON extern int init_python_parser(void); -#endif static void malloc_fail_handler(void) { @@ -104,12 +103,8 @@ siod_interpreter = init_parser(argc, argv); C_interpreter = init_C_parser(); -#ifdef PYTHON init_python_parser(); -#endif -#ifdef GUILE init_guile_parser(); -#endif init_mathwrap(); /* standard FP library functions */ init_position(); @@ -117,6 +112,8 @@ init_colors(); init_fonts(); + + init_stocks(); buf = new_buffer("noname.siag", "noname.siag"); diff -urNP ../siag-3.3.10/siag/pythoni.c ./siag/pythoni.c --- ../siag-3.3.10/siag/pythoni.c Thu Apr 6 14:53:22 2000 +++ ./siag/pythoni.c Mon Jun 26 14:54:25 2000 @@ -1,6 +1,6 @@ /* Siag, Scheme In A Grid - Copyright (C) 1999 Ulric Eriksson + Copyright (C) 1999-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 @@ -143,6 +143,9 @@ parse_python_expr, exec_python, NULL); } #else -int python_is_not_used; +int init_python_parser(void) +{ + return -1; +} #endif /* PYTHON */ diff -urNP ../siag-3.3.10/siag/siag.scm ./siag/siag.scm --- ../siag-3.3.10/siag/siag.scm Tue May 16 00:12:06 2000 +++ ./siag/siag.scm Fri Jun 23 19:56:58 2000 @@ -1029,6 +1029,10 @@ (register-converter "MS Excel (*.xls)" "*.csv" "xls2csv '%s' > '%s'" nil nil))) + (if (executable-file "ps2pdf") + (register-converter "PDF saver (*.pdf)" + nil nil + "*.ps" "ps2pdf %s %s")) (if (executable-file "blaha") (register-converter "Blaha (*.blaha)" "*.txt" "blaha < '%s' > '%s'" diff -urNP ../siag-3.3.10/siag/stocks.c ./siag/stocks.c --- ../siag-3.3.10/siag/stocks.c Thu Jan 1 01:00:00 1970 +++ ./siag/stocks.c Tue Jun 27 08:24:15 2000 @@ -0,0 +1,268 @@ +/* + 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_LIBSTOCKS + +/* +stocks.c + +Inspired by Eric Laeuffer's sample libstocks client. + +Call through a cache. Otherwise we get the extra latency of a +long-distance http request every time the sheet is recalculated, +which is by default every time anything is changed. If we remember +when the last call was made and only ask again after a certain +time has passed, we will get better performance and generally more +civilized behaviour. A reasonable time between updates is 15 minutes, +but it should be possible to change that. + +Make a simple SIOD interface such as: + +(stock_price symbol) +(stock_yesterday symbol) +(stock_open symbol) +(stock_min symbol) +(stock_max symbol) +(stock_var symbol) +(stock_percent symbol) +(stock_volume symbol) + +There are other fields in the stockstruct record that might be +interesting. + +For example, (stock_price "TLIA.ST") returns the current price of +Telia on the Stockholm stock exchange. The function should also be +available from the C interpreter as stock_price("TLIA.ST"). This +is however not yet possible, since the C interpreter can't take +strings as arguments. That should be fixed. +*/ + +#include +#include +#include +#include +#include +#include +#include + +#include "stocks.h" + +#include "../common/common.h" +#include "../common/cmalloc.h" + +#include "../siod/siod.h" + +#include "calc.h" + +/* this is simply a linked list. It will be fast enough. */ +typedef struct quote_cache { + stock quote; + char *sym; + time_t time; /* when quote was fetched */ + struct quote_cache *next; +} quote_cache; + +static quote_cache *cache = NULL; + +static char *cachefn; +static stock *stocks_quotes = NULL; +static stock *stocks_tmp; +static stock error_quote; +static libstocks_return_code stocks_error; + +static int lookup_quote(char *sym, stock *quote) +{ + quote_cache *q = cache; + time_t now = time(NULL); + + for (q = cache; q; q = q->next) { + if (!strcmp(q->sym, sym)) break; + } + + if (q && (now-q->time) < 300) { /* 5 minutes */ + *quote = q->quote; + return 0; + } + + if (q == NULL) { /* new entry */ + q = cmalloc(sizeof *q); + q->next = cache; + q->time = now; + q->sym = cstrdup(sym); + cache = q; + } + + stocks_error = get_stocks(sym, &stocks_quotes); + if (stocks_error) { + q->quote = error_quote; + strcpy(q->quote.Name, sym); + *quote = q->quote; + return 1; + } + + *quote = q->quote = *stocks_quotes; + free_stocks(stocks_quotes); + return 0; +} + +static LISP lstock_test(LISP arg) +{ + stocks_error = get_stocks(get_c_string(arg), &stocks_quotes); + if (stocks_error) { + printf("Error in getting stocks (%d)\n", stocks_error); + return NIL; + } + stocks_tmp = stocks_quotes; + + while (stocks_tmp) { + fprintf(stderr, "%s / %s\n", stocks_tmp->Time, stocks_tmp->Date); + fprintf(stderr, "Symbol: %s\n", stocks_tmp->Symbol); + fprintf(stderr, "Price: %f\n", stocks_tmp->CurrentPrice); + fprintf(stderr, "Yesterday: %f\n", stocks_tmp->LastPrice); + fprintf(stderr, "Open: %f\n", stocks_tmp->OpenPrice); + fprintf(stderr, "Min: %f\n", stocks_tmp->MinPrice); + fprintf(stderr, "Max: %f\n", stocks_tmp->MaxPrice); + fprintf(stderr, "Variation: %f\n", stocks_tmp->Variation); + fprintf(stderr, "Percentage: %f\n", stocks_tmp->Pourcentage); + fprintf(stderr, "Volume: %d\n", stocks_tmp->Volume); + + stocks_tmp = next_stock(stocks_tmp); + } + + free_stocks(stocks_quotes); + return NIL; +} + +static LISP lstock_price(LISP sym) +{ + stock quote; + + if (lookup_quote(get_c_string(sym), "e)) return NIL; + return flocons(quote.CurrentPrice); +} + +static LISP lstock_yesterday(LISP sym) +{ + stock quote; + + if (lookup_quote(get_c_string(sym), "e)) return NIL; + return flocons(quote.LastPrice); +} + +static LISP lstock_open(LISP sym) +{ + stock quote; + + if (lookup_quote(get_c_string(sym), "e)) return NIL; + return flocons(quote.OpenPrice); +} + +static LISP lstock_min(LISP sym) +{ + stock quote; + + if (lookup_quote(get_c_string(sym), "e)) return NIL; + return flocons(quote.MinPrice); +} + +static LISP lstock_max(LISP sym) +{ + stock quote; + + if (lookup_quote(get_c_string(sym), "e)) return NIL; + return flocons(quote.MaxPrice); +} + +static LISP lstock_var(LISP sym) +{ + stock quote; + + if (lookup_quote(get_c_string(sym), "e)) return NIL; + return flocons(quote.Variation); +} + +static LISP lstock_percent(LISP sym) +{ + stock quote; + + if (lookup_quote(get_c_string(sym), "e)) return NIL; + return flocons(quote.Pourcentage); +} + +static LISP lstock_volume(LISP sym) +{ + stock quote; + + if (lookup_quote(get_c_string(sym), "e)) return NIL; + return flocons(quote.Volume); +} + + +/* --- +*/ +void init_stocks(void) +{ + char *p = getenv("HOME"); + char b[1024]; + char *proxy; + + printf("initializing libstocks\n"); + if (!p) p = "/tmp"; + sprintf(b, "%s/.siag/stocks_cache", p); + cachefn = cstrdup(b); + + proxy = getenv("http_proxy"); + if (proxy) { + printf("proxy set\n"); + stocks_error = set_proxy(proxy); + if (stocks_error) { + printf("Proxy error (%d)\n", stocks_error); + return; + } + } + error_quote.CurrentPrice = 0; + error_quote.LastPrice = 0; + error_quote.OpenPrice = 0; + error_quote.MinPrice = 0; + error_quote.MaxPrice = 0; + error_quote.Variation = 0; + error_quote.Pourcentage = 0; + error_quote.Volume = 0; + strcpy(error_quote.Name, "ERROR"); + init_subr_1("stock_test", lstock_test); + init_subr_1("stock_price", lstock_price); + init_subr_1("stock_yesterday", lstock_yesterday); + init_subr_1("stock_open", lstock_open); + init_subr_1("stock_min", lstock_min); + init_subr_1("stock_max", lstock_max); + init_subr_1("stock_var", lstock_var); + init_subr_1("stock_percent", lstock_percent); + init_subr_1("stock_volume", lstock_volume); +} + +#else +void init_stocks(void) +{ + printf("libstocks not available\n"); +} +#endif /* HAVE_LIBSTOCKS */ + diff -urNP ../siag-3.3.10/xcommon/Animator.c ./xcommon/Animator.c --- ../siag-3.3.10/xcommon/Animator.c Thu Jun 15 08:02:15 2000 +++ ./xcommon/Animator.c Mon Jun 26 23:43:56 2000 @@ -390,10 +390,14 @@ img = aw->animator.ximage = XCreateImage(dpy, visual, depth, format, offset, data, width, height, bitmap_pad, bytes_per_line); - img->data = cmalloc(img->bytes_per_line - *img->height*img->depth); + img->data = cmalloc(img->bytes_per_line*img->height); +#if 1 XLookupColor(dpy, colormap, bc1, &top, &dummy); XLookupColor(dpy, colormap, bc2, &bot, &dummy); +#else + XAllocNamedColor(dpy, colormap, bc1, &dummy, &top); + XAllocNamedColor(dpy, colormap, bc2, &dummy, &bot); +#endif for (y = 0; y < height; y++) { for (x = 0; x < width; x++ ) { color.red = (int)top.red @@ -413,8 +417,7 @@ bitmap_pad, bytes_per_line); aw->animator.ximage->data = cmalloc( aw->animator.ximage->bytes_per_line - *aw->animator.ximage->height - *aw->animator.ximage->depth); + *aw->animator.ximage->height); neww = aw->core.width; newh = aw->core.height; @@ -739,6 +742,11 @@ static void Resize(Widget w) { AnimatorWidget aw = (AnimatorWidget)w; + if (!XtIsRealized(w)) return; /* but that doesn't work */ + if (aw->animator.ximage) { + XDestroyImage(aw->animator.ximage); + aw->animator.ximage = NULL; + } DoLayout(aw); } /* Resize */ diff -urNP ../siag-3.3.10/xcommon/fonts.c ./xcommon/fonts.c --- ../siag-3.3.10/xcommon/fonts.c Thu May 25 17:32:23 2000 +++ ./xcommon/fonts.c Tue Jun 20 06:52:36 2000 @@ -329,6 +329,7 @@ color_table[i].color.red = color_table[i].red; color_table[i].color.green = color_table[i].green; color_table[i].color.blue = color_table[i].blue; + color_table[i].color.flags = DoRed|DoGreen|DoBlue; if (!XAllocColor(dpy, cmap, &color_table[i].color)) return -1; color_table[i].need_init = 0; diff -urNP ../siag-3.3.10/xcommon/xcommon.c ./xcommon/xcommon.c --- ../siag-3.3.10/xcommon/xcommon.c Thu Jun 15 07:58:49 2000 +++ ./xcommon/xcommon.c Tue Jun 20 06:53:25 2000 @@ -261,6 +261,7 @@ color->pixel = 0; return; } + color->flags = DoRed|DoGreen|DoBlue; if (XAllocColor(display, colormap, color) == 0) { int dr, dg, db, bd = INT_MAX, best = 0; for (j = 0; j < ncolors; j++) { diff -urNP ../siag-3.3.10/xed/search.c ./xed/search.c --- ../siag-3.3.10/xed/search.c Thu Jun 24 11:18:57 1999 +++ ./xed/search.c Tue Jun 27 06:50:37 2000 @@ -435,11 +435,12 @@ show_position(position); } } - if (answer == NO) + if (answer == NO) { if (direction == XawsdRight) show_position(position + searchblock.length); else show_position(position); + } if (answer == CANCEL) { XtPopdown(veto_popup); return; diff -urNP ../siag-3.3.10/xegon/window.c ./xegon/window.c --- ../siag-3.3.10/xegon/window.c Sun Jun 18 19:43:32 2000 +++ ./xegon/window.c Mon Jun 26 23:45:01 2000 @@ -151,7 +151,7 @@ static XrmOptionDescRec options[] = { {"-plugin", "*plugin", XrmoptionNoArg, "True"}, - {"-play", "*play", XrmoptionNoArg, "True"} + {"-play", "*play", XrmoptionNoArg, "True"}, }; window *w_list; @@ -689,24 +689,24 @@ TooltipAdd(tooltip, btnColor, _("Change the color")); } -static LISP popup_stage(void) + +static void reset_lists(window *w) { - stage_init(w_list); - XtPopup(w_list->ui->ani_shell, XtGrabNone); - XSetWMProtocols(XtDisplay(w_list->ui->ani_shell), - XtWindow(w_list->ui->ani_shell), - &wm_delete_window, 1); - stage_popped = 1; - return NIL; + static String fallback[1] = {""}; + XawListChange(w->ui->objl, fallback, 1, 0, True); + XawListChange(w->ui->tickl, fallback, 1, 0, True); + XawListChange(w->ui->propl, fallback, 1, 0, True); } static LISP popdown_stage(void) { stage_popped = 0; XtPopdown(w_list->ui->ani_shell); + XtDestroyWidget(w_list->ui->stage); w_list->ui->stage = NULL; XtDestroyWidget(w_list->ui->ani_shell); w_list->ui->ani_shell = NULL; + draw_buffer(w_list); return NIL; } @@ -838,7 +838,6 @@ ani_object *o; ani_script *s; char p[256]; - static String fallback[1] = {""}; static int on = 0, sn = 0, pn = 0; static char **ol = NULL, **sl = NULL, **pl = NULL; int sht = w->sht; @@ -857,9 +856,7 @@ for (o = b->sht[sht].cast; o; o = o->next) on++; if (!on) { - XawListChange(w->ui->objl, fallback, 1, 0, True); - XawListChange(w->ui->tickl, fallback, 1, 0, True); - XawListChange(w->ui->propl, fallback, 1, 0, True); + reset_lists(w); sn = pn = 0; goto The_end; } @@ -1287,17 +1284,24 @@ topLevelShellWidgetClass, topLevel, (char *)0); } - w->ui->stage = XtVaCreateManagedWidget("stage", - animatorWidgetClass, w->ui->ani_shell, - XtNanimatorCast, NULL, - XtNanimatorMode, ANI_STOP, - XtNanimatorNow, 0, + XtRealizeWidget(w->ui->ani_shell); + XtUnrealizeWidget(w->ui->ani_shell); + XtVaSetValues(w->ui->ani_shell, + XtNwidth, width, + XtNheight, height, (char *)0); XtPopup(w->ui->ani_shell, XtGrabNone); XtVaSetValues(w->ui->ani_shell, XtNwidth, width, XtNheight, height, (char *)0); + w->ui->stage = XtVaCreateManagedWidget("stage", + animatorWidgetClass, w->ui->ani_shell, + XtNanimatorCast, NULL, + XtNanimatorMode, ANI_STOP, + XtNanimatorNow, 0, + (char *)0); + win = XtWindow(w->ui->stage); xem = KeyPressMask @@ -1311,6 +1315,10 @@ XGetInputFocus(dpy, &dummy, &revert); XSetInputFocus(dpy, win, RevertToParent, CurrentTime); + XSetWMProtocols(XtDisplay(w_list->ui->ani_shell), + XtWindow(w_list->ui->ani_shell), + &wm_delete_window, 1); + stage_popped = 1; draw_buffer(w); } @@ -1334,6 +1342,8 @@ XtGetApplicationResources(topLevel, &app_data, resources, XtNumber(resources), NULL, 0); + XSynchronize(XtDisplay(topLevel), True); + XtAppAddActions(app_context, actions, XtNumber(actions)); topbox = XtCreateManagedWidget("topbox", @@ -1429,7 +1439,6 @@ ok2print = 1; - init_subr_0("popup-stage", popup_stage); init_subr_0("popdown-stage", popdown_stage); init_subr_1("add-menu", add_menu); init_subr_3("add-menu-entry", add_menu_entry); diff -urNP ../siag-3.3.10/xegon/xegon.c ./xegon/xegon.c --- ../siag-3.3.10/xegon/xegon.c Fri Jun 2 07:12:45 2000 +++ ./xegon/xegon.c Fri Jun 23 21:36:12 2000 @@ -89,7 +89,7 @@ char pn[1024]; char cmd[1024]; char fmt[80]; - char *p; + char p[1024]; buffer *buf = w_list->buf; /* ask for file name */ @@ -102,7 +102,7 @@ strcpy(name, pn); /* copy the file */ - p = plugin_basedir(buf, NULL); + plugin_basedir(p, buf->name); sprintf(pn, "%s/%s", p, name); sprintf(cmd, "(mkdir %s;cp %s %s)2>/dev/null", p, fn, pn); system(cmd);