diff --git a/BUGFORM b/BUGFORM index cbbda9ec..c7b46ea7 100644 --- a/BUGFORM +++ b/BUGFORM @@ -70,6 +70,8 @@ X Server Vendor: ...................... Color Depth: ................. WindowMaker Version (run "wmaker -version"): ......................... -11. backtrace if the bug made Window Maker crash. The README file -has instructions to make one. +11. backtrace if the bug made Window Maker crash. PLEASE SEND THE +BACKTRACE. Your bug report might be of not much use without one. +strace/truss outputs are usually not usefull for crashes, so you can +skip it. The README file has instructions to make one. diff --git a/BUGS b/BUGS index cd37cea3..03b17be8 100644 --- a/BUGS +++ b/BUGS @@ -17,3 +17,7 @@ - mouse grab being done in client window (in wWindowResetMouseGrabs()) instead of the frame window. If grab is done in frame, titlebar buttons dont work well + +- mysterious crash with WM_COLORMAP_WINDOWS +- mysterious mess in dock icons (specially netscape) +- PPosition handling diff --git a/ChangeLog b/ChangeLog index 1a0f2a42..5ddbaad9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,25 @@ Changes since version 0.60.0: ............................. +- fixed bug in window attribute panel +- SGI portability fix (Graham Whitted ) +- fixed compilation problem with --enable-singleicon +- fixed compilation problem with WS_INDICATOR +- fixed crash bug with SGI (defaults.c) (Graham Whitted ) +- fixed sloppyfocus problem in multihead dpys (Morten Bøgeskov + ) +- fixed WorkspaceSpecificBackground bug in wmsetbg +- give preference to windows in window list when switching focus after + workspace change (Richard Kilgore ) +- brought back --locale cmd line option +- fixed bug with WorkspaceNameDisplayPosition (Emanuele Caratti ) +- added missing kbd shortcut definitions for window shortcuts + (Michael Smith ) +- fixed floppy button layout in filepanel (Matthew Ashton ) +- fixed bug with documentedited close button (Felipe A. Rodriguez + ) +- fixed some buffer overflows +- fixed some problem with the alpha - fixed some problems with non gcc compilers. - fixed problem with showing instance.class in the inspector window. - fixed crash when displaying workspace name in some positions. @@ -12,6 +31,17 @@ Changes since version 0.60.0: or attraction. - removed drop shadow for text on title bar code. (TITLE_TEXT_SHADOW) - text on title bar is now possible to be drawn by plugin. See NEWS. +- WPrefs: added support for button4/5 +- fixed scrolling of menus outside screen (Vito Caputo + ) +- replaced old linkedlist code with WMBag +- fixed wmsetbg to use right bg color with transparent background images +- fixed crash with Assertion "bad_root_window" && 0' failed. on startup +- fixed crash when more than 1 dockapp fails to launch on startup +- added a different dock setup config for each screen size Changes since version 0.53.0: diff --git a/FAQ b/FAQ index aef87f71..03963b56 100644 --- a/FAQ +++ b/FAQ @@ -102,12 +102,13 @@ Summary of Contents: 5.11 Window Maker breaks scilab 5.12 Netscape icons show up in black and white 5.13 Snow flakes from xsnow don't acumulate on titlebars! + 5.14 I'm using RedHat 6.0 and Netscape dies without reason. 6 - Programming 6.1 How do I get a normal X application to produce an appicon? 6.2 How do I get my tcl/tk application to produce an appicon? 6.3 What is WINGs? - 6.4 Where can I get more information about WINGs? + 6.4 Where can I get more information about WINGs? 7 - Miscellaneous Questions 7.1 Is there a pager for Window Maker? @@ -1319,6 +1320,15 @@ accumulation on windows is vital for you, disable SaveUnders in WPrefs, in the advanced options section. +5.14 I'm using RedHat 6.0 and Netscape dies without reason. +---------------------------------- + +Er... well, I don't know why you're looking in this Window Maker FAQ +for a RedHat/Netscape problem, but anyway, the answer is in: + +http://www.redhat.com/cgi-bin/support?solution&11-990511-0082&100-926468988&14-0&15-0&25-&3-&30- + + -=-=-=-=-=-=- Programming: -=-=-=-=-=-=- diff --git a/INSTALL.pt b/INSTALL.pt new file mode 100644 index 00000000..aed1a069 --- /dev/null +++ b/INSTALL.pt @@ -0,0 +1,566 @@ + Instruções de Instalação do Window Maker + + +PLATAFORMAS SUPORTADAS +====================== +(obs: fiquei sabendo que conseguiram compilar nesses sistemas...) + +- Intel GNU/Linux Slackware 3.5 (plataforma primária) +- outras distribuições do Intel GNU/Linux +- Sparc GNU/Linux RedHat 5.1 +- PowerPC GNU/MkLinux +- Alpha GNU/Linux RedHat 5.1 +- FreeBSD +- NetBSD +- OpenBSD +- BSDI 4.0 +- Solaris 2.5.1, 2.5.2 +- Solaris 2.6.0 +- Solaris 2.7beta +- SCO Unix +- SGI Irix 5.x, 6.5 +- OSF/1 +- HP-UX +- AIX 3.2.5 +- AIX 4.1.4 / IBM PowerPC +- AIX 4.3.1 / IBM CC compiler +- AIX 4.3.2 / IBM PowerPC +- AIX 5.3 +- DEC Alpha/Digital UNIX 4.x +- XFree86 / OS/2 +- Corel NetWinder +- SunOS 4.x +- PowerMac / Power MachTen 4.1.1 em MacOS +- Amiga 3000 rodando RedHat Linux 5.1 (Rawhide) + +Patches que possibilitem a execução em outras plataformas serão bem-vindos. + +Se a última versão não funcionou para você, tente a 0.53.0, +que é conhecida por ser bastante estável em várias plataformas. + + +REQUERIMENTOS +============= + +Os softwares a seguir são necessários para o uso do Window Maker: + +- X11R6.x + O Window Maker pode ser compilado em versões mais antigas do X, como X11R5 + (Solaris) ou X11R4 (OpenWindows) mas não funcionará 100% corretamente. Em + tais servidores não existirão ícones de aplicações e você terá problemas + usando o dock. Fazer upgrades das bibliotecas (Xlib Xt etc) ajudará se você + não pode fazer upgrade do servidor. + +Para compilar o Window Maker você precisará do seguinte: + +- Requerimentos básicos e óbvios + Se você vai compilar o Window Maker, tenha certeza de que você possui o gcc + (ou outro compilador ANSI) e os arquivos headers do X. Especialmente para + os iniciantes em Linux: você deve instalar todos os pacotes de desenvolvimento + do X e a suite gcc. Do contrário você não será capaz de compilar nenhum + programa X, incluindo o Window Maker. + +- libPropList + Você pode achar esta biblioteca em ftp://ftp.windowmaker.org/pub/libs ou + ftp://ftp.gnome.org/pub/libPropList. Você deve instalar corretamente + esta biblioteca antes de instalar o Window Maker. + +- autoconf, automake and libtool + Estes pacotes não são necessários, mas se você tiver um ou mais deles instalados, + verifique se todos eles são das seguintes versões: + autoconf 2.13 + automake 1.4 + libtool 1.3 + Se você possui uma versão diferente, desative-os mudando os nomes dos arquivos + para outra coisa ou removendo-os do seu sistema. Se você não desenvolve + software você não precisa deles, logo, você pode desinstalá-los com segurança. + +- lex (ou flex) e yacc (ou bison) + São usados pelo libPropList. O lex não seria necessário, já que o seu + arquivo de saída é incluído, mas como ou eu ou o automake é um pouco + burro, o script de configuração para o libPropList simplesmente + abortará sem motivo caso o lex não seja achado. + + +OPCIONAL: +========= +Estas bibliotecas não são necessárias para que o Window Maker funcione, mas elas +são suportadas caso você deseje usá-las. Os números das versões são os que eu +possuo (e portanto quase certamente funcionarão), mas outras versões devem funcionar +também. + + +- libXPM 4.7 ou mais atual + Versões antigas podem não funcionar. + Disponível em ftp://sunsite.unc.edu/pub/Linux/libs/X/ + Há suporte nativo para arquivos XPM, mas ele não carregará imagens em + algumas formatos incomuns. + +- libpng 0.96 ou mais atual e zlib + Para suporte a imagens PNG. + +- libtiff 3.4 ou mais atual + Para suporte a imagens TIFF. Você pode baixar o libtiff em + ftp://ftp.sgi.com/graphics/tiff. + +- libjpeg 6.0.1 ou mais atual + Para suporte a imagens JPEG. + +- libgif 2.2 ou libungif + Para suporte a imagens tipo GIF. + +- GNU xgettext + Se você deseja usar mensagens traduzidas, será necessário o GNU gettext. Outras + versões do gettext não são compatíveis e não funcionarão. Baixe a versão + GNU através do site ftp://ftp.gnu.org + +A maioria dos pacotes citados pode ser encontrado em ftp.uu.net/pub/graphics + + + +OPÇÕES DE CONFIGURAÇÃO +====================== + +Estas opções podem ser passadas ao script de configuração para ativar/desativar algumas +opções do Window Maker. Exemplo: + +./configure --enable-kde --enable-gnome + +irá configurar o Window Maker para que seja compilado com suporte ao KDE e GNOME. + + +Para obter uma lista com outras opcoes, execute ./configure --help: + +--with-libs-from + Especifica diretórios (paths) adicionais onde se deve achar as bibliotecas. + A flag -L deve preceder cada caminho, tal como: + --with-libs-from="-L/opt/libs -L/usr/local/lib" + +--with-incs-from + Especifica diretórios adicionais para os arquivos de cabeçalho (header files) + que serão procurados. A flag -l deve preceder cada caminho descrito, tal como: + --with-incs-from="-I/opt/headers -I/usr/local/include" + +--enable-single-icon + Permite o agrupamento de todas as aplicações com a mesma WM_CLASS+WM_INSTANCE em + uma só. Esta opção não é suportada por todos os desenvolvedores. Se você tiver algum + problema com essa opção, escreva para o seu autor: Christopher Seawood + + +--disable-shm + Desativa o uso da extensão de memória compartilhada do MIT. Isto reduzirá + um pouco a geração de texturas, mas em alguns casos se mostrará necessário + em virtude de um bug que se manifesta quando manipulam-se ícones e texturas. + +--disable-motif + Desativa compatibilidade com gerenciador de janelas mwm. + +--enable-openlook + Ativa compatibilidade com gerenciador de janelas OPEN LOOK(tm). + +--enable-gnome + Ativa compatibilidade com gerenciador de janelas GNOME. + +--enable-kde + Ativa compatibilidade com gerenciador de janelas kde/kwm. + +--enable-lite + Remove coisas que já são suportadas em ambientes desktops como o KDE + e o GNOME. As opções desativadas são: lista de janelas (window list), menu de + aplicações root (root applications menu), seleção múltipla de janelas + (multiple window selection). Note que não será mais possível sair do Window + Maker de dentro; você terá que usar o kill com o sinal SIGTERM ou sair do KDE. + Não é aconselhado ativar essa opção. + +--enable-modelock + Suporte ao bloqueio de status de linguagem do XKB. Se você não sabe o que + é isto, você provavelmente não precisa. + +--enable-sound + Ativa o suporte ao módulo de efeitos sonoros. + +--disable-xpm + Desativa o uso da biblioteca XPM mesmo se esta estiver disponível no seu sistema. + +--disable-png + Desativa o uso da biblioteca PNG + +--disable-tiff + Desativa o uso da biblioteca TIFF + +--disable-gif + Desativa o uso da biblioteca GIF + +--disable-jpeg + Desativa o uso da biblioteca JPEG + +--disable-shape + Desativa o uso das shaped windows (para oclock, xeyes etc.). + +--enable-debug + Não use esta opção a não ser que saiba realmente o que está fazendo + + + +NOTAS ESPECÍFICAS PARA AS PLATAFORMAS +===================================== + +- máquinas DEC/Alpha + Você provavelmente precisará usar a flag --disable-shm para configurar, + como ./configure --disable-shm + +- SCO Unix - execute o configure tal como + CFLAGS="-belf -DANSICPP" ./configure + +- SunOS, Solaris + Se você possui o gcc instalado, execute o configure como abaixo: + CPP_PATH="gcc -E -x c" ./configure + O cpp da Sun não possui agumas funções necessárias ao Window Maker e pode + causar problemas quando analisados os arquivos de configuração. + Você pode ainda precisar usar --with-libs-from e --with-incs-from + para fornecer o diretório onde a libtiff está localizada. + Alguem me mandou um email dizendo que você precisará deixar o /usr/local/lib + como primeiro caminho (path) no LD_LIBRARY_PATH para que funcione. + + Se você tem uma Ultra Creator 3D ou outra máquina com gráficos high-end, + certifique-se de iniciar o servidor X com o visual padrão definido em 24bpp + ou você poderá ter problemas com cores desfiguaradas. Isto é um bug do + wmaker e será consertado. + +- GNU/Linux em geral + Confira se você possui /etc/local/lib no /etc/ld.so.conf e rode ldconfig + após a instalação. + Remova qualquer versão em pacote do Window Maker antes de instalar uma versão + mais atual. + +- RedHat GNU/Linux + Os sistemas RedHat apresentam vários incômodos. Se você usa, certifique-se + de seguir os passos abaixo ou o Window Maker não funcionará: + + * se você instalou o Window Maker que vem junto com o Red Hat, desinstale-o + antes de instalar uma versão mais atual. + + * certifique-se de que você não possui as variáveis de ambiente LANG e LINGUAS + configuradas como en_RN; + + * certifique-se de que você possui /usr/local/bin na variável PATH; + + * certifique-se de que você tem /usr/local/lib no /etc/ld.conf.so antes de + executar o ldconfig; + + * se você tiver problemas que mencionem uma mensagem de erro com o + --no-reexec, remova a libtool-1.2b e instale a libtool-1.3. A libtool-1.3 + pode ser encontrada em ftp.gnu.org. Também leia a seção TROUBLESHOOTING; + + * se você instalou o pacote Window Maker do RedHat e está instalando uma + nova versão na mão (você mesmo está compilando), remova o pacote Window + Maker do seu sistema RedHat antes. + + * certifique-se de que você possua o vínculo simbólico do /usr/include/X11 + ao /usr/X11R6/include/X11 (se não, digite ln -s /usr/X11R6/include/X11 + /usr/include/X11) + + * certifique-se de que você tem o /lib/cpp apontando para o programa cpp. + + Se você possui alguma dúvida quanto a realizar qualquer uma das tarefas acima, + por favor não hesite em contatar o suporte ao usuário RedHat. Eles gentilmente + irão responder a todas as suas dúvidas relacionadas ao sistema. Eles sabem + muito mais sobre o sistema deles do que nós (nós não usamos RedHat). + +- PowerPC MkLinux + Você terá que possuir a última versão do Xpmac. Versões mais antigas + parecem ter bugs que fazem com que o sistema trave. + +- Debian GNU/Linux + Se você deseja suporte a JPEG e TIFF, certifique-se que no seu sistema estão + instaladas as bibliotecas libtiff-dev e libjpeg-dev. + +- SuSE GNU/Linux + Se você instalou o pacote Window Maker do SuSE, certifique-se de + removê-lo do seu sistema antes de compilar o wmaker ou você poderá + ter problemas. + +- MetroX (versão desconhecida) + O MetroX possui uma falha que corrompe os pixmaps que são definidos + como backgrounds de janelas. Se você usa MetroX e está tendo problemas + estranhos com texturas, não use texturas nas titlebars. Ou use + um servidor X diferente. + +INSTALAÇÃO: +=========== + +Desempacote o WindowMaker-extra-.tar.gz no /usr/local/share. + +Você pode pegar o arquivo no site ftp://ftp.windowmaker.org. Este arquivo +é opcional e possui alguns ícones e temas. Procure pelo último +disponível. +Ainda há o WindowMaker-extra.readme para instruí-lo sobre onde o pacote deve ir. + + +Compilando o Window Maker +------------------------- + Se você quer fazer de modo rápido e simples, digite o seguinte no seu prompt: + + ./configure + make + +depois entre como root e digite: + + make install + ldconfig + +ou se você quiser remover os símbolos de depuração dos seus binários para +que eles se tornem menores, você pode digitar: + + make install-strip + ldconfig + +Estes comandos irão compilar e instalar o Window Maker com parâmetros padrões. + +Se você deseja configurar algumas opções de compilação, você pode fazer o seguinte: + + 1.(opcional) Olhe na seção OPÇÕES DE CONFIGURAÇÃO acima para ver as + opções disponíveis. Execute também: + + ./configure --help + + para obter uma lista completa das outras opções. + + 2. Rode o configure com as opções que você deseja. Por exemplo, se + deseja usar a opção --enable-kde, você deve digitar: + + ./configure --enable-kde + + 3. (opcional) Edite o arquivo src/wconfig.h com seu editor de texto + preferido e procure por alguma opção que deseja mudar + + 4. Compile. Só digite: + + make + + 5. Entre como root (se você não pode fazer isso, leia a seção "Eu não tenho a + senha de root") e instale o Window Maker no seu sistema: + + su root + make install + + +Configurações Específicas +------------------------- + +Estas instruções não precisam ser seguidas quando for feito o upgrade do +Window Maker em cima de uma versão antiga, a menos que o arquivo NEWS diga +algo diferente. + +Todo usuário no seu sistema que desejar rodar o Window Maker deverá fazer o seguinte: + + 1. Instalar os arquivos de configuração do Window Maker no diretório home. +Digite: + wmaker.inst + + wmaker.inst vai instalar os arquivos de configuração do Window Maker e fazer + com que o X rode o Window Maker quando executado. + + É isso! + + Você pode digitar "man wmaker" para ver uma ajuda geral sobre configuração +e outras coisas. + +Leia o Manual do Usuário para explicações mais profundas sobre o Window Maker. + +Você deve dar uma olhada no FAQ também. + + + +Eu não tenho a senha de root +---------------------------- + +Se você não pode obter privilégios de super-usuário (não pode ser root) você +pode instalar o wmaker no seu diretório home. Para isso, forneça a opção +--prefix quando for rodar o configure, como explicado no passo 2 da seção +Compilando o Window Maker. +Você ainda precisará fornecer a opção --with-appspath, para especificar o +caminho do WPrefs.app. Exemplo: + +./configure --prefix=/home/jshmoe --with-appspath=/home/jshmoe/GNUstep/Apps + +Depois faça com que /home/jshome/bin seja incluído na variável PATH, adicione +/home/jshome/lib na variável de ambiente LD_LIBRARY_PATH e rode bin/wmaker.inst + +É claro, substitua /home/jshome com o seu diretório home. + + +UPGRADE +======= + +Se você está fazendo um upgrade de uma versão antiga do Window maker: + + 1. Configure e compile o Window Maker como sempre + 2. Instale o Window Maker (mas não rode o wmaker.inst) + 3. Leia o arquivo NEWS e atualize seus arquivos de configuração, + se necessário. + +TROUBLESHOOTING +=============== + +Quando você tiver problemas na configuração (enquanto roda o configure), +tal como não conseguir usar uma biblioteca de gráficos que você acha que tem +instalada, olhe no arquivo config.log para obter dicas sobre o que pode estar +errado. + +== Erro ao carregar as fontes, mesmo quando elas existem + +Tente reconstruir sem suporte NLS. + +== Erro ao configurar + +ltconfig: unrecognized option `--no-reexec' +Try `ltconfig --help' for more information. +configure: error: libtool configure failed + +remova a opção --no-reexec do aclocal.m4 e da libPropList/aclocal.m4 +e reconfigure. +Também verifique se as versões do autoconf e do automake que você tem +instaladas são: +autoconf 2.13 +automake 1.4 +libtool 1.3 + +Note que não deve ser libtool 1.2b, deve ser libtool 1.3. + +== Não acha a proplist.h ou libPropList.algumacoisa + +Baixe e instale a libPropList dos sites já citados neste arquivo. + +== o configure não detecta a libtiff, ou outras bibliotecas gráficas. + +Delete o config.cache, depois rode de novo o configure adicionando as +seguintes opções ao configure (e as outras opções que você usa): +--with-libs-from="-L/usr/local/lib" +--with-incs-from="-I/usr/local/include -I/usr/local/include/tiff" +Substitua o caminho para onde estão localizadas as suas bibliotecas gráficas +e os correspondentes arquivos de cabeçalho. Você pode colocar caminhos múltiplos +em qualquer uma dessas opções, como no exemplo do --with-incs-from. Só ponha um +espaço entre eles. + +== o configure não detecta libXpm. + +* Confira se você possui um vínculo simbólico da libXpm.so.4.9 para libXpm.so + + +== Segmentation fault na inicialização + +* Confira se a versão da libXPM é a 4.7 ou mais atual + +* Confira se você tem uma versão atualizada do ~/GNUstep/Defaults/WindowMaker + +Se você não tem certeza, tente renomear ~/GNUstep para ~/GNUtmp e depois rode +o wmaker.inst + +== "...: your machine is misconfigured. gethostname() returned (none)" + +* o hostname da sua máquina está definido incorretamente. Execute um man hostname +para obter informações de como resolver isto. + +== O menu do root possui só 2 entradas. ("XTerm" e "Exit...") + +* O Window Maker não está achando o cpp (o pré-processador C). Se o seu cpp +não está localizado em /lib/cpp, edite src/config.h e corrija o caminho +no CPP_PATH. + +== checking lex output file root... configure: error: cannot find output from +true; giving up + +* Leia a seção REQUERIMENTOS deste arquivo. + + +LOCALES/INTERNACIONALIZAÇÃO +=========================== + +o Window Maker tem suporte a linguagem nacional. Para ativar esse suporte, +você precisa compilar o Window Maker com parâmetros adicionais. + +0 - Você deve Ter o pacote do GNU gettext instalado. Este pode ser obtido +pelo ftp://prep.ai.mit.edu/pub/gnu/gettext-nnn.tar.gz + +Os passos 1,2 e 3 podem ser pulados se você usa o script Install. + +1 - Você deve selecionar as linguagens que deseja suportar. Defina a LINGUAS +para a lista dos locales que você deseja. O Inglês é sempre suportado. Exemplo: + +setenv LINGUAS "pt ja de" +na csh + +ou + +export LINGUAS;LINGUAS="pt ja de" +na sh + +A lista dos locales suportados pode ser achado no arquivo po/README. +O inglês é a língua oficial. + +Leia o arquivo po/README se você deseja traduzir e manter os arquivos +locales para outras linguagens. + +2 - Adicionalmente, se a sua linguagem usa caracteres multi-bytes, tais +como as línguas japonesas e koreanas, você deve definir a opção MultiByteText +para YES nos arquivos ~/GNUstep/Defaults/WMGLOBAL e ~/GNUstep/Defaults/WindowMaker + +3 - Configure, compile e instale o Window Maker normalmente. + +4 - Para selecionar um locale particular você deve definir a variável de +ambiente LANG para o locale que você quer. Por exemplo, se você quer definir o +locale português, você deve rodar + +setenv LANG pt + +na csh ou + +export LANG; LANG=pt + +nas Bourne sh e similares + +Nota: Se você tem a variável de ambiente LC_CTYPE definida, você deve +indefiní-la antes de rodar o wmaker. + +O Window Maker procura os arquivos de definições de menu na seguinte +ordem (para o português brasileiro, neste caso): + +menu.pt_BR +menu.pt +menu + + +5 - Se você escolheu uma linguagem que usa caracteres multi-bytes, você +deve configurar as fontes adequadamente. Leia a página de manual para o +XcreateFontSet para obter mais detalhes sobre isto. Você deve mudar o arquivo +~/G/D/WindowMaker para as fontes usadas nas barras de título, menus e +outras coisas. Para as fontes usadas nas janelas de diálogo, mude o arquivo +~/G/D/WMGLOBAL. O %d no font names não deve ser removido. Você pode ainda usar +o wsetfont script para esta tarefa. Leia o próprio script para maiores instruções. + +Por exemplo, você pode especificar o seguinte no ~/G/D/WindowMaker: + +WindowTitleFont = "-*-helvetica-bold-r-normal-*-12-*,-*-*-medium-r-normal-*-14-*"; +MenuTitleFont = "-*-helvetica-bold-r-normal-*-12-*,-*-*-medium-r-normal-*-14-*"; +MenuTextFont = "-*-helvetica-medium-r-normal-*-12-*,-*-*-medium-r-normal-*-14-*"; +IconTitleFont = "-*-helvetica-medium-r-normal-*-8-*,-*-*-medium-r-normal-*-12-*"; +ClipTitleFont = "-*-helvetica-bold-r-normal-*-10-*,-*-*-medium-r-normal-*-12-*"; +DisplayFont = "-*-helvetica-medium-r-normal-*-12-*,-*-*-medium-r-normal-*-12-*"; + +e no ~/G/D/WMGLOBAL: + +SystemFont = "-*-*-medium-r-normal-*-%d-*-*-*-*-*-*-*"; +BoldSystemFont = "-*-*-medium-r-normal-*-%d-*-*-*-*-*-*-*"; + + +As duas fontes acima são usadas somente por aplicações que +usem WINGs (o Window Maker e WPrefs.app) + +O script wsetfont que é fornecido vai permitir com que você mude as +definições de fonte do modo mais fácil. Dê uma olhada no script para maiores +detalhes sobre o uso. + + + +Traduzido por Ricardo Sartori diff --git a/Makefile.am b/Makefile.am index 5eecdeb9..d07031d3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,9 +4,9 @@ SUBDIRS = wrlib WINGs src util po WindowMaker wmlib test WPrefs.app doc\ contrib EXTRA_DIST = TODO BUGS BUGFORM FAQ FAQ.I18N MIRRORS COPYING.OPL \ - Install acconfig.h \ + Install acconfig.h INSTALL.pt\ mkpatch README.KDE README.GNOME WindowMaker.lsm.in\ - docklib-0.2.tar.gz libwmfun-0.0.1.tar.gz + docklib-0.2.tar.gz libwmfun-0.0.2.tar.gz WindowMaker.lsm: WindowMaker.lsm.in size=`wc -c $(distdir).tar.gz|cut -d\ -f1`;\ diff --git a/Makefile.in b/Makefile.in index f3f46c7d..2aaaac4b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -59,12 +59,10 @@ PRE_UNINSTALL = : POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ -AS = @AS@ CC = @CC@ CPP_PATH = @CPP_PATH@ DFLAGS = @DFLAGS@ DLLIBS = @DLLIBS@ -DLLTOOL = @DLLTOOL@ GFXLIBS = @GFXLIBS@ HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ ICONEXT = @ICONEXT@ @@ -79,7 +77,6 @@ MAKEINFO = @MAKEINFO@ MOFILES = @MOFILES@ NLSDIR = @NLSDIR@ NM = @NM@ -OBJDUMP = @OBJDUMP@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ VERSION = @VERSION@ @@ -95,7 +92,7 @@ wprefsdir = @wprefsdir@ SUBDIRS = wrlib WINGs src util po WindowMaker wmlib test WPrefs.app doc contrib -EXTRA_DIST = TODO BUGS BUGFORM FAQ FAQ.I18N MIRRORS COPYING.OPL Install acconfig.h mkpatch README.KDE README.GNOME WindowMaker.lsm.in docklib-0.2.tar.gz libwmfun-0.0.1.tar.gz +EXTRA_DIST = TODO BUGS BUGFORM FAQ FAQ.I18N MIRRORS COPYING.OPL Install acconfig.h INSTALL.pt mkpatch README.KDE README.GNOME WindowMaker.lsm.in docklib-0.2.tar.gz libwmfun-0.0.2.tar.gz ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -109,7 +106,7 @@ mkinstalldirs src/config.h.in src/stamp-h.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best all: all-redirect .SUFFIXES: diff --git a/TODO b/TODO index fbf41ce3..e0ed0b4d 100644 --- a/TODO +++ b/TODO @@ -42,6 +42,7 @@ Never: (so, dont even bother to ask) with 2 CPUs ;). - anything that requires the mouse pointer to be jumped by WindowMaker to somewhere. This is *terrible* behaviour. And it's not just IMO. +- rewrite to use Gtk... I wont even explain why... - ICCCM 2.0: ICCCM 2.0 (not 1.0, which is what everybody supports so so) is diff --git a/aclocal.m4 b/aclocal.m4 index 0aac26d9..393706b2 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -330,66 +330,28 @@ fi AC_SUBST($1)]) -# serial 40 AC_PROG_LIBTOOL -AC_DEFUN(AC_PROG_LIBTOOL, -[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl - -# Save cache, so that ltconfig can load it -AC_CACHE_SAVE - -# Actually configure libtool. ac_aux_dir is where install-sh is found. -CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \ -LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \ -LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \ -DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \ -${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \ -$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ -|| AC_MSG_ERROR([libtool configure failed]) - -# Reload cache, that may have been modified by ltconfig -AC_CACHE_LOAD - -# This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh" - +# serial 24 AM_PROG_LIBTOOL +AC_DEFUN(AM_PROG_LIBTOOL, +[AC_REQUIRE([AM_ENABLE_SHARED])dnl +AC_REQUIRE([AM_ENABLE_STATIC])dnl +AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_REQUIRE([AC_PROG_RANLIB])dnl +AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([AM_PROG_LD])dnl +AC_REQUIRE([AM_PROG_NM])dnl +AC_REQUIRE([AC_PROG_LN_S])dnl +dnl # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' AC_SUBST(LIBTOOL)dnl -# Redirect the config.log output again, so that the ltconfig log is not -# clobbered by the next message. -exec 5>>./config.log -]) - -AC_DEFUN(AC_LIBTOOL_SETUP, -[AC_PREREQ(2.13)dnl -AC_REQUIRE([AC_ENABLE_SHARED])dnl -AC_REQUIRE([AC_ENABLE_STATIC])dnl -AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -AC_REQUIRE([AC_PROG_RANLIB])dnl -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_PROG_LD])dnl -AC_REQUIRE([AC_PROG_NM])dnl -AC_REQUIRE([AC_PROG_LN_S])dnl -dnl - # Check for any special flags to pass to ltconfig. -libtool_flags="--cache-file=$cache_file" +libtool_flags= test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared" test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static" -test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install" +test "$silent" = yes && libtool_flags="$libtool_flags --silent" test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc" test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld" -ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN], -[libtool_flags="$libtool_flags --enable-dlopen"]) -ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL], -[libtool_flags="$libtool_flags --enable-win32-dll"]) -AC_ARG_ENABLE(libtool-lock, - [ --disable-libtool-lock avoid locking (might break parallel builds)]) -test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock" -test x"$silent" = xyes && libtool_flags="$libtool_flags --silent" # Some flags need to be propagated to the compiler or linker for good # libtool support. @@ -415,42 +377,30 @@ case "$host" in *-*-sco3.2v5*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" - AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, - [AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])]) - if test x"$lt_cv_cc_needs_belf" != x"yes"; then - # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" - fi ;; - -ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL], -[*-*-cygwin* | *-*-mingw*) - AC_CHECK_TOOL(DLLTOOL, dlltool, false) - AC_CHECK_TOOL(AS, as, false) - AC_CHECK_TOOL(OBJDUMP, objdump, false) - ;; -]) esac + +# Actually configure libtool. ac_aux_dir is where install-sh is found. +CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \ +LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \ +${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \ +$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ +|| AC_MSG_ERROR([libtool configure failed]) ]) -# AC_LIBTOOL_DLOPEN - enable checks for dlopen support -AC_DEFUN(AC_LIBTOOL_DLOPEN, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])]) - -# AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's -AC_DEFUN(AC_LIBTOOL_WIN32_DLL, [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])]) - -# AC_ENABLE_SHARED - implement the --enable-shared flag -# Usage: AC_ENABLE_SHARED[(DEFAULT)] +# AM_ENABLE_SHARED - implement the --enable-shared flag +# Usage: AM_ENABLE_SHARED[(DEFAULT)] # Where DEFAULT is either `yes' or `no'. If omitted, it defaults to # `yes'. -AC_DEFUN(AC_ENABLE_SHARED, [dnl -define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl +AC_DEFUN(AM_ENABLE_SHARED, +[define([AM_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl AC_ARG_ENABLE(shared, changequote(<<, >>)dnl -<< --enable-shared[=PKGS] build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT], +<< --enable-shared build shared libraries [default=>>AM_ENABLE_SHARED_DEFAULT] changequote([, ])dnl +[ --enable-shared=PKGS only build shared libraries if the current package + appears as an element in the PKGS list], [p=${PACKAGE-default} case "$enableval" in yes) enable_shared=yes ;; @@ -467,23 +417,29 @@ no) enable_shared=no ;; IFS="$ac_save_ifs" ;; esac], -enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl +enable_shared=AM_ENABLE_SHARED_DEFAULT)dnl ]) -# AC_DISABLE_SHARED - set the default shared flag to --disable-shared -AC_DEFUN(AC_DISABLE_SHARED, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -AC_ENABLE_SHARED(no)]) +# AM_DISABLE_SHARED - set the default shared flag to --disable-shared +AC_DEFUN(AM_DISABLE_SHARED, +[AM_ENABLE_SHARED(no)]) -# AC_ENABLE_STATIC - implement the --enable-static flag -# Usage: AC_ENABLE_STATIC[(DEFAULT)] +# AM_DISABLE_STATIC - set the default static flag to --disable-static +AC_DEFUN(AM_DISABLE_STATIC, +[AM_ENABLE_STATIC(no)]) + +# AM_ENABLE_STATIC - implement the --enable-static flag +# Usage: AM_ENABLE_STATIC[(DEFAULT)] # Where DEFAULT is either `yes' or `no'. If omitted, it defaults to # `yes'. -AC_DEFUN(AC_ENABLE_STATIC, [dnl -define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl +AC_DEFUN(AM_ENABLE_STATIC, +[define([AM_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl AC_ARG_ENABLE(static, changequote(<<, >>)dnl -<< --enable-static[=PKGS] build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT], +<< --enable-static build static libraries [default=>>AM_ENABLE_STATIC_DEFAULT] changequote([, ])dnl +[ --enable-static=PKGS only build shared libraries if the current package + appears as an element in the PKGS list], [p=${PACKAGE-default} case "$enableval" in yes) enable_static=yes ;; @@ -500,73 +456,26 @@ no) enable_static=no ;; IFS="$ac_save_ifs" ;; esac], -enable_static=AC_ENABLE_STATIC_DEFAULT)dnl +enable_static=AM_ENABLE_STATIC_DEFAULT)dnl ]) -# AC_DISABLE_STATIC - set the default static flag to --disable-static -AC_DEFUN(AC_DISABLE_STATIC, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -AC_ENABLE_STATIC(no)]) - -# AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag -# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)] -# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to -# `yes'. -AC_DEFUN(AC_ENABLE_FAST_INSTALL, [dnl -define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl -AC_ARG_ENABLE(fast-install, -changequote(<<, >>)dnl -<< --enable-fast-install[=PKGS] optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT], -changequote([, ])dnl -[p=${PACKAGE-default} -case "$enableval" in -yes) enable_fast_install=yes ;; -no) enable_fast_install=no ;; -*) - enable_fast_install=no - # Look at the argument we got. We use all the common list separators. - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," - for pkg in $enableval; do - if test "X$pkg" = "X$p"; then - enable_fast_install=yes - fi - done - IFS="$ac_save_ifs" - ;; -esac], -enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl -]) - -# AC_ENABLE_FAST_INSTALL - set the default to --disable-fast-install -AC_DEFUN(AC_DISABLE_FAST_INSTALL, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -AC_ENABLE_FAST_INSTALL(no)]) - -# AC_PROG_LD - find the path to the GNU or non-GNU linker -AC_DEFUN(AC_PROG_LD, +# AM_PROG_LD - find the path to the GNU or non-GNU linker +AC_DEFUN(AM_PROG_LD, [AC_ARG_WITH(gnu-ld, [ --with-gnu-ld assume the C compiler uses GNU ld [default=no]], test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl +AC_REQUIRE([AC_PROG_CC]) ac_prog=ld if test "$ac_cv_prog_gcc" = yes; then # Check if gcc -print-prog-name=ld gives a path. AC_MSG_CHECKING([for ld used by GCC]) ac_prog=`($CC -print-prog-name=ld) 2>&5` case "$ac_prog" in - # Accept absolute paths. -changequote(,)dnl - [\\/]* | [A-Za-z]:[\\/]*) - re_direlt='/[^/][^/]*/\.\./' -changequote([,])dnl - # Canonicalize the path of ld - ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do - ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; + # Accept absolute paths. + /* | [A-Za-z]:\\*) + test -z "$LD" && LD="$ac_prog" + ;; "") # If it fails, then pretend we aren't using GCC. ac_prog=ld @@ -583,10 +492,10 @@ else fi AC_CACHE_VAL(ac_cv_path_LD, [if test -z "$LD"; then - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then + if test -f "$ac_dir/$ac_prog"; then ac_cv_path_LD="$ac_dir/$ac_prog" # Check to see if the program is GNU ld. I'd rather use --version, # but apparently some GNU ld's only accept -v. @@ -594,7 +503,7 @@ AC_CACHE_VAL(ac_cv_path_LD, if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then test "$with_gnu_ld" != no && break else - test "$with_gnu_ld" != yes && break + test "$with_gnu_ld" != yes && break fi fi done @@ -610,10 +519,10 @@ else fi test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) AC_SUBST(LD) -AC_PROG_LD_GNU +AM_PROG_LD_GNU ]) -AC_DEFUN(AC_PROG_LD_GNU, +AC_DEFUN(AM_PROG_LD_GNU, [AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld, [# I'd rather use --version here, but apparently some GNU ld's only accept -v. if $LD -v 2>&1 &5; then @@ -623,118 +532,41 @@ else fi]) ]) -# AC_PROG_NM - find the path to a BSD-compatible name lister -AC_DEFUN(AC_PROG_NM, +# AM_PROG_NM - find the path to a BSD-compatible name lister +AC_DEFUN(AM_PROG_NM, [AC_MSG_CHECKING([for BSD-compatible nm]) AC_CACHE_VAL(ac_cv_path_NM, -[if test -n "$NM"; then - # Let the user override the test. - ac_cv_path_NM="$NM" -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" - for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do +[case "$NM" in +/* | [A-Za-z]:\\*) + ac_cv_path_NM="$NM" # Let the user override the test with a path. + ;; +*) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in /usr/ucb /usr/ccs/bin $PATH /bin; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext ; then + if test -f $ac_dir/nm; then # Check to see if the nm accepts a BSD-compat flag. # Adding the `sed 1q' prevents false positives on HP-UX, which says: # nm: unknown option "B" ignored if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then - ac_cv_path_NM="$ac_dir/nm -B" - break + ac_cv_path_NM="$ac_dir/nm -B" elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then - ac_cv_path_NM="$ac_dir/nm -p" - break + ac_cv_path_NM="$ac_dir/nm -p" else - ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but - continue # so that we can try to find one that supports BSD flags + ac_cv_path_NM="$ac_dir/nm" fi + break fi done IFS="$ac_save_ifs" test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm -fi]) + ;; +esac]) NM="$ac_cv_path_NM" AC_MSG_RESULT([$NM]) AC_SUBST(NM) ]) -# AC_CHECK_LIBM - check for math library -AC_DEFUN(AC_CHECK_LIBM, -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -LIBM= -case "$host" in -*-*-beos* | *-*-cygwin*) - # These system don't have libm - ;; -*-ncr-sysv4.3*) - AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") - AC_CHECK_LIB(m, main, LIBM="$LIBM -lm") - ;; -*) - AC_CHECK_LIB(m, main, LIBM="-lm") - ;; -esac -]) - -# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for -# the libltdl convenience library, adds --enable-ltdl-convenience to -# the configure arguments. Note that LIBLTDL is not AC_SUBSTed, nor -# is AC_CONFIG_SUBDIRS called. If DIR is not provided, it is assumed -# to be `${top_builddir}/libltdl'. Make sure you start DIR with -# '${top_builddir}/' (note the single quotes!) if your package is not -# flat, and, if you're not using automake, define top_builddir as -# appropriate in the Makefiles. -AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl - case "$enable_ltdl_convenience" in - no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; - "") enable_ltdl_convenience=yes - ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; - esac - LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la - INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl']) -]) - -# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for -# the libltdl installable library, and adds --enable-ltdl-install to -# the configure arguments. Note that LIBLTDL is not AC_SUBSTed, nor -# is AC_CONFIG_SUBDIRS called. If DIR is not provided, it is assumed -# to be `${top_builddir}/libltdl'. Make sure you start DIR with -# '${top_builddir}/' (note the single quotes!) if your package is not -# flat, and, if you're not using automake, define top_builddir as -# appropriate in the Makefiles. -# In the future, this macro may have to be called after AC_PROG_LIBTOOL. -AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl - AC_CHECK_LIB(ltdl, main, - [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no], - [if test x"$enable_ltdl_install" = xno; then - AC_MSG_WARN([libltdl not installed, but installation disabled]) - else - enable_ltdl_install=yes - fi - ]) - if test x"$enable_ltdl_install" = x"yes"; then - ac_configure_args="$ac_configure_args --enable-ltdl-install" - LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la - INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl']) - else - ac_configure_args="$ac_configure_args --enable-ltdl-install=no" - LIBLTDL="-lltdl" - INCLTDL= - fi -]) - -dnl old names -AC_DEFUN(AM_PROG_LIBTOOL, [indir([AC_PROG_LIBTOOL])])dnl -AC_DEFUN(AM_ENABLE_SHARED, [indir([AC_ENABLE_SHARED], $@)])dnl -AC_DEFUN(AM_ENABLE_STATIC, [indir([AC_ENABLE_STATIC], $@)])dnl -AC_DEFUN(AM_DISABLE_SHARED, [indir([AC_DISABLE_SHARED], $@)])dnl -AC_DEFUN(AM_DISABLE_STATIC, [indir([AC_DISABLE_STATIC], $@)])dnl -AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl -AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl - -dnl This is just to silence aclocal about the macro not being used -ifelse([AC_DISABLE_FAST_INSTALL])dnl - # Like AC_CONFIG_HEADER, but automatically create stamp file. AC_DEFUN(AM_CONFIG_HEADER, diff --git a/configure b/configure index d39b011c..a67e87ac 100755 --- a/configure +++ b/configure @@ -12,15 +12,15 @@ ac_help= ac_default_prefix=/usr/local # Any additions from configure.in: ac_help="$ac_help - --enable-shared[=PKGS] build shared libraries [default=yes]" + --enable-shared build shared libraries [default=yes] + --enable-shared=PKGS only build shared libraries if the current package + appears as an element in the PKGS list" ac_help="$ac_help - --enable-static[=PKGS] build static libraries [default=yes]" -ac_help="$ac_help - --enable-fast-install[=PKGS] optimize for fast installation [default=yes]" + --enable-static build static libraries [default=yes] + --enable-static=PKGS only build shared libraries if the current package + appears as an element in the PKGS list" ac_help="$ac_help --with-gnu-ld assume the C compiler uses GNU ld [default=no]" -ac_help="$ac_help - --disable-libtool-lock avoid locking (might break parallel builds)" ac_help="$ac_help --with-libs-from pass compiler flags to look for libraries" ac_help="$ac_help @@ -752,7 +752,7 @@ fi PACKAGE=WindowMaker -VERSION=0.60.0 +VERSION=0.61.0 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; } @@ -881,29 +881,6 @@ else enable_static=yes fi -# Check whether --enable-fast-install or --disable-fast-install was given. -if test "${enable_fast_install+set}" = set; then - enableval="$enable_fast_install" - p=${PACKAGE-default} -case "$enableval" in -yes) enable_fast_install=yes ;; -no) enable_fast_install=no ;; -*) - enable_fast_install=no - # Look at the argument we got. We use all the common list separators. - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," - for pkg in $enableval; do - if test "X$pkg" = "X$p"; then - enable_fast_install=yes - fi - done - IFS="$ac_save_ifs" - ;; -esac -else - enable_fast_install=yes -fi - # Make sure we can run config.sub. if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : @@ -911,7 +888,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:915: checking host system type" >&5 +echo "configure:892: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -931,28 +908,10 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$host" 1>&6 -echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:936: checking build system type" >&5 - -build_alias=$build -case "$build_alias" in -NONE) - case $nonopt in - NONE) build_alias=$host_alias ;; - *) build_alias=$nonopt ;; - esac ;; -esac - -build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias` -build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -echo "$ac_t""$build" 1>&6 - # 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:956: checking for $ac_word" >&5 +echo "configure:915: 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 @@ -982,7 +941,7 @@ fi # 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:986: checking for $ac_word" >&5 +echo "configure:945: 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 @@ -1012,7 +971,7 @@ if test -z "$CC"; then # 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:1016: checking for $ac_word" >&5 +echo "configure:975: 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 @@ -1063,7 +1022,7 @@ fi # 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:1067: checking for $ac_word" >&5 +echo "configure:1026: 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 @@ -1095,7 +1054,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1099: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1058: 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. @@ -1106,12 +1065,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1110 "configure" +#line 1069 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1074: \"$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 @@ -1137,12 +1096,12 @@ if test $ac_cv_prog_cc_works = no; then { 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:1141: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1100: 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:1146: checking whether we are using GNU C" >&5 +echo "configure:1105: 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 @@ -1151,7 +1110,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1155: \"$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:1114: \"$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 @@ -1170,7 +1129,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1174: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1133: 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 @@ -1209,23 +1168,18 @@ else with_gnu_ld=no fi + ac_prog=ld if test "$ac_cv_prog_gcc" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:1217: checking for ld used by GCC" >&5 +echo "configure:1177: checking for ld used by GCC" >&5 ac_prog=`($CC -print-prog-name=ld) 2>&5` case "$ac_prog" in - # Accept absolute paths. - [\\/]* | [A-Za-z]:[\\/]*) - re_direlt='/[^/][^/]*/\.\./' - # Canonicalize the path of ld - ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do - ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; + # Accept absolute paths. + /* | A-Za-z:\\*) + test -z "$LD" && LD="$ac_prog" + ;; "") # If it fails, then pretend we aren't using GCC. ac_prog=ld @@ -1237,19 +1191,19 @@ echo "configure:1217: checking for ld used by GCC" >&5 esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:1241: checking for GNU ld" >&5 +echo "configure:1195: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1244: checking for non-GNU ld" >&5 +echo "configure:1198: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -z "$LD"; then - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then + if test -f "$ac_dir/$ac_prog"; then ac_cv_path_LD="$ac_dir/$ac_prog" # Check to see if the program is GNU ld. I'd rather use --version, # but apparently some GNU ld's only accept -v. @@ -1257,7 +1211,7 @@ else if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then test "$with_gnu_ld" != no && break else - test "$with_gnu_ld" != yes && break + test "$with_gnu_ld" != yes && break fi fi done @@ -1276,7 +1230,7 @@ fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:1280: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:1234: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1292,36 +1246,36 @@ echo "$ac_t""$ac_cv_prog_gnu_ld" 1>&6 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:1296: checking for BSD-compatible nm" >&5 +echo "configure:1250: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test -n "$NM"; then - # Let the user override the test. - ac_cv_path_NM="$NM" -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" - for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do + case "$NM" in +/* | A-Za-z:\\*) + ac_cv_path_NM="$NM" # Let the user override the test with a path. + ;; +*) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in /usr/ucb /usr/ccs/bin $PATH /bin; do test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext ; then + if test -f $ac_dir/nm; then # Check to see if the nm accepts a BSD-compat flag. # Adding the `sed 1q' prevents false positives on HP-UX, which says: # nm: unknown option "B" ignored if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then - ac_cv_path_NM="$ac_dir/nm -B" - break + ac_cv_path_NM="$ac_dir/nm -B" elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then - ac_cv_path_NM="$ac_dir/nm -p" - break + ac_cv_path_NM="$ac_dir/nm -p" else - ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but - continue # so that we can try to find one that supports BSD flags + ac_cv_path_NM="$ac_dir/nm" fi + break fi done IFS="$ac_save_ifs" test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm -fi + ;; +esac fi NM="$ac_cv_path_NM" @@ -1329,7 +1283,7 @@ echo "$ac_t""$NM" 1>&6 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1333: checking whether ln -s works" >&5 +echo "configure:1287: 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 @@ -1349,32 +1303,24 @@ else echo "$ac_t""no" 1>&6 fi +# Always use our own libtool. +LIBTOOL='$(SHELL) $(top_builddir)/libtool' # Check for any special flags to pass to ltconfig. -libtool_flags="--cache-file=$cache_file" +libtool_flags= test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared" test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static" -test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install" +test "$silent" = yes && libtool_flags="$libtool_flags --silent" test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc" test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld" - -# Check whether --enable-libtool-lock or --disable-libtool-lock was given. -if test "${enable_libtool_lock+set}" = set; then - enableval="$enable_libtool_lock" - : -fi - -test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock" -test x"$silent" = xyes && libtool_flags="$libtool_flags --silent" - # Some flags need to be propagated to the compiler or linker for good # libtool support. case "$host" in *-*-irix6*) # Find out which ABI we are using. - echo '#line 1377 "configure"' > conftest.$ac_ext - if { (eval echo configure:1378: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 1323 "configure"' > conftest.$ac_ext + if { (eval echo configure:1324: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *32-bit*) LD="${LD-ld} -32" @@ -1392,122 +1338,17 @@ case "$host" in *-*-sco3.2v5*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" - echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:1399: checking whether the C compiler needs -belf" >&5 -if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - lt_cv_cc_needs_belf=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - lt_cv_cc_needs_belf=no -fi -rm -f conftest* -fi - -echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6 - if test x"$lt_cv_cc_needs_belf" != x"yes"; then - # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" - fi ;; - - esac - -# Save cache, so that ltconfig can load it -cat > confcache <<\EOF -# This file is a shell script that caches the results of configure -# tests run on this system so they can be shared between configure -# scripts and configure runs. It is not useful on other systems. -# If it contains results you don't want to keep, you may remove or edit it. -# -# By default, configure uses ./config.cache as the cache file, -# creating it if it does not exist already. You can give configure -# the --cache-file=FILE option to use a different cache file; that is -# what configure does when it calls configure scripts in -# subdirectories, so they share the cache. -# Giving --cache-file=/dev/null disables caching, for debugging configure. -# config.status only pays attention to the cache file if you give it the -# --recheck option to rerun configure. -# -EOF -# The following way of writing the cache mishandles newlines in values, -# but we know of no workaround that is simple, portable, and efficient. -# So, don't put newlines in cache variables' values. -# Ultrix sh set writes to stderr and can't be redirected directly, -# and sets the high bit in the cache file unless we assign to the vars. -(set) 2>&1 | - case `(ac_space=' '; set | grep ac_space) 2>&1` in - *ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote substitution - # turns \\\\ into \\, and sed turns \\ into \). - sed -n \ - -e "s/'/'\\\\''/g" \ - -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" - ;; - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' - ;; - esac >> confcache -if cmp -s $cache_file confcache; then - : -else - if test -w $cache_file; then - echo "updating cache $cache_file" - cat confcache > $cache_file - else - echo "not updating unwritable cache $cache_file" - fi -fi -rm -f confcache - - # Actually configure libtool. ac_aux_dir is where install-sh is found. CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \ -LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \ -LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \ -DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \ -${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \ +LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \ +${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \ $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } -# Reload cache, that may have been modified by ltconfig -if test -r "$cache_file"; then - echo "loading cache $cache_file" - . $cache_file -else - echo "creating cache $cache_file" - > $cache_file -fi - - -# This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh" - -# Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool' - -# Redirect the config.log output again, so that the ltconfig log is not -# clobbered by the next message. -exec 5>>./config.log - # by Marcelo Magallon # Turn around -rpath problem with libtool 1.0c @@ -1522,6 +1363,8 @@ case ${host} in ;; esac +W_SYSTEM=`uname -s` + @@ -1536,7 +1379,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:1540: checking host system type" >&5 +echo "configure:1383: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -1559,7 +1402,7 @@ echo "$ac_t""$host" 1>&6 echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 -echo "configure:1563: checking for POSIXized ISC" >&5 +echo "configure:1406: 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 @@ -1582,7 +1425,7 @@ fi # 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:1586: checking for $ac_word" >&5 +echo "configure:1429: 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 @@ -1612,7 +1455,7 @@ if test -z "$CC"; then # 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:1616: checking for $ac_word" >&5 +echo "configure:1459: 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 @@ -1663,7 +1506,7 @@ fi # 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:1667: checking for $ac_word" >&5 +echo "configure:1510: 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 @@ -1695,7 +1538,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1699: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1542: 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. @@ -1706,12 +1549,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1710 "configure" +#line 1553 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1558: \"$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 @@ -1737,12 +1580,12 @@ if test $ac_cv_prog_cc_works = no; then { 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:1741: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1584: 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:1746: checking whether we are using GNU C" >&5 +echo "configure:1589: 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 @@ -1751,7 +1594,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1755: \"$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:1598: \"$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 @@ -1770,7 +1613,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1774: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1617: 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 @@ -1803,7 +1646,7 @@ fi #AC_PROG_RANLIB echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1807: checking whether ln -s works" >&5 +echo "configure:1650: 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 @@ -1824,7 +1667,7 @@ else fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1828: checking how to run the C preprocessor" >&5 +echo "configure:1671: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1839,13 +1682,13 @@ else # 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:1849: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1692: \"$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 : @@ -1856,13 +1699,13 @@ else 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:1866: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1709: \"$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 : @@ -1873,13 +1716,13 @@ else 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:1883: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1726: \"$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 : @@ -1905,13 +1748,13 @@ echo "$ac_t""$CPP" 1>&6 if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:1909: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:1752: checking whether ${CC-cc} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext < Autoconf TIOCGETP @@ -1929,7 +1772,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -1970,130 +1813,6 @@ inc_search_path="-I`eval echo $inc_search_path`" -echo $ac_n "checking for RedHat system""... $ac_c" 1>&6 -echo "configure:1975: checking for RedHat system" >&5 -wm_check_flag='no :)' -rh_is_redhat=no -if test -f /etc/redhat-release; then - wm_check_flag=yes - rh_is_redhat=yes -fi -echo "$ac_t""$wm_check_flag" 1>&6 - -mins_found=no -bugs_found=no -if test "$wm_check_flag" = yes; then -echo -echo "configure: warning: Red Hat system; checking for Red-Hat-specific bugs." 1>&2 -echo -# -# Check old wmaker from RedHat -# -if test "$prefix" != "/usr/X11R6" -a "$prefix" != "/usr/X11"; then -echo $ac_n "checking for multiple installed wmaker versions""... $ac_c" 1>&6 -echo "configure:1995: checking for multiple installed wmaker versions" >&5 -if test -f /usr/X11R6/bin/wmaker; then -echo "$ac_t""uh oh" 1>&6 -mins_found=yes -rh_old_wmaker=yes -else -rh_old_wmaker=no -echo "$ac_t""no apparent problems" 1>&6 -fi -fi -# -# Check for infamous en_RN bug -# Wont work because autoconf will change LANG in the beginning of the -# script. - -# -#AC_MSG_CHECKING(for silly en_RN joke that only causes headaches) -#echo $LANG -#if test "x$LANG" = xen_RN; then -#AC_MSG_RESULT(uh oh) -#AC_MSG_WARN([the LANG environment variable is set to the en_RN -#locale. Please unset it or you will have mysterious problems when -#using various software packages.]) -#bugs_found=yes -#else -#AC_MSG_RESULT(no problem) -#fi -# -# If binary installation path is /usr/local/bin, check if it's in PATH -# -if test "$_bindir" = "/usr/local/bin"; then -echo $ac_n "checking if /usr/local/bin is in the search PATH""... $ac_c" 1>&6 -echo "configure:2027: checking if /usr/local/bin is in the search PATH" >&5 -wm_check_flag=no -rh_missing_usr_local_bin=yes -old_IFS="$IFS" -IFS=":" -for i in $PATH; do - if test "x$i" = "x/usr/local/bin"; then - wm_check_flag=yes - rh_missing_usr_local_bin=no - break; - fi -done -IFS="$old_IFS" -if test "$wm_check_flag" = no; then -echo "$ac_t""uh oh" 1>&6 -bugs_found=yes -else -echo "$ac_t""no problem" 1>&6 -fi -fi -# -# If library installation path is /usr/local/lib, -# check if it's in /etc/ld.so.conf -# -if test "$_libdir" = "/usr/local/lib"; then -wm_check_flag=yes -rh_missing_usr_local_lib=no -echo $ac_n "checking if /usr/local/lib is in /etc/ld.so.conf""... $ac_c" 1>&6 -echo "configure:2055: checking if /usr/local/lib is in /etc/ld.so.conf" >&5 -test -z "`grep /usr/local/lib /etc/ld.so.conf`" -test "$?" -eq 0 && wm_check_flag=no -if test "$wm_check_flag" = no; then -echo "$ac_t""uh oh" 1>&6 -rh_missing_usr_local_lib=yes -bugs_found=yes -else -echo "$ac_t""no problem" 1>&6 -fi -fi -# -# Check for symbolic links -# -echo $ac_n "checking for /usr/include/X11 symbolic link""... $ac_c" 1>&6 -echo "configure:2070: checking for /usr/include/X11 symbolic link" >&5 -rh_missing_usr_include_x11=no -if test -d "/usr/include/X11"; then -echo "$ac_t""found" 1>&6 -else -echo "$ac_t""uh oh" 1>&6 -rh_missing_usr_include_x11=yes -mins_found=yes -fi - -# -# Check for /lib/cpp -# -echo $ac_n "checking for /lib/cpp""... $ac_c" 1>&6 -echo "configure:2084: checking for /lib/cpp" >&5 -rh_missing_lib_cpp=no -if test -f "/lib/cpp"; then -echo "$ac_t""found" 1>&6 -else -echo "$ac_t""uh oh" 1>&6 -rh_missing_lib_cpp=yes -bugs_found=yes -fi - -echo -fi - - # Check whether --with-libs-from or --without-libs-from was given. if test "${with_libs_from+set}" = set; then @@ -2112,12 +1831,12 @@ fi echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:2116: checking for vprintf" >&5 +echo "configure:1835: 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:1863: \"$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 @@ -2164,12 +1883,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:2168: checking for _doprnt" >&5 +echo "configure:1887: 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:1915: \"$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 @@ -2219,19 +1938,19 @@ fi # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:2223: checking for working alloca.h" >&5 +echo "configure:1942: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:2235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -2252,12 +1971,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:2256: checking for alloca" >&5 +echo "configure:1975: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+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:2008: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -2317,12 +2036,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:2321: checking whether alloca needs Cray hooks" >&5 +echo "configure:2040: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2351: checking for $ac_func" >&5 +echo "configure:2070: 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:2098: \"$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 @@ -2402,7 +2121,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:2406: checking stack direction for C alloca" >&5 +echo "configure:2125: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2410,7 +2129,7 @@ else ac_cv_c_stack_direction=0 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:2152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -2453,12 +2172,12 @@ fi for ac_func in gethostname select poll strerror strncasecmp setpgid atexit do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2457: checking for $ac_func" >&5 +echo "configure:2176: 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:2204: \"$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 @@ -2511,12 +2230,12 @@ done DLLIBS="" echo $ac_n "checking for dlopen""... $ac_c" 1>&6 -echo "configure:2515: checking for dlopen" >&5 +echo "configure:2234: checking for dlopen" >&5 if eval "test \"`echo '$''{'ac_cv_func_dlopen'+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:2262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dlopen=yes" else @@ -2557,7 +2276,7 @@ if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:2561: checking for dlopen in -ldl" >&5 +echo "configure:2280: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2565,7 +2284,7 @@ else 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:2299: \"$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 @@ -2605,17 +2324,17 @@ if test "x$HAVEDL" = xyes; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2609: checking for $ac_hdr" >&5 +echo "configure:2328: 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:2619: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2338: \"$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* @@ -2649,7 +2368,7 @@ if test "x$CPP_PATH" = x; then # Extract the first word of "cpp", so it can be a program name with args. set dummy cpp; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2653: checking for $ac_word" >&5 +echo "configure:2372: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_CPP_PATH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2705,12 +2424,12 @@ EOF echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:2709: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:2428: checking for sys/wait.h that is POSIX.1 compatible" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2726,7 +2445,7 @@ wait (&s); s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:2730: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2449: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -2747,12 +2466,12 @@ EOF fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:2751: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:2470: 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 @@ -2761,7 +2480,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:2765: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2484: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -2786,17 +2505,17 @@ for ac_hdr in fcntl.h limits.h sys/ioctl.h sys/time.h sys/types.h\ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2790: checking for $ac_hdr" >&5 +echo "configure:2509: 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:2800: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2519: \"$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* @@ -2826,12 +2545,12 @@ done echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6 -echo "configure:2830: checking for sys_siglist declaration in signal.h or unistd.h" >&5 +echo "configure:2549: checking for sys_siglist declaration in signal.h or unistd.h" >&5 if eval "test \"`echo '$''{'ac_cv_decl_sys_siglist'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2843,7 +2562,7 @@ int main() { char *msg = *(sys_siglist + 1); ; return 0; } EOF -if { (eval echo configure:2847: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2566: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_decl_sys_siglist=yes else @@ -2864,12 +2583,12 @@ EOF fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:2868: checking for working const" >&5 +echo "configure:2587: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2641: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -2941,12 +2660,12 @@ fi #AC_TYPE_SIZE_T #AC_TYPE_PID_T echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:2945: checking return type of signal handlers" >&5 +echo "configure:2664: 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 @@ -2963,7 +2682,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:2967: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2686: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -2991,12 +2710,12 @@ EOF INTLIBS="" echo $ac_n "checking for gettext""... $ac_c" 1>&6 -echo "configure:2995: checking for gettext" >&5 +echo "configure:2714: checking for gettext" >&5 if eval "test \"`echo '$''{'ac_cv_func_gettext'+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:2742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gettext=yes" else @@ -3037,7 +2756,7 @@ if eval "test \"`echo '$ac_cv_func_'gettext`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6 -echo "configure:3041: checking for gettext in -lintl" >&5 +echo "configure:2760: checking for gettext in -lintl" >&5 ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3045,7 +2764,7 @@ else 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:2779: \"$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 @@ -3083,7 +2802,7 @@ fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3087: checking for $ac_word" >&5 +echo "configure:2806: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3147,7 +2866,7 @@ fi supported_locales="cs de es fr gl it ja ko nl no pt ru se tr fi hr el pl ro da zh_TW.Big5 zh_CN sk" -supported_wprefs_locales="pt hr fr ko ja cs zh_TW.Big5 es zh_CN fi it ru" +supported_wprefs_locales="pt hr fr ko ja cs zh_TW.Big5 es zh_CN fi it ru de" for lang in $LINGUAS; do ok=0 @@ -3179,7 +2898,7 @@ done case $host_os in freebsd*) echo $ac_n "checking for setlocale in -lxpg4""... $ac_c" 1>&6 -echo "configure:3183: checking for setlocale in -lxpg4" >&5 +echo "configure:2902: checking for setlocale in -lxpg4" >&5 ac_lib_var=`echo xpg4'_'setlocale | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3187,7 +2906,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lxpg4 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2921: \"$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 @@ -3316,7 +3035,7 @@ fi # 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:3320: checking for X" >&5 +echo "configure:3039: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -3378,12 +3097,12 @@ if test "$ac_x_includes" = NO; then # 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:3387: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3106: \"$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* @@ -3452,14 +3171,14 @@ if test "$ac_x_libraries" = NO; then 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:3182: \"$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. @@ -3565,17 +3284,17 @@ else 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:3569: checking whether -R must be followed by a space" >&5 +echo "configure:3288: 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:3298: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -3591,14 +3310,14 @@ rm -f conftest* 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:3321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -3630,7 +3349,7 @@ rm -f conftest* # 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:3634: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:3353: 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 @@ -3638,7 +3357,7 @@ else 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:3372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3671,7 +3390,7 @@ fi 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:3675: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:3394: 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 @@ -3679,7 +3398,7 @@ else 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:3413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3719,12 +3438,12 @@ fi # 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:3723: checking for gethostbyname" >&5 +echo "configure:3442: 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:3470: \"$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 @@ -3768,7 +3487,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:3772: checking for gethostbyname in -lnsl" >&5 +echo "configure:3491: 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 @@ -3776,7 +3495,7 @@ else 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:3510: \"$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 @@ -3817,12 +3536,12 @@ fi # -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:3821: checking for connect" >&5 +echo "configure:3540: 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:3568: \"$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 @@ -3866,7 +3585,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:3870: checking for connect in -lsocket" >&5 +echo "configure:3589: 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 @@ -3874,7 +3593,7 @@ else 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:3608: \"$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 @@ -3909,12 +3628,12 @@ fi # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:3913: checking for remove" >&5 +echo "configure:3632: 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:3660: \"$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 @@ -3958,7 +3677,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:3962: checking for remove in -lposix" >&5 +echo "configure:3681: 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 @@ -3966,7 +3685,7 @@ else 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:3700: \"$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 @@ -4001,12 +3720,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:4005: checking for shmat" >&5 +echo "configure:3724: 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:3752: \"$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 @@ -4050,7 +3769,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:4054: checking for shmat in -lipc" >&5 +echo "configure:3773: 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 @@ -4058,7 +3777,7 @@ else 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:3792: \"$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 @@ -4102,7 +3821,7 @@ fi # 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:4106: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:3825: 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 @@ -4110,7 +3829,7 @@ else 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:3844: \"$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 @@ -4173,7 +3892,7 @@ fi if test "$use_locale" = yes; then echo $ac_n "checking for _Xsetlocale in -lX11""... $ac_c" 1>&6 -echo "configure:4177: checking for _Xsetlocale in -lX11" >&5 +echo "configure:3896: checking for _Xsetlocale in -lX11" >&5 ac_lib_var=`echo X11'_'_Xsetlocale | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4181,7 +3900,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lX11 $XLFLAGS $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3915: \"$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 @@ -4244,7 +3963,7 @@ added_xext=no if test "$shape" = yes; then echo $ac_n "checking for XShapeSelectInput in -lXext""... $ac_c" 1>&6 -echo "configure:4248: checking for XShapeSelectInput in -lXext" >&5 +echo "configure:3967: checking for XShapeSelectInput in -lXext" >&5 ac_lib_var=`echo Xext'_'XShapeSelectInput | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4252,7 +3971,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXext $XLFLAGS $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3986: \"$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 @@ -4304,7 +4023,7 @@ fi if test "$shm" = yes; then echo $ac_n "checking for XShmAttach in -lXext""... $ac_c" 1>&6 -echo "configure:4308: checking for XShmAttach in -lXext" >&5 +echo "configure:4027: checking for XShmAttach in -lXext" >&5 ac_lib_var=`echo Xext'_'XShmAttach | 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,7 +4031,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXext $XLFLAGS $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4046: \"$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 @@ -4347,12 +4066,12 @@ fi if test "$ok" = yes; then echo $ac_n "checking for shmget""... $ac_c" 1>&6 -echo "configure:4351: checking for shmget" >&5 +echo "configure:4070: checking for shmget" >&5 if eval "test \"`echo '$''{'ac_cv_func_shmget'+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:4098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shmget=yes" else @@ -4424,7 +4143,7 @@ LIBPL="" LDFLAGS_old="$LDFLAGS" LDFLAGS="$LDFLAGS $lib_search_path" echo $ac_n "checking for PLGetString in -lPropList""... $ac_c" 1>&6 -echo "configure:4428: checking for PLGetString in -lPropList" >&5 +echo "configure:4147: checking for PLGetString in -lPropList" >&5 ac_lib_var=`echo PropList'_'PLGetString | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4432,7 +4151,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lPropList $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4166: \"$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 @@ -4472,17 +4191,17 @@ CPPFLAGS_old="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $inc_search_path" ac_safe=`echo "proplist.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for proplist.h""... $ac_c" 1>&6 -echo "configure:4476: checking for proplist.h" >&5 +echo "configure:4195: checking for proplist.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:4486: \"$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* @@ -4516,6 +4235,10 @@ if test "x$LIBPL" = "x"; then echo " Window Maker requires libPropList to build." echo " Please read INSTALL to find where you can find libPropList," echo " and install it first." + if test x$W_SYSTEM = xLinux; then + echo " If you're using some prepackaged version of libPropList," + echo " make sure you install it's \"development\" package as well." + fi echo " If you already have it installed, try using the" if test "x$ac_cv_lib_PropList_PLGetString" != xyes; then echo " --with-libs-from flag to tell configure where the library" @@ -4550,7 +4273,7 @@ if test "$xpm" = yes; then LDFLAGS_old="$LDFLAGS" LDFLAGS="$LDFLAGS $lib_search_path" echo $ac_n "checking for XpmCreatePixmapFromData in -lXpm""... $ac_c" 1>&6 -echo "configure:4554: checking for XpmCreatePixmapFromData in -lXpm" >&5 +echo "configure:4277: checking for XpmCreatePixmapFromData in -lXpm" >&5 ac_lib_var=`echo Xpm'_'XpmCreatePixmapFromData | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4558,7 +4281,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXpm $XLFLAGS $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4296: \"$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 @@ -4599,17 +4322,17 @@ CPPFLAGS_old="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $inc_search_path" ac_safe=`echo "X11/xpm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/xpm.h""... $ac_c" 1>&6 -echo "configure:4603: checking for X11/xpm.h" >&5 +echo "configure:4326: checking for X11/xpm.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:4613: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4336: \"$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* @@ -4671,7 +4394,7 @@ if test "$png" = yes ; then LDFLAGS_old="$LDFLAGS" LDFLAGS="$LDFLAGS $lib_search_path" echo $ac_n "checking for png_get_valid in -lpng""... $ac_c" 1>&6 -echo "configure:4675: checking for png_get_valid in -lpng" >&5 +echo "configure:4398: checking for png_get_valid in -lpng" >&5 ac_lib_var=`echo png'_'png_get_valid | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4679,7 +4402,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpng -lz -lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4417: \"$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 @@ -4720,17 +4443,17 @@ CPPFLAGS_old="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $inc_search_path" ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for png.h""... $ac_c" 1>&6 -echo "configure:4724: checking for png.h" >&5 +echo "configure:4447: checking for png.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:4734: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4457: \"$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* @@ -4781,7 +4504,7 @@ if test "$jpeg" = yes; then LDFLAGS_old="$LDFLAGS" LDFLAGS="$LDFLAGS $lib_search_path" echo $ac_n "checking for jpeg_destroy_compress in -ljpeg""... $ac_c" 1>&6 -echo "configure:4785: checking for jpeg_destroy_compress in -ljpeg" >&5 +echo "configure:4508: checking for jpeg_destroy_compress in -ljpeg" >&5 ac_lib_var=`echo jpeg'_'jpeg_destroy_compress | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4789,7 +4512,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ljpeg $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4527: \"$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 @@ -4833,17 +4556,17 @@ CPPFLAGS_old="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $inc_search_path" ac_safe=`echo "jpeglib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6 -echo "configure:4837: checking for jpeglib.h" >&5 +echo "configure:4560: checking for jpeglib.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:4847: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4570: \"$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* @@ -4894,7 +4617,7 @@ if test "$gif" = yes; then LDFLAGS_old="$LDFLAGS" LDFLAGS="$LDFLAGS $lib_search_path" echo $ac_n "checking for DGifOpenFileName in -lungif""... $ac_c" 1>&6 -echo "configure:4898: checking for DGifOpenFileName in -lungif" >&5 +echo "configure:4621: checking for DGifOpenFileName in -lungif" >&5 ac_lib_var=`echo ungif'_'DGifOpenFileName | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4902,7 +4625,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lungif $XLFLAGS $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4944,7 +4667,7 @@ LDFLAGS="$LDFLAGS_old" LDFLAGS_old="$LDFLAGS" LDFLAGS="$LDFLAGS $lib_search_path" echo $ac_n "checking for DGifOpenFileName in -lgif""... $ac_c" 1>&6 -echo "configure:4948: checking for DGifOpenFileName in -lgif" >&5 +echo "configure:4671: checking for DGifOpenFileName in -lgif" >&5 ac_lib_var=`echo gif'_'DGifOpenFileName | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4952,7 +4675,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgif $XLFLAGS $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4690: \"$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 @@ -4997,17 +4720,17 @@ CPPFLAGS_old="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $inc_search_path" ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6 -echo "configure:5001: checking for gif_lib.h" >&5 +echo "configure:4724: checking for gif_lib.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:5011: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4734: \"$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* @@ -5068,7 +4791,7 @@ if test "$tif" = yes; then LDFLAGS_old="$LDFLAGS" LDFLAGS="$LDFLAGS $lib_search_path" echo $ac_n "checking for TIFFGetVersion in -ltiff""... $ac_c" 1>&6 -echo "configure:5072: checking for TIFFGetVersion in -ltiff" >&5 +echo "configure:4795: checking for TIFFGetVersion in -ltiff" >&5 ac_lib_var=`echo tiff'_'TIFFGetVersion | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5076,7 +4799,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltiff -lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4814: \"$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 @@ -5119,7 +4842,7 @@ LDFLAGS="$LDFLAGS_old" LDFLAGS_old="$LDFLAGS" LDFLAGS="$LDFLAGS $lib_search_path" echo $ac_n "checking for TIFFGetVersion in -ltiff""... $ac_c" 1>&6 -echo "configure:5123: checking for TIFFGetVersion in -ltiff" >&5 +echo "configure:4846: checking for TIFFGetVersion in -ltiff" >&5 ac_lib_var=`echo tiff'_'TIFFGetVersion | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5127,7 +4850,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltiff $ljpeg -lz -lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4865: \"$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 @@ -5171,7 +4894,7 @@ LDFLAGS="$LDFLAGS_old" LDFLAGS_old="$LDFLAGS" LDFLAGS="$LDFLAGS $lib_search_path" echo $ac_n "checking for TIFFGetVersion in -ltiff34""... $ac_c" 1>&6 -echo "configure:5175: checking for TIFFGetVersion in -ltiff34" >&5 +echo "configure:4898: checking for TIFFGetVersion in -ltiff34" >&5 ac_lib_var=`echo tiff34'_'TIFFGetVersion | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5179,7 +4902,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltiff34 $ljpeg -lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4917: \"$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 @@ -5225,17 +4948,17 @@ CPPFLAGS_old="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $inc_search_path" ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6 -echo "configure:5229: checking for tiffio.h" >&5 +echo "configure:4952: checking for tiffio.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:5239: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4962: \"$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* @@ -5346,7 +5069,7 @@ EOF _sysconfdir=`eval echo $sysconfdir` cat >> confdefs.h <&2 -if test "x$rh_old_wmaker" = xyes; then -echo "Problem: Old version of Window Maker in /usr/X11R6/bin." -echo "Description: You seem to have an old version of Window Maker" -echo " installed in /usr/X11R6/bin. It is recommended" -echo " that you uninstall any previously installed" -echo " packages of WindowMaker before installing a new one." -echo -fi -if test "x$rh_missing_usr_local_bin" = xyes; then -echo "Problem: PATH is missing /usr/local/bin." -echo "Description: Your PATH environment variable does not appear to" -echo " contain the directory /usr/local/bin. Please add it." -echo -fi -if test "x$rh_missing_usr_local_lib" = xyes; then -echo "Problem: /etc/ld.so.conf missing /usr/local/lib" -echo "Description: Your /etc/ld.so.conf file does not appear to contain" -echo " the directory /usr/local/lib. Please add it." -echo -fi -if test "x$rh_missing_usr_x11" = xyes; then -echo "Problem: Missing /usr/X11 symbolic link." -echo "Description: Your system is missing a symbolic link from" -echo " /usr/X11R6 to /usr/X11. Please create one." -echo -fi -if test "x$rh_missing_usr_include_x11" = xyes; then -echo "Problem: Missing /usr/include/X11 symbolic link." -echo "Description: Your system is missing a symbolic link from" -echo " /usr/X11R6/include/X11 to /usr/include/X11." -echo " Please create one." -echo -fi -if test "x$rh_missing_lib_cpp" = xyes; then -echo "Problem: Missing /lib/cpp symbolic link." -echo "Description: Your system is missing a symbolic link from the" -echo " cpp (C preprocessor) program to /lib/cpp." -echo " Please create one." -echo -fi -if test "x$bugs_found" = xyes; then -{ echo "configure: error: One or more of the problems above can potentially -cause Window Maker not to install or run properly. Please resolve -the problems and try to run configure again." 1>&2; exit 1; } -exit 1 -elif test "x$mins_found" = xyes; then -echo "configure: warning: The problems above may or may not cause Window Maker -not to install or run properly. If you have any problems during -installation or execution, please resolve the problems and try to -install Window Maker again." 1>&2 -echo -fi -else -echo -echo "You appear to have a system packaged by Red Hat, but I could" -echo "not find any Red-Hat-specific problems that I know about." -echo -fi -fi - - if test "x$ac_cv_header_jpeglib_h" != xyes; then echo "WARNING WARNING WARNING WARNING WARNING WARNING WARNING" echo @@ -5983,7 +5630,8 @@ echo "not installed correctly or was not found. Background images" echo "from themes will not display as they usually are JPEG files." echo echo "To fix, download and install the jpeg library and/or make sure you" -echo "installed all jpeg related packages, like jpeg-devel." +echo "installed all jpeg related packages, SPECIALLY the development packages" +echo "like jpeg-devel (if you use some prepackaged version of libjpeg)." echo echo "WARNING WARNING WARNING WARNING WARNING WARNING WARNING" fi diff --git a/configure.in b/configure.in index 9089a835..9697d560 100644 --- a/configure.in +++ b/configure.in @@ -10,7 +10,7 @@ AC_INIT(src/WindowMaker.h) -AM_INIT_AUTOMAKE(WindowMaker, 0.60.0) +AM_INIT_AUTOMAKE(WindowMaker, 0.61.0) AM_PROG_LIBTOOL @@ -27,6 +27,8 @@ case ${host} in ;; esac +W_SYSTEM=`uname -s` + AM_CONFIG_HEADER(src/config.h) @@ -74,7 +76,7 @@ dnl dnl Check for RedHat bugs dnl ===================== -WM_CHECK_REDCRAP_BUGS($prefix,$_bindir,$_libdir) +dnl WM_CHECK_REDCRAP_BUGS($prefix,$_bindir,$_libdir) dnl @@ -216,7 +218,7 @@ dnl ================== dnl List of supported locales dnl ------------------------- supported_locales="cs de es fr gl it ja ko nl no pt ru se tr fi hr el pl ro da zh_TW.Big5 zh_CN sk" -supported_wprefs_locales="pt hr fr ko ja cs zh_TW.Big5 es zh_CN fi it ru" +supported_wprefs_locales="pt hr fr ko ja cs zh_TW.Big5 es zh_CN fi it ru de" for lang in $LINGUAS; do ok=0 @@ -433,6 +435,10 @@ if test "x$LIBPL" = "x"; then echo " Window Maker requires libPropList to build." echo " Please read INSTALL to find where you can find libPropList," echo " and install it first." + if test x$W_SYSTEM = xLinux; then + echo " If you're using some prepackaged version of libPropList," + echo " make sure you install it's \"development\" package as well." + fi echo " If you already have it installed, try using the" if test "x$ac_cv_lib_PropList_PLGetString" != xyes; then echo " --with-libs-from flag to tell configure where the library" @@ -684,7 +690,7 @@ pkgdatadir=`eval echo $datadir` AC_DEFINE_UNQUOTED(PKGDATADIR, "$pkgdatadir/WindowMaker") _sysconfdir=`eval echo $sysconfdir` -AC_DEFINE_UNQUOTED(SYSCONFDIR, "$_sysconfdir/WindowMaker") +AC_DEFINE_UNQUOTED(SYSCONFDIR, "$_sysconfdir") dnl Support for GNUSTEP_LOCAL_ROOT, for WPrefs.app @@ -853,7 +859,7 @@ if test "x$MOFILES" != "x"; then echo "Installation path of translated messages: $NLSDIR" | sed -e 's|\$(prefix)|'"$prefix|" fi -WM_PRINT_REDCRAP_BUG_STATUS +dnl WM_PRINT_REDCRAP_BUG_STATUS if test "x$ac_cv_header_jpeglib_h" != xyes; then echo "WARNING WARNING WARNING WARNING WARNING WARNING WARNING" @@ -863,7 +869,8 @@ echo "not installed correctly or was not found. Background images" echo "from themes will not display as they usually are JPEG files." echo echo "To fix, download and install the jpeg library and/or make sure you" -echo "installed all jpeg related packages, like jpeg-devel." +echo "installed all jpeg related packages, SPECIALLY the development packages" +echo "like jpeg-devel (if you use some prepackaged version of libjpeg)." echo echo "WARNING WARNING WARNING WARNING WARNING WARNING WARNING" fi diff --git a/libwmfun-0.0.1.tar.gz b/libwmfun-0.0.1.tar.gz deleted file mode 100644 index 8ad7772d..00000000 Binary files a/libwmfun-0.0.1.tar.gz and /dev/null differ