From: Han-Wen Nienhuys Date: Wed, 27 Jun 2001 08:17:13 +0000 (+0200) Subject: release: 1.4.4 X-Git-Tag: release/1.4.4 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=70a98a1bfe6eafa9a4cee14a8a5264a52a329d03;p=lilypond.git release: 1.4.4 ========== * Included documentatioon and post-flex lexer.cc patch for Debian/unstable gcc-3.0. * Enhanced gcc autoconf and make messages. * Added -mieee to CFLAGS for alpha. * Fixed help and documentation of new LilyPond command line. * Redirected SuSE download to ftp.lilypond.org (where mirror script runs). 1. --- diff --git a/CHANGES b/CHANGES index 66a91e4ef0..0ccd47a168 100644 --- a/CHANGES +++ b/CHANGES @@ -1,32 +1,23 @@ ---- ../lilypond-1.4.3.jcn2/CHANGES Tue Jun 19 12:40:33 2001 -++ b/CHANGES Tue Jun 26 13:22:05 2001 -@@ -1,5 +1,10 @@ --1.4.3.jcn2 -1.4.3.jcn3 - ========== + + +1.4.3.jcn2 +========== * Included documentatioon and post-flex lexer.cc patch for Debian/unstable gcc-3.0. * Enhanced gcc autoconf and make messages. - - * Fixed broken link in website. - --- ../lilypond-1.4.3.jcn1/CHANGES Thu Jun 14 21:29:50 2001 -++ b/CHANGES Tue Jun 19 12:40:33 2001 -@@ -1,5 +1,12 @@ --1.4.3.jcn1 -1.4.3.jcn2 - ========== -* Fixed broken link in website. +* Added -mieee to CFLAGS for alpha. + +* Fixed help and documentation of new LilyPond command line. -* Ly2dvi now leaves .tex and .latex output if latex fails, and cleans -the temp dir if anything fails. +* Redirected SuSE download to ftp.lilypond.org (where mirror script runs). + +1.4.3 +===== -* Fixes for windows scripts (Raybro Brohinksy). - - * Added -mieee to CFLAGS for alpha. - 1.4.2.jcn4 +1.4.2.jcn4 ========== * Windows: bugfix for tex-wrappers, added tex wrapper for dvips. diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi index 3db08c5063..8a0b07f13c 100644 --- a/Documentation/topdocs/INSTALL.texi +++ b/Documentation/topdocs/INSTALL.texi @@ -34,6 +34,8 @@ site}. If you want to compile LilyPond from source, download here: @itemize @bullet @item Download development releases from +@c Hmm, these won't show up in lilypond.org/stats +@c Otoh, lilypond.org is not updated when release mail arrives @uref{ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/} by FTP and @uref{http://ftp.cs.uu.nl/pub/GNU/LilyPond/}, by HTTP. @item @uref{ftp://sca.uwaterloo.ca/pub/} by FTP (Canadian mirror) @@ -308,12 +310,12 @@ Red Hat 7.0 i386 RPMS are available from @uref{ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/binaries/}. You can also compile them yourself. A spec file is in -@file{make/out/redhat.spec}. This file is distributed along with the -sources. You can make the rpm by issuing +@file{make/out/lilypond.redhat.spec}. This file is distributed along +with the sources. You can make the rpm by issuing @example tar xfz lilypond-x.y.z.tar.gz - rpm -bb lilypond-x.y.z/make/out/redhat.spec + rpm -bb lilypond-x.y.z/make/out/lilypond.redhat.spec rpm -i /usr/src/redhat/RPMS/i386/lilypond-x.y.z @end example @@ -340,16 +342,16 @@ to recompile Xdvi from source. Some LinuxPPC RPMS should available from @uref{ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/binaries/}. -A LinuxPPC RPM can be made using the @file{redhat.spec} file. +A LinuxPPC RPM can be made using the @file{lilypond.redhat.spec} file. @subsection SuSE Some SUSE RPMS should available from -@uref{ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/binaries/}. +@uref{ftp://ftp.lilypond.org/pub/LilyPond/binaries/SuSE}. You can also compile a RPM for SUSE yourself. A spec file is in -@file{make/out/suse.spec}, see the instructions for building the Red Hat -RPM. +@file{make/out/lilypond.suse.spec}, see the instructions for building +the Red Hat RPM. You must have the following packages: guile tcsh tetex te_latex te_kpath te_mpost libpng python gpp libgpp gettext autoconf netpbm libnetpb diff --git a/Documentation/topdocs/INSTALL.texi.orig b/Documentation/topdocs/INSTALL.texi.orig deleted file mode 100644 index 5265baa068..0000000000 --- a/Documentation/topdocs/INSTALL.texi.orig +++ /dev/null @@ -1,555 +0,0 @@ -\input texinfo @c -*-texinfo-*- -@setfilename INSTALL.info -@settitle INSTALL - compiling and installing GNU LilyPond - -@node Top, , , (dir) -@top - -@contents - -@chapter INSTALL - compiling and installing GNU LilyPond - - -This document describes how to build LilyPond on Unix platforms. It is -also known to run and compile on Windows NT/95/98 as well. More -information on this topic can be found at the -@uref{http://www.lilypond.org/gnu-windows/, LilyPond on Windows page}. - - -@html - -@end html - -@section Downloading - -Even numbered versions are `stable'. The webpages for the stable version -(1.2) reside @uref{http://www.gnu.org/software/lilypond, on the GNU -servers}. Big enhancements go into the latest odd numbered version -(1.3), whose webpages are on @uref{http://www.lilypond.org/,the lilypond -site}. - -@subsection source code - - -If you want to compile LilyPond from source, download here: -@itemize @bullet -@item Download development releases from -@uref{ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/} by FTP and -@uref{http://ftp.cs.uu.nl/pub/GNU/LilyPond/}, by HTTP. -@item @uref{ftp://sca.uwaterloo.ca/pub/} by FTP (Canadian mirror) -@item at @code{lilypond.org} -@uref{ftp://ftp.lilypond.org/pub/LilyPond/} by FTP and -@uref{http://www.lilypond.org/ftp/} by HTTP. -@end itemize - -@html - -@end html - - - -@subsection Binaries - -Binaries are available, but are not updated for every version released. -@itemize @bullet -@item @uref{ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/binaries/RedHat/RPMS/, Red Hat i386} -@item @uref{ftp://ftp.lilypond.org/pub/LilyPond/binaries/linuxppc/, LinuxPPC} -@item @uref{ftp://ftp.debian.org/debian/pool/main/l/lilypond/, Debian GNU/Linux} -@item -@c @uref{http://home.austin.rr.com/jbr/jeff/lilypond/, Windows Stable} -@c @item @uref{ftp://ftp.lilypond.org/pub/lilypond/gnu-windows, Windows -@c Testing} -@uref{http://www.lilypond.org/gnu-windows/, Windows Testing} - -@end itemize - -@subsection Upgrading - -There are two options for upgrading sources. - -@itemize -@item if you have an unpacked source tree of a previous version, you -may the patches. - -@emph{If you upgrade by patching do remember to rerun autoconf after -applying the patch}. - -@item if you have the @code{.tar.gz} file of a previous release, you can -use -@uref{ftp://ftp.xcf.berkeley.edu/pub/xdelta/, xdelta}. - This is much safer than using patches, and is the recommended way. - -The following command produces @file{lilypond-1.4.3.tar.gz} from -@file{lilypond-1.4.2.tar.gz} identical (up to compression dates) to the .3 -on the FTP site. -@example - xdelta patch lilypond-1.4.2-1.4.3.xd lilypond-1.4.2.tar.gz -@end example -@end itemize - -@section Requirements - -@subsection Compilation - -You need the following packages to compile Lilypond. - -@itemize -@item A reasonably new C++ compiler: EGCS 1.1, GCC 2.95.2 or -newer. Check out @uref{ftp://ftp.gnu.org/gnu/gcc/, the gcc site}. - -@item Python 1.5, -Check out @uref{http://www.python.org, the python website}. - -@item GUILE 1.3.4 or newer, check out -@uref{http://www.gnu.org/software/guile/guile.html,the GUILE webpage}. -Version 1.4 is recommended for better performance. - -@item GNU Make. -Check out -@uref{ftp://ftp.gnu.org/gnu/make/, the GNU -make FTP directory}. - -@item Flex (version 2.5.4a or newer). -Check out @uref{http://www.gnu.org/software/flex/,the Flex webpage}. - -@item Bison (version 1.25 or newer). -Check out @uref{http://www.gnu.org/software/bison/,the bison webpage} - -@item @TeX{}. - -@TeX{} is used as an output backend. - -Also, @TeX{}'s libkpathsea is used to find the fonts (@file{.mf}, @file{.afm}, @file{.tfm}). -Make sure you have tetex 1.0 or newer (1.0.6 is known to work). You may -need to install a tetex-devel or tetex-dev package too. - -@item Texinfo (version 4.0 or newer). -The documentation of lily is written in texinfo. Check out -@uref{ftp://ftp.gnu.org/gnu/texinfo/,the texinfo FTP directory}. - -@item The geometry package for LaTeX is needed to use ly2dvi. -It is available at -@uref{ftp://ftp.ctan.org/tex-archive/macros/latex/contrib/supported/geometry,the -FTP directory for @code{geometry}}. This package is normally included -with the @TeX{} distribution. - -@item MetaPost, needed for generating PostScript fonts. Please -note that tetex-0.4pl8 (included with Red Hat 5.x) does not include -@file{mfplain.mp}, which is needed for producing the scalable font -files. - -If you don't have MetaPost and don't want to use PostScript output, then -edit @file{mf/GNUmakefile}, removing the line saying @code{PFA_FILES=}. - -@item kpathsea, a library for searching (@TeX{}) files. @code{kpathsea} is -usually included with your installation of @TeX{}. You may need to install -a tetex-devel or tetex-dev package too. - -In the very unlikely case that kpathsea is not available for your -platform (ie, you're not running GNU/Linux, Windows, or any recent -UNIX), you can compile LilyPond without kpathsea support. In that case, -you'll probably have to indicate where @TeX{}'s tfm files live. Invoke -configure something like: - -@example -./configure --without-kpathsea --enable-tfm-path=/usr/share/texmf/fonts/tfm/public/cm/:/usr/share/texmf/fonts/tfm/ams/symbols -@end example - -@end itemize - -@subsection Running requirements - -GNU LilyPond does use a lot of resources. For operation you need the -following software - -@itemize @bullet -@item @TeX{}. -@item Xdvi and Ghostscript -@item GUILE 1.3.4, or newer. Check out -@uref{http://www.gnu.org/software/guile.html,the GUILE webpage} -@end itemize - -For running LilyPond successfully you have to help @TeX{} and MetaFont find -various files. The recommended way of doing so is adjusting the -environment variables in the start-up scripts of your shell. Appropriate -Csh and bourne sh scripts are left in -@file{buildscripts/out/lilypond-profile} and -@file{buildscripts/out/lilypond-login} after compilation. - -LilyPond is a big and slow program. A fast CPU and plenty of RAM is -recommended for comfortable use. - -@subsection Website requirements - -The documentation comes in the form of a website. You can view this -website on the internet, but you can also build it locally. This process -requires a successful compile of lilypond. The website is built -by issuing -@example - - make web-doc - -@end example - -Building the website requires some additional tools: - -@itemize @bullet -@item xpmtoppm (from the netpbm package: the Portable Bitmap Utilities). - The original is at -@uref{ftp://ftp.x.org/contrib/utilities/netpbm-1mar1994.p1.tar.gz,the -netpbm FTP site} - -@item pnmtopng. The original is -at -@uref{ftp://swrinde.nde.swri.edu/pub/png/applications/pnmtopng-2.37.2.tar.gz,in -the pnmtopng FTP site}. - -@item @uref{http://www.lri.fr/~filliatr/ftp/bibtex2html/, Bibtex2html}, or -@uref{http://www.uni-koblenz.de/ag-ki/ftp/bib2html/, Bib2html}. -Bibtex2html is available in debian, while bib2html is in some rpm based -distributions. -Bib2html, in turn depends on man2html for proper installation. -man2html can be had from @uref{http://askdonald.ask.uni-karlsruhe.de/hppd/hpux/Networking/WWW/Man2html-1.05,http://askdonald.ask.uni-karlsruhe.de/hppd/hpux/Networking/WWW/Man2html-1.05}. - -The website will build without bib converter utility, but you will not -see our hypertextified bibliography. - -@item texinfo (a development release) -The documentation will build with texinfo-4.0, but if you want split -html pages, you're best off using the lates pretest version from -@uref{ftp://texinfo.org/texinfo/pretests/texinfo-4.0b.tar.gz, -texinfo-4.0b} or -@uref{ftp://alpha.gnu.org/gnu/texinfo-4.0b.tar.gz,texinfo-4.0b} -@end itemize - -@section Building LilyPond - -to install GNU LilyPond, type: -@example - gunzip -c lilypond-x.y.z | tar xf - - cd lilypond-x.y.z - ./configure # run with --help to see appropriate options - make - make install - sh buildscripts/clean-fonts.sh -@end example - -If you are doing an upgrade, you should remove all @file{feta} -@code{.pk} and @file{.tfm} files. A script has been provided to do the -work for you, see @file{buildscripts/clean-fonts.sh}. - - -If you are not root, you should choose a @code{--prefix} argument that -points into your home directory, eg. -@example - - ./configure --prefix=$HOME/usr - -@end example - -In this case, you have to insert the contents of -@code{buildscripts/out/lilypond-login} or -@code{buildscripts/out/lilypond-profile} into your start up scripts by -hand. - - - -@subsection Configuring for multiple platforms - -If you want to build multiple versions of LilyPond with different -configuration settings, you can use the @code{--enable-config=CONF} -option of configure. You should use @samp{make conf=CONF} to generate -the output in @file{out-CONF}. Example: suppose I want to build with -and without profiling. Then I'd use the following for the normal build, -@example - - ./configure --prefix=~ --enable-checking - make - make install -@end example - -and for the profiling version, I specify a different configuration. - -@example - - ./configure --prefix=~ --enable-profiling --enable-config=prof --disable-checking - make conf=prof - make conf=prof install - -@end example - - - - - -@section Emacs mode - -An emacs mode for LilyPond is included with the source archive as -@file{lilypond-mode.el} and @file{lilypond-font-lock.el}. If you have -an RPM, it is in @file{/usr/share/doc/lilypond-X/}. You have to install -it yourself. - -Add this to your @file{~/.emacs} or @file{~/.emacs.el}: -@example - (load-library "lilypond-mode.el") - (setq auto-mode-alist - (cons '("\\.ly$" . LilyPond-mode) auto-mode-alist)) - (add-hook 'LilyPond-mode-hook (lambda () (turn-on-font-lock))) -@end example - -If you have the latest LilyPond-1.4.x Debian package, LilyPond-mode is -automatically loaded, so you need not modify your @code{~/.emacs} file. - -@section Compiling for distributions - -@subsection Red Hat Linux - -Red Hat 7.0 i386 RPMS are available from -@uref{ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/binaries/}. - -You can also compile them yourself. A spec file is in -@file{make/out/redhat.spec}. This file is distributed along with the -sources. You can make the rpm by issuing -@example - - tar xfz lilypond-x.y.z.tar.gz - rpm -bb lilypond-x.y.z/make/out/redhat.spec - rpm -i /usr/src/redhat/RPMS/i386/lilypond-x.y.z - -@end example - -For running on a Red Hat system you need these packages: guile, tetex, -tetex-latex, tetex-dvips, libstdc++, python, ghostscript. - -For compilation on a Red Hat system you need these packages, in addition -to the those needed for running: glibc-devel, gcc-c++, libstdc++-devel, -guile-devel, flex, bison, texinfo, tetex-devel, groff, -libgr-progs. - - -@b{Warning} - -There appears to be a problem with the Xdvi shipped with Red Hat 7.1. -Symptoms: Xdvi responds very sluggishly or hangs while viewing -lilypond output. The cause for this problem is unknown; you are advised -to recompile Xdvi from source. - -@subsection LinuxPPC - - -Some LinuxPPC RPMS should available from -@uref{ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/binaries/}. - -A LinuxPPC RPM can be made using the @file{redhat.spec} file. - -@subsection SuSE - -Some SUSE RPMS should available from -@uref{ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/binaries/}. - -You can also compile a RPM for SUSE yourself. A spec file is in -@file{make/out/suse.spec}, see the instructions for building the Red Hat -RPM. - -You must have the following packages: guile tcsh tetex te_latex te_kpath -te_mpost libpng python gpp libgpp gettext autoconf netpbm libnetpb -gs_serv gs_lib gs_fonts guile - -@subsection Slackware - -No precompiled packages for Slackware are available. - -Problems have been reported with Slackware 7.0; apparently, it ships -with a faulty compiler. Do not compile LilyPond with -O2 on this -platform. - -@subsection Mandrake - -Some binaries are available at rpmfind.net. Refer to -@uref{ftp://ftp.rpmfind.net/linux/Mandrake-devel/cooker/contrib/RPMS/}. - - -@subsection Debian GNU/Linux - -A Debian package is also available. You may install it easily by running -@command{apt-get} as root: - -@example - apt-get install lilypond lilypond-doc -@end example - - -Debian's @TeX{} installation is a bit short on memory, you may want to -increase it like this: -@example ---- /etc/texmf/texmf.cnf.dpkg Sun Jan 28 14:12:14 2001 -+++ /etc/texmf/texmf.cnf Fri Apr 27 11:09:35 2001 -@@ -384,8 +384,8 @@ - main_memory.context = 1500000 - main_memory.mpost = 1000000 - main_memory = 263000 % words of inimemory available; also applies to inimf&mp --extra_mem_top = 0 % extra high memory for chars, tokens, etc. --extra_mem_bot = 0 % extra low memory for boxes, glue, breakpoints, etc. -+extra_mem_top = 100000 % extra high memory for chars, tokens, etc. -+extra_mem_bot = 100000 % extra low memory for boxes, glue, breakpoints, etc. - - obj_tab_size.context = 256000 - -@end example - -You could also export @env{extra_mem_top} and @env{extra_mem_bot} as -environment variables if you do not want to or cannot modify -@file{/etc/texmf/texmf.cnf}. - -Alternatively, visit - -@itemize @bullet -@item @uref{http://packages.debian.org/lilypond,http://packages.debian.org/lilypond} -@item @uref{http://people.debian.org/~foka/lilypond/,http://people.debian.org/~foka/lilypond/} -for latest semi-unofficial build of LilyPond 1.4.2 for Debian 2.2 (potato) users. -The official stable Debian 2.2 is stuck with the old LilyPond-1.3.24. -Since LilyPond-1.4 has been released, the older lilypond1.3 Debian -package is now obsolete. -@end itemize - -Please contact Anthony Fok @email{lilypond@@packages.debian.org} for more -information. - -The build scripts are in the subdirectory @file{debian/}; you can -make the .deb by doing, for example: - -@example - $ su - root - # dpkg --purge lilypond lilypond1.3 - # exit - $ tar xzf lilypond-1.4.3.tar.gz - $ cd lilypond-1.4.3 - $ dch -p -v 1.4.3-0.local.1 "Local build." - $ debuild -B - $ su - root - # dpkg -i ../lilypond_1.4.3*.deb - # exit - $ -@end example - -Use command @command{debuild} instead of @command{debuild -B} if you have -a very fast machine and want to build the HTML, PS and DVI documentation -too. - -For compilation on a Debian GNU/Linux system you need these packages, -in addition to the those needed for running: - -@itemize @bullet -@item g++, cpp, libc6-dev, libstdc++<@var{your-libstdc++-version-here}>-dev -@item libguile<@var{your-libguile-version-here}>-dev -@item make, m4, flex, bison -@item gettext -@item groff, texinfo -@item bibtex2html (not in Debian 2.2) -@item tetex-base, tetex-bin, tetex-extra, libkpathsea-dev or tetex-dev -@item dpkg-dev, debhelper, fakeroot -@item gs, netpbm -@item pnmtopng (only in Debian 2.2; pnmtopng has been merged with netpbm - in Debian testing/unstable.) -@end itemize - -Most of these are listed on the @samp{Build-Depends} line in the -@file{debian/control} file. To ensure the creation of the lilypond deb is -trouble-free, we recommend that you first install the following packages -by running \@command{apt-get} as root before building the package: - -For Debian 2.2: - -@example - apt-get install task-debian-devel task-c++-dev \ - python-base libguile6-dev tetex-bin tetex-dev \ - tetex-extra flex bison texinfo groff gs \ - netpbm pnmtopng m4 gettext -@end example - -For Debian in development ("unstable", the future 2.3 or 3.0): - -@example - apt-get install task-debian-devel task-c++-dev \ - python-base libguile9-dev tetex-bin libkpathsea-dev \ - tetex-extra flex bison texinfo bibtex2html groff gs \ - netpbm m4 gettext -@end example - -And, just so that old fonts from previous versions of LilyPond won't -interfere with your build, you may want to do this before the build too: - -@example - dpkg --purge lilypond lilypond1.3 -@end example - - - -@section Problems - -For help and questions use @email{help-gnu-music@@gnu.org} and -@email{gnu-music-discuss@@gnu.org}. Please consult the FAQ before -mailing your problems. If you find bugs, please send bug reports to -@email{bug-gnu-music@@gnu.org}. - -Bugs that are not fault of LilyPond are documented here. - -@unnumberedsubsec NetBSD - -@itemize @bullet -@item The flex precompiled in NetBSD-1.4.2 is broken. -Download flex-2.5.4a, build, install. - -@item The configuration of Gcc (egcs-2.91.60 19981201 (egcs-1.1.1 -release)) does not include @file{/usr/pkg} paths. Configure using: -@example - -CFLAGS='-I /usr/pkg/include' LDFLAGS='-L/usr/pkg/lib' ./configure - -@end example - -@end itemize - -@unnumberedsubsec Solaris: - -@itemize @bullet -@item Sparc64/Solaris 2.6, GNU make-3.77 - -GNU make-3.77 is buggy on this platform, upgrade to 3.78.1 or newer. - -@item Sparc64/Solaris 2.6, ld - -Not yet resolved. -@end itemize - - -@unnumberedsubsec AIX - -@itemize @bullet -@item AIX 4.3 ld - -The following is from the gcc install/SPECIFIC file. -@quotation - Some versions of the AIX binder (linker) can fail with a relocation - overflow severe error when the -bbigtoc option is used to link - GCC-produced object files into an executable that overflows the TOC. - A fix for APAR IX75823 (OVERFLOW DURING LINK WHEN USING GCC AND - -BBIGTOC) is available from IBM Customer Support and from its - 27service.boulder.ibm.com website as PTF U455193. - - Binutils does not support AIX 4.3 (at least through release 2.9). GNU - as and GNU ld will not work properly and one should not configure GCC - to use those GNU utilities. Use the native AIX tools which do - interoperate with GCC. -@end quotation - -add -Wl,-bbigtoc to USER_LDFLAGS, ie: -@example - LDFLAGS='-Wl,-bbigtoc' ./configure -@end example - -@end itemize - - -@bye - diff --git a/Documentation/user/invoking.itexi b/Documentation/user/invoking.itexi index 93649dc3e1..583d9219c2 100644 --- a/Documentation/user/invoking.itexi +++ b/Documentation/user/invoking.itexi @@ -9,9 +9,11 @@ Usage: @example - lilypond [@var{OPTION}@dots{} [@var{FILE}]@dots{} + lilypond [@var{OPTION}@dots{} @var{FILE}@dots{} @end example +To have LilyPond read from stdin, use a dash @code{-} for @var{FILE}. + @unnumberedsec Options @table @code diff --git a/Documentation/windows/installing.texi b/Documentation/windows/installing.texi index 2ea28d7d19..9f2fa8bf9b 100644 --- a/Documentation/windows/installing.texi +++ b/Documentation/windows/installing.texi @@ -90,8 +90,8 @@ and try again. @subsection Trouble For problems and solutions see -@uref{http://lilypond.org/wiki/?TroubleshootingWindows,Troubleshooting -Windows}. +@uref{Troubleshooting Windows,http://lilypond.org/TroubleshootingWindows}. + @subsection Additional software diff --git a/Documentation/windows/lily-gs.sh b/Documentation/windows/lily-gs.sh index 5ae3acbad1..3a559ca47c 100644 --- a/Documentation/windows/lily-gs.sh +++ b/Documentation/windows/lily-gs.sh @@ -3,7 +3,7 @@ gs550="/usr/windows/gstools/gs5.50" -gs650="/usr/windows/gs/gs6.50/bin" +gs650="/usr/windows/gs/gs6.50" gsview26="/usr/windows/gstools/gsview" gsview36="/usr/windows/Ghostgum/GSview" diff --git a/Documentation/windows/lily-miktex.sh b/Documentation/windows/lily-miktex.sh index eb14f16791..c2c1480dd8 100644 --- a/Documentation/windows/lily-miktex.sh +++ b/Documentation/windows/lily-miktex.sh @@ -10,7 +10,7 @@ reg="$(regtool -q get 'HKLM\Software\MiK\MiKTeX\CurrentVersion\MiKTeX\Install Ro b="$(cygpath -u ""$reg"")" # Where we installed it -c="/usr/windows/MiKTeX" +c=texmf="/usr/windows/MiKTeX" for i in "$a" "$b" "$c"; do if [ -d "$i" ]; then diff --git a/INSTALL.txt b/INSTALL.txt index e0d285563e..eb9e403815 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -26,6 +26,7 @@ INSTALL - compiling and installing GNU LilyPond Mandrake Debian GNU/Linux Problems + Debian GNU/Linux unstable gcc-3.0 NetBSD Solaris: AIX @@ -292,11 +293,11 @@ Red Hat Linux `ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/binaries/'. You can also compile them yourself. A spec file is in -`make/out/redhat.spec'. This file is distributed along with the -sources. You can make the rpm by issuing +`make/out/lilypond.redhat.spec'. This file is distributed along with +the sources. You can make the rpm by issuing tar xfz lilypond-x.y.z.tar.gz - rpm -bb lilypond-x.y.z/make/out/redhat.spec + rpm -bb lilypond-x.y.z/make/out/lilypond.redhat.spec rpm -i /usr/src/redhat/RPMS/i386/lilypond-x.y.z For running on a Red Hat system you need these packages: guile, @@ -320,16 +321,17 @@ LinuxPPC Some LinuxPPC RPMS should available from `ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/binaries/'. - A LinuxPPC RPM can be made using the `redhat.spec' file. + A LinuxPPC RPM can be made using the `lilypond.redhat.spec' file. SuSE ---- Some SUSE RPMS should available from -`ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/binaries/'. +`ftp://ftp.lilypond.org/pub/LilyPond/binaries/SuSE'. You can also compile a RPM for SUSE yourself. A spec file is in -`make/out/suse.spec', see the instructions for building the Red Hat RPM. +`make/out/lilypond.suse.spec', see the instructions for building the +Red Hat RPM. You must have the following packages: guile tcsh tetex te_latex te_kpath te_mpost libpng python gpp libgpp gettext autoconf netpbm @@ -468,6 +470,16 @@ your problems. If you find bugs, please send bug reports to Bugs that are not fault of LilyPond are documented here. +Debian GNU/Linux unstable gcc-3.0 +--------------------------------- + + Flex (2.5.4a-11) in unstable does not produce g++-3.0 compliant C++ +code. To compile LilyPond with gcc-3.0 you may do: + CC=gcc-3.0 CXX=g++-3.0 ./configure + make conf=gcc-3.0 -C lily out-gcc-3.0/lexer.cc + patch -p1 < lexer-gcc-3.0.patch + make conf=gcc-3.0 -C lily + NetBSD ------ diff --git a/VERSION b/VERSION index d51f18e842..69c891282e 100644 --- a/VERSION +++ b/VERSION @@ -1,8 +1,8 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=4 -PATCH_LEVEL=3 -MY_PATCH_LEVEL=jcn4 +PATCH_LEVEL=4 +MY_PATCH_LEVEL= # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/aclocal.m4 b/aclocal.m4 index 729eb834d7..a7d59a36f0 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,5 +1,3 @@ -dnl WARNING WARNING WARNING WARNING -dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4 dnl aclocal.m4 -*-shell-script-*- dnl StepMake subroutines for configure.in @@ -65,6 +63,19 @@ AC_DEFUN(AC_STEPMAKE_COMPILE, [ CFLAGS="$CFLAGS $OPTIMIZE" CPPFLAGS=${CPPFLAGS:-""} + + AC_MSG_CHECKING([for IEEE-conformance compiler flags]) + save_cflags="$CFLAGS" + case "$host" in + alpha*-*-*) + dnl should do compile test? + AC_MSG_RESULT(-mieee) + CFLAGS="-mieee $CFLAGS" + ;; + *) + AC_MSG_RESULT([none]) + ;; + esac AC_SUBST(cross_compiling) AC_SUBST(CFLAGS) AC_SUBST(CPPFLAGS) diff --git a/aclocal.m4.orig b/aclocal.m4.orig deleted file mode 100644 index f363f48a1c..0000000000 --- a/aclocal.m4.orig +++ /dev/null @@ -1,1217 +0,0 @@ -dnl WARNING WARNING WARNING WARNING -dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4 -dnl aclocal.m4 -*-shell-script-*- -dnl StepMake subroutines for configure.in - -AC_DEFUN(AC_STEPMAKE_BIBTEX2HTML, [ - AC_CHECK_PROGS(BIBTEX2HTML, bibtex2html bib2html, error) - if test "$BIBTEX2HTML" = "bib2html"; then - BIBTEX2HTML_FLAGS='$< $(@)' - else - BIBTEX2HTML_FLAGS='-o $(@D)/$(*F) $<' - fi - AC_SUBST(BIBTEX2HTML) - AC_SUBST(BIBTEX2HTML_FLAGS) -]) - - -AC_DEFUN(AC_STEPMAKE_COMPILE, [ - # -O is necessary to get inlining - CFLAGS=${CFLAGS:-""} - CXXFLAGS=${CXXFLAGS:-$CFLAGS} - LDFLAGS=${LDFLAGS:-""} - checking_b=yes - optimise_b=yes - profile_b=no - debug_b=yes - - AC_ARG_ENABLE(checking, - [ --enable-checking set runtime checks (assert calls). Default: on], - [checking_b=$enableval] ) - - AC_ARG_ENABLE(debugging, - [ --enable-debugging compile with debugging info. Default: on], - [debug_b=$enableval]) - - AC_ARG_ENABLE(profiling, - [ --enable-profiling compile with gprof support. Default: off], - [profile_b=$enableval]) - - - if test "$checking_b" = no; then - # ugh - AC_DEFINE(NDEBUG) - DEFINES="$DEFINES -DNDEBUG" - fi - - if test "$optimise_b" = yes; then - OPTIMIZE="-O2 -finline-functions" - fi - - - if test $profile_b = yes; then - EXTRA_LIBES="-pg" - OPTIMIZE="$OPTIMIZE -pg" - fi - - if test $debug_b = yes; then - OPTIMIZE="$OPTIMIZE -g" - fi - - - AC_PROG_CC - LD='$(CC)' - AC_SUBST(LD) - - CFLAGS="$CFLAGS $OPTIMIZE" - CPPFLAGS=${CPPFLAGS:-""} - AC_SUBST(cross_compiling) - AC_SUBST(CFLAGS) - AC_SUBST(CPPFLAGS) - AC_SUBST(LDFLAGS) - AC_SUBST(ICFLAGS) - AC_SUBST(ILDFLAGS) - AC_SUBST(DEFINES) - AC_SUBST(EXTRA_LIBES) -]) - -AC_DEFUN(AC_STEPMAKE_CXX, [ - AC_LANG_CPLUSPLUS - AC_PROG_CXX - - AC_CHECK_HEADER(FlexLexer.h, true, - AC_STEPMAKE_WARN(can"\'"t find flex header. Please install Flex headers correctly)) - - CPPFLAGS="$CPPFLAGS $DEFINES" - CXXFLAGS="$CXXFLAGS $OPTIMIZE" - LDFLAGS="$LDFLAGS $EXTRA_LIBES" - - AC_SUBST(CXXFLAGS) - AC_SUBST(CXX) - LD='$(CXX)' - AC_SUBST(LD) -]) - -AC_DEFUN(AC_STEPMAKE_CXXTEMPLATE, [ - AC_CACHE_CHECK([whether explicit instantiation is needed], - lily_cv_need_explicit_instantiation, - AC_TRY_LINK([ - template struct foo { static int baz; }; - template int foo::baz = 1; - ], [ return foo::baz; ], - lily_cv_need_explicit_instantiation=no, - lily_cv_need_explicit_instantiation=yes)) - if test x"$lily_cv_need_explicit_instantiation"x = x"yes"x; then - AC_DEFINE(NEED_EXPLICIT_INSTANTIATION) - fi -]) - -AC_DEFUN(AC_STEPMAKE_DATADIR, [ - if test "$datadir" = "\${prefix}/share"; then - datadir='${prefix}/share/'$package - fi - DIR_DATADIR=${datadir} - presome=${prefix} - if test "$prefix" = "NONE"; then - presome=${ac_default_prefix} - fi - DIR_DATADIR=`echo ${DIR_DATADIR} | sed "s!\\\${prefix}!$presome!"` - - AC_SUBST(datadir) - AC_SUBST(DIR_DATADIR) - - dnl yeah, so fuck me gently with a cactus: this doesnt belong here - dnl Please take the person responsible for inventing shell-scripts out - dnl and shoot him. On behalf of the sane world, thank you. - dnl DIR_SHAREDSTATEDIR="foobar" - dnl AC_SUBST(DIR_SHAREDSTATEDIR) - - AC_DEFINE_UNQUOTED(DIR_DATADIR, "${DIR_DATADIR}") -]) - -AC_DEFUN(AC_STEPMAKE_END, [ - AC_OUTPUT($CONFIGFILE.make:config.make.in) - - # regular in-place build - # test for srcdir_build = yes ? - if test "$builddir" = "."; then - rm -f $srcdir/GNUmakefile - cp $srcdir/GNUmakefile.in $srcdir/GNUmakefile - chmod 444 $srcdir/GNUmakefile - else # --srcdir build - rm -f GNUmakefile - cp $srcdir/make/srcdir.make.in GNUmakefile - chmod 444 GNUmakefile - fi -]) - -AC_DEFUN(AC_STEPMAKE_GXX, [ - # ugh autoconf - # urg, egcs: how to check for egcs >= 1.1? - changequote(<<, >>)dnl - if $CXX --version | egrep '2\.[89]' > /dev/null || - $CXX --version | grep 'egcs' > /dev/null - changequote([, ])dnl - then - true - else - AC_STEPMAKE_WARN(can\'t find g++ 2.8, 2.9 or egcs 1.1) - fi -]) - -AC_DEFUN(AC_STEPMAKE_GUILE, [ - ## First, let's just see if we can find Guile at all. - AC_MSG_CHECKING("for guile-config") - for guile_config in guile-config $target-guile-config $build-guile-config; do - AC_MSG_RESULT("$guile_config") - if ! $guile_config --version > /dev/null 2>&1 ; then - AC_MSG_WARN("cannot execute $guile_config") - AC_MSG_CHECKING("if we are cross compiling") - guile_config=error - else - break - fi - done - if test "$guile_config" = "error"; then - AC_MSG_ERROR("cannot find guile-config; is Guile installed?") - exit 1 - fi - AC_MSG_CHECKING("Guile version") - need_guile_version="1.3.4" - need_guile_version_numeric=100304 - guile_version=`$guile_config --version 2>&1 | awk '{print $NF}'` - guile_version_numeric=`echo $guile_version | awk -F. ' -{if ([$]3) {last = [$]3} -else {last =0}} -{printf "%s%s%s\n",[$]1*100, [$]2*10,last}'` - AC_MSG_RESULT("$guile_version") - if test $guile_version_numeric -lt $need_guile_version_numeric - then - AC_STEPMAKE_WARN("Guile version "$need_guile_version" or newer is needed") - fi - GUILE_FLAGS - AC_PATH_PROG(GUILE, guile, error) - AC_SUBST(GUILE) -]) - -AC_DEFUN(AC_STEPMAKE_INIT, [ - - . $srcdir/VERSION - FULL_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$PATCH_LEVEL - if test x$MY_PATCH_LEVEL != x; then - FULL_VERSION=$FULL_VERSION.$MY_PATCH_LEVEL - fi - - # urg: don't "fix" this: irix doesn't know about [:lower:] and [:upper:] - changequote(<<, >>)dnl - PACKAGE=`echo $PACKAGE_NAME | tr '[a-z]' '[A-Z]'` - package=`echo $PACKAGE_NAME | tr '[A-Z]' '[a-z]'` - changequote([, ])dnl - - # No versioning on directory names of sub-packages - # urg, urg - stepmake=${datadir}/stepmake - presome=${prefix} - if test "$prefix" = "NONE"; then - presome=${ac_default_prefix} - fi - stepmake=`echo ${stepmake} | sed "s!\\\${prefix}!$presome!"` - - # urg, how is this supposed to work? - if test "$program_prefix" = "NONE"; then - program_prefix= - fi - if test "$program_suffix" = "NONE"; then - program_suffix= - fi - - AC_MSG_CHECKING(Package) - if test "x$PACKAGE" = "xSTEPMAKE"; then - AC_MSG_RESULT(Stepmake package!) - - AC_MSG_CHECKING(builddir) - if test "$srcdir" = "."; then - builddir=. - else - absolute_builddir="`pwd`" - package_absolute_builddir="`dirname $absolute_builddir`" - package_srcdir="`dirname $srcdir`" - builddir="`dirname $package_srcdir`/`basename $package_absolute_builddir`/`basename $absolute_builddir`" - fi - AC_MSG_RESULT($builddir) - - (cd stepmake 2>/dev/null || mkdir stepmake) - (cd stepmake; rm -f stepmake; ln -s ../$srcdir/stepmake .) - (cd stepmake; rm -f bin; ln -s ../$srcdir/bin .) - AC_CONFIG_AUX_DIR(bin) - stepmake=stepmake - else - AC_MSG_RESULT($PACKAGE) - - AC_MSG_CHECKING(builddir) - if test "$srcdir" = "."; then - builddir=. - srcdir_build=no - else - absolute_builddir="`pwd`" -# builddir="`dirname $srcdir`/`basename $absolute_builddir`" - builddir="`bash $srcdir/buildscripts/walk.sh \"$srcdir\"`" - srcdir_build=yes - fi - AC_MSG_RESULT($builddir) - if expr "$srcdir" : '/' > /dev/null 2>&1; then - absolute_srcdir=yes - AC_STEPMAKE_WARN(Absolute --srcdir specified: $srcdir) - fi - - AC_MSG_CHECKING(for stepmake) - # Check for installed stepmake - if test -d $stepmake; then - AC_MSG_RESULT($stepmake) - else - if test "$absolute_srcdir" != "yes"; then - stepmake='$(depth)'/$srcdir/stepmake - else - stepmake=$srcdir/stepmake - fi - AC_MSG_RESULT($srcdir/stepmake ($datadir/stepmake not found)) - fi - - AC_CONFIG_AUX_DIR(\ - $HOME/usr/local/share/stepmake/bin\ - $HOME/usr/local/lib/stepmake/bin\ - $HOME/usr/share/stepmake/bin\ - $HOME/usr/lib/stepmake/bin\ - /usr/local/share/stepmake/bin\ - /usr/local/lib/stepmake/bin\ - /usr/share/stepmake/bin\ - /usr/lib/stepmake/bin\ - stepmake/bin\ - $srcdir/stepmake/bin\ - ) - fi - - AC_SUBST(builddir) - AC_SUBST(stepmake) - AC_SUBST(package) - AC_SUBST(PACKAGE) - AC_SUBST(PACKAGE_NAME) - AC_DEFINE_UNQUOTED(PACKAGE, "${PACKAGE_NAME}") - AC_DEFINE_UNQUOTED(TOPLEVEL_VERSION, "${FULL_VERSION}") - - if test "$package_depth" = "" ; then - package_depth="." - else - package_depth="../$package_depth" - fi - export package_depth - AC_SUBST(package_depth) - - AUTOGENERATE="This file was automatically generated by configure" - AC_SUBST(AUTOGENERATE) - - CONFIGSUFFIX= - AC_ARG_ENABLE(config, - [ --enable-config=CONF put settings in config-CONF.make and config-CONF.h; - do \`make conf=CONF' to get output in ./out-CONF], - [CONFIGSUFFIX=-$enableval]) - - CONFIGFILE=config$CONFIGSUFFIX - AC_SUBST(CONFIGSUFFIX) - - AC_CANONICAL_HOST - AC_CHECK_PROGS(MAKE, gmake make, error) - AC_CHECK_PROGS(FIND, find, error) - -dnl system supplied INSTALL is unsafe; use our own install. -dnl AC_PROG_INSTALL -dnl if test "$INSTALL" = "bin/install-sh"; then -dnl export INSTALL="\$\(depth\)/bin/install-sh" -dnl fi - - AC_CHECK_PROGS(TAR, tar, error) - - if test "x`uname`" = "xHP-UX"; then - AC_PATH_PROG(BASH, bash, /bin/sh) - AC_STEPMAKE_WARN(avoiding buggy /bin/sh) - AC_PATH_PROG(SHELL, bash, /bin/ksh) - else - AC_PATH_PROG(BASH, bash, /bin/sh) - SHELL=/bin/sh - AC_SUBST(SHELL) - fi - - - AC_PATH_PROG(PYTHON, ${PYTHON:-python}, -echo no python) - AC_SUBST(PYTHON) - - if test $MAKE != "error" ; then - $MAKE -v 2> /dev/null | grep GNU > /dev/null - if test "$?" = 1 - then - AC_STEPMAKE_WARN(Please install *GNU* make) - fi - fi - - AC_CHECK_SEARCH_RESULT($PYTHON, python, You should install Python) - - if test "x$OSTYPE" = "xcygwin32" || test "x$OSTYPE" = "xWindows_NT"; then - LN=cp # hard link does not work under cygnus-nt - LN_S='cp -r' # symbolic link does not work for native nt - ZIP="zip -r -9" # - program_suffix=.exe - # urg - # ROOTSEP=':' - # DIRSEP='\\' - # PATHSEP=';' - # - # cygwin fixes all these things. - # it seems these were used because of dos-style TEXINPUTS and - # MFINPUTS needed for miktex. - # but this breaks parsing of all other cygwin/unix style paths. - # - # if your (mik)tex breaks, make a: - # /usr/local/bin/tex: - # #!/bin/sh - # TEXINPUTS=`cygpath -pw $TEXINPUTS` /texmf/miktex/bin/tex $* - # - # and - # - # /usr/local/bin/mf: - # #!/bin/sh - # MFINPUTS=`cygpath -pw $MFINPUTS` /texmf/miktex/bin/mf $* - # - # this way, you may have buildscripts/out/lilypond-profile - # 'automatically' sourced from /usr/etc/profile.d/ too. - # - ROOTSEP=':' - DIRSEP='/' - PATHSEP=':' - INSTALL="\$(SHELL) \$(stepdir)/../bin/install-dot-exe.sh -c" - else - ROOTSEP=':' - DIRSEP='/' - PATHSEP=':' - LN=ln - LN_S='ln -s' - ZIP="zip -r -9" - INSTALL="\$(SHELL) \$(stepdir)/../bin/install-sh -c" - fi - AC_SUBST(program_prefix) - AC_SUBST(program_suffix) - AC_SUBST(ZIP) - AC_SUBST(LN) - AC_SUBST(LN_S) - AC_SUBST(INSTALL) - AC_DEFINE_UNQUOTED(DIRSEP, '${DIRSEP}') - AC_DEFINE_UNQUOTED(PATHSEP, '${PATHSEP}') - AC_SUBST(PATHSEP) - AC_SUBST(DIRSEP) - - AC_STEPMAKE_DATADIR -]) - -AC_DEFUN(AC_STEPMAKE_KPATHSEA, [ - - kpathsea_b=yes - AC_ARG_WITH(kpathsea, - [ --with-kpathsea use kpathsea lib. Default: on], - [kpathsea_b=$enableval]) - - if test "$kpathsea_b" = "yes"; then - AC_HAVE_HEADERS(kpathsea/kpathsea.h) - AC_CHECK_LIB(kpathsea, kpse_find_file) - AC_CHECK_FUNCS(kpse_find_file,, AC_ERROR(Cannot find kpathsea functions. You should install kpathsea; see INSTALL.txt. Rerun ./configure --without-kpathsea only if kpathsea is not available for your platform.)) - fi - AC_MSG_CHECKING(whether to use kpathsea) - if test "$kpathsea_b" = yes; then - AC_MSG_RESULT(yes) - KPATHSEA=1 - else - AC_MSG_RESULT(no) - KPATHSEA=0 - fi - - AC_SUBST(KPATHSEA) - AC_DEFINE_UNQUOTED(KPATHSEA, $KPATHSEA) -]) - -AC_DEFUN(AC_STEPMAKE_LEXYACC, [ - # ugh, automake: we want (and check for) bison - AC_PROG_YACC - # ugh, automake: we want (and check for) flex - # AC_PROG_LEX - # urg: automake 1.3: hope this doesn't break 1.2 ac_cv_pro_lex_root hack... - - # AC_DECL_YYTEXT - # ugh, ugh - ac_cv_prog_lex_root=lex.yy - - AC_CHECK_PROGS(BISON, bison, error) - AC_CHECK_PROGS(FLEX, flex, error) - AC_CHECK_SEARCH_RESULT($BISON, bison, Please install Bison, 1.25 or newer) - AC_CHECK_SEARCH_RESULT($FLEX, flex, Please install Flex, 2.5 or newer) - - if test $BISON != "error"; then - bison_version=`$BISON --version | sed 's/^.*version 1.//g'` - if test `echo $bison_version | sed 's/\..*$//g'` -lt 25; then - AC_STEPMAKE_WARN(Your bison is a bit old (1.$bison_version). You might have to install 1.25) - fi - fi - - AC_SUBST(BISON) - AC_SUBST(FLEX) -]) - -AC_DEFUN(AC_STEPMAKE_LIB, [ - AC_CHECK_PROGS(AR, ar, error) - AC_PROG_RANLIB - - AC_SUBST(AR) - AC_SUBST(RANLIB) -]) - -AC_DEFUN(AC_STEPMAKE_LIBTOOL, [ - # libtool.info ... - # **Never** try to set library version numbers so that they correspond - # to the release number of your package. This is an abuse that only - # fosters misunderstanding of the purpose of library versions. - - REVISION=$PATCH_LEVEL - # CURRENT=$MINOR_VERSION - CURRENT=`expr $MINOR_VERSION + 1` - # AGE=$(expr $MAJOR_VERSION + 1) - AGE=$MAJOR_VERSION - AC_SUBST(CURRENT) - AC_SUBST(REVISION) - AC_SUBST(AGE) -]) - -AC_DEFUN(AC_STEPMAKE_LOCALE, [ - lang=English - ALL_LINGUAS="en nl" - - # with/enable ?? - AC_ARG_WITH(localedir, - [ --with-localedir=LOCALE use LOCALE as locale dir. Default: - PREFIX/share/locale ], - localedir=$with_localedir, - localedir='${prefix}/share/locale') - - AC_ARG_WITH(lang, - [ --with-lang=LANG use LANG as language to emit messages], - language=$with_lang, - language=English) - - AC_MSG_CHECKING(language) - case "$language" in - En* | en* | Am* | am* | US* | us*) - lang=English;; - NL | nl | Du* | du* | Ned* | ned*) - lang=Dutch;; - "") - lang=English;; - *) - lang=unknown;; - esac - AC_MSG_RESULT($lang) - - if test "$lang" = "unknown" ; then - AC_STEPMAKE_WARN($language not supported; available are: $ALL_LINGUAS) - fi - -]) - -AC_DEFUN(AC_STEPMAKE_GETTEXT, [ - DIR_LOCALEDIR=${localedir} - presome=${prefix} - if test "$prefix" = "NONE"; then - presome=${ac_default_prefix} - fi - DIR_LOCALEDIR=`echo ${DIR_LOCALEDIR} | sed "s!\\\${prefix}!$presome!"` - AC_SUBST(localedir) - AC_SUBST(DIR_LOCALEDIR) - AC_DEFINE_UNQUOTED(DIR_LOCALEDIR, "${DIR_LOCALEDIR}") - - AC_CHECK_LIB(intl, gettext) - AC_CHECK_FUNCS(gettext) -]) - -AC_DEFUN(AC_STEPMAKE_MAKEINFO, [ - AC_CHECK_PROGS(MAKEINFO, makeinfo, error) - if test "$MAKEINFO" != "error"; then - AC_MSG_CHECKING(whether makeinfo can split html by @node) - mkdir -p out - makeinfo --html --output=out/split < /dev/null 2>&1 - if test -f mfput.tfm; then - break; - fi - done - AC_MSG_RESULT($MFMODE) - - AC_MSG_CHECKING(for mfplain.mp) - # - # For now let people define these in their environments - # - : ${MFPLAIN_MP=`kpsewhich mp mfplain.mp`} - AC_MSG_RESULT($MFPLAIN_MP) - - AC_MSG_CHECKING(for inimetapost flags) - if test ${INIMETAPOST} = "inimp" ; then - : ${INIMETAPOST_FLAGS=''} - else - : ${INIMETAPOST_FLAGS='-interaction=nonstopmode'} - fi - AC_MSG_RESULT($INIMETAPOST_FLAGS) - - rm -f mfput.* - - AC_SUBST(METAFONT) - AC_SUBST(METAPOST) - AC_SUBST(MFMODE) - AC_SUBST(INIMETAFONT) - AC_SUBST(INIMETAPOST) - AC_SUBST(MFPLAIN_MP) - AC_SUBST(INIMETAPOST_FLAGS) -]) - -AC_DEFUN(AC_STEPMAKE_WARN, [ - AC_MSG_WARN($1) - warn_b=yes -]) - -AC_DEFUN(AC_STEPMAKE_YODL, [ - if test "x$YODL" = "x"; then - AC_CHECK_PROGS(STRIPROFF, striproff, -echo no striproff) - AC_CHECK_PROGS(YODL, yodl, -echo no yodl) - AC_CHECK_PROGS(YODL2HTML, yodl2html, -echo no yodl) - AC_CHECK_PROGS(YODL2LATEX, yodl2latex, ) - AC_CHECK_PROGS(YODL2MAN, yodl2man, -echo no yodl) - AC_CHECK_PROGS(YODL2MSLESS, yodl2msless, -echo no yodl) - AC_CHECK_PROGS(YODL2TEXINFO, yodl2texinfo, -echo no yodl) - AC_CHECK_PROGS(YODL2TXT, yodl2txt, -echo no yodl) - YODL2LESS_DIR='$(bindir)/' - else - AC_SUBST(STRIPROFF) - AC_SUBST(YODL) - AC_SUBST(YODL2HTML) - AC_SUBST(YODL2LATEX) - AC_SUBST(YODL2LESS_DIR) - AC_SUBST(YODL2MAN) - AC_SUBST(YODL2MSLESS) - AC_SUBST(YODL2TEXINFO) - AC_SUBST(YODL2TXT) - export STRIPROFF YODL YODL2HTML YODL2LATEX YODL2MAN YODL2MSLESS YODL2TEXINFO YODL2TXT - fi - if test "x$YODL" = "-echo no yodl"; then - AC_STEPMAKE_WARN(Did not find YODL (Yodl is Yet Oneother Document Language, see http://www.cs.uu.nl/~hanwen/yodl)) - fi -]) - -dnl should cache result. -dnl should look in $prefix first. -dnl should probably assume TDS - -AC_DEFUN(AC_TEX_PREFIX, [ - - - AC_MSG_CHECKING(TeX/MF root dir directory) - - find_root_prefix="$prefix" - - - test "x$find_root_prefix" = xNONE && find_root_prefix="$ac_default_prefix" - find_texpostfix=""; - for postfix in "/lib/tex/" "/lib/texmf" "/lib" "/tex" "/texmf"; do - find_texprefix="$find_root_prefix$postfix" - if test -d $find_texprefix; then - find_texpostfix=$postfix - break; - fi - done - - if test "x$find_texpostfix" = x; then - find_texpostfix='/lib/texmf/tex' - AC_STEPMAKE_WARN(Cannot determine the TeX-directory. Please use --enable-tex-prefix) - fi - - find_texprefix="$find_root_prefix/$find_texpostfix" - - # only assign if variablename not empty - if test x != "x[$]$1"; then - $1='${prefix}'/"$find_texpostfix" - fi - AC_MSG_RESULT($find_texprefix) - -]) - - -# find a directory inside a prefix, -# $1 the prefix (expanded version) -# $2 variable to assign -# $3 the directory name -# $4 description -AC_DEFUN(AC_FIND_DIR_IN_PREFIX, [ - - AC_MSG_CHECKING($4 directory) - find_dirdir=`(cd $1; - $FIND ./ -type d -a -name $3 -print |sort|head -1|sed 's#^\./##')` - - - if test "x$find_dirdir" = x; then - find_dirdir="/$3"; - AC_STEPMAKE_WARN(Cannot determine $4 subdirectory. Please set from command-line) - true - fi - $2=$find_dirdir - AC_MSG_RESULT($1/$find_dirdir) -]) - -# ugh. this is hopeless -AC_DEFUN(AC_KPSE_TEX_DIR, [ - kpse_paths=`(kpsepath -n latex tex; kpsepath -n tex tex) | sed 's/:/ /g' | tr ' ' '\012' |sort | uniq -d` - kpse_syspaths=`echo $kpse_paths | grep '!'| sed 's/!//g'` - echo $kpse_paths - if test -w "$kpse_syspaths"; - then - dir=`echo $kpse_syspaths | head -1` - else - dir=`echo $kpse_paths | grep -v '!'| head -1` - fi - if test "$prefix" = "NONE"; then - local_prefix=$ac_default_prefix - local_prefix_quote='${prefix}' - - else - local_prefix=$prefix - local_prefix_quote=$prefix - fi - echo $local_prefix_quote = $local_prefix - echo $dir - echo $dir | sed 's!'$local_prefix'!\$local_prefix_quote!g' -]) - -AC_DEFUN(AC_TEX_SUBDIR, [ -dnl AC_REQUIRE([AC_TEX_PREFIX]) - AC_FIND_DIR_IN_PREFIX($find_texprefix, $1, tex,TeX input) - $1="$TEXPREFIX/$$1" -]) - -AC_DEFUN(AC_MF_SUBDIR, [ -dnl AC_REQUIRE([AC_TEX_PREFIX]) - AC_FIND_DIR_IN_PREFIX($find_texprefix, $1, source, MF input) - $1="$TEXPREFIX/$$1" -]) - -AC_DEFUN(AC_CHECK_SEARCH_RESULT, [ - result="`echo \"$1\" | grep echo`" - if test "x$1" = "xerror" -o "x$result" != "x"; then - AC_STEPMAKE_WARN(can\'t find $2. $3) - fi -]) - -dnl GUILE_FLAGS --- set flags for compiling and linking with Guile -dnl -dnl This macro runs the `guile-config' script, installed with Guile, -dnl to find out where Guile's header files and libraries are -dnl installed. It sets two variables, marked for substitution, as -dnl by AC_SUBST. -dnl -dnl GUILE_CFLAGS --- flags to pass to a C or C++ compiler to build -dnl code that uses Guile header files. This is almost -dnl always just a -I flag. -dnl -dnl GUILE_LDFLAGS --- flags to pass to the linker to link a -dnl program against Guile. This includes `-lguile' for -dnl the Guile library itself, any libraries that Guile -dnl itself requires (like -lqthreads), and so on. It may -dnl also include a -L flag to tell the compiler where to -dnl find the libraries. - -AC_DEFUN([GUILE_FLAGS],[ -## The GUILE_FLAGS macro. - AC_MSG_CHECKING(for Guile) - if ! $guile_config link > /dev/null ; then - AC_MSG_RESULT("cannot execute $guile_config") - AC_MSG_ERROR("cannot find guile-config; is Guile installed?") - exit 1 - fi - GUILE_CFLAGS="`$guile_config compile`" - GUILE_LDFLAGS="`$guile_config link`" - AC_SUBST(GUILE_CFLAGS) - AC_SUBST(GUILE_LDFLAGS) - AC_MSG_RESULT(yes) -]) - - -# Configure paths for GTK+ -# Owen Taylor 97-11-3 - -dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) -dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS -dnl -AC_DEFUN(AM_PATH_GTK, -[dnl -dnl Get the cflags and libraries from the gtk-config script -dnl - AC_PATH_PROG(GTK_CONFIG, gtk-config, no) - min_gtk_version=ifelse([$1], ,1.1.1,$1) - AC_MSG_CHECKING(for GTK - version >= $min_gtk_version) - no_gtk="" - if test "$GTK_CONFIG" != "no" ; then - GTK_CFLAGS=`$GTK_CONFIG --cflags` - GTK_LIBS=`$GTK_CONFIG --libs` - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - ac_save_CXXFLAGS="$CXXFLAGS" - CFLAGS="$CFLAGS $GTK_CFLAGS" - CXXFLAGS="$CXXFLAGS $GTK_CFLAGS" - LIBS="$LIBS $GTK_LIBS" -dnl -dnl Now check if the installed GTK is sufficiently new. (Also sanity -dnl checks the results of gtk-config to some extent) -dnl - AC_TRY_RUN([ -#include -#include - -int -main () -{ - int major, minor, micro; - - if (sscanf("$min_gtk_version", "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_gtk_version"); - exit(1); - } - - return !((gtk_major_version > major) || - ((gtk_major_version == major) && (gtk_minor_version > minor)) || - ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))); -} -],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - CXXFLAGS="$ac_save_CXXFLAGS" - LIBS="$ac_save_LIBS" - else - no_gtk=yes - fi - if test "x$no_gtk" = x ; then - AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - GTK_CFLAGS="" - GTK_LIBS="" - ifelse([$3], , :, [$3]) - fi - CXXFLAGS="$CXXFLAGS $GTK_CFLAGS" - AC_SUBST(CXXFLAGS) - AC_SUBST(GTK_CFLAGS) - AC_SUBST(GTK_LIBS) -]) - - -# Configure paths for GTK-- -# Erik Andersen 30 May 1998 -# Modified by Tero Pulkkinen (added the compiler checks... I hope they work..) - -dnl Test for GTK__, and define GTK___CFLAGS and GTK___LIBS -dnl to be used as follows: -dnl AM_PATH_GTKMM([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) -dnl - -dnl Get the cflags and libraries from the gtkmm-config script -dnl -AC_ARG_WITH(gtkmm-prefix,[ --with-gtkmm-prefix=PREFIX - Prefix where GTK-- is installed (optional)], - gtkmm_config_prefix="$withval", gtkmm_config_prefix="") -AC_ARG_WITH(gtkmm-exec-prefix,[ --with-gtkmm-exec-prefix=PREFIX - Exec prefix where GTK-- is installed (optional)], - gtkmm_config_exec_prefix="$withval", gtkmm_config_exec_prefix="") -AC_ARG_ENABLE(gtkmmtest, [ --disable-gtkmmtest Do not try to compile and run a test GTK-- program], - , enable_gtkmmtest=yes) - - if test x$gtkmm_config_exec_prefix != x ; then - gtkmm_config_args="$gtkmm_config_args --exec-prefix=$gtkmm_config_exec_prefix" - if test x${GTKMM_CONFIG+set} != xset ; then - GTKMM_CONFIG=$gtkmm_config_exec_prefix/bin/gtkmm-config - fi - fi - if test x$gtkmm_config_prefix != x ; then - gtkmm_config_args="$gtkmm_config_args --prefix=$gtkmm_config_prefix" - if test x${GTKMM_CONFIG+set} != xset ; then - GTKMM_CONFIG=$gtkmm_config_prefix/bin/gtkmm-config - fi - fi - - -AC_DEFUN(AM_PATH_GTKMM, -[dnl - -dnl -dnl Check if the installed GTK-- is sufficiently new. -dnl - AC_PATH_PROG(GTKMM_CONFIG, gtkmm-config, no) - min_gtkmm_version=ifelse([$1], ,0.9.14,$1) - - AC_MSG_CHECKING(for GTK-- - version >= $min_gtkmm_version) - no_gtkmm="" - if test "$GTKMM_CONFIG" = "no" ; then - no_gtkmm=yes - else - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - - GTK___CFLAGS=`$GTKMM_CONFIG $gtkmm_config_args --cflags` - GTK___LIBS=`$GTKMM_CONFIG $gtkmm_config_args --libs` - gtkmm_config_major_version=`$GTKMM_CONFIG $gtkmm_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - gtkmm_config_minor_version=`$GTKMM_CONFIG $gtkmm_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - gtkmm_config_micro_version=`$GTKMM_CONFIG $gtkmm_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_gtkmmtest" = "xyes" ; then - ac_save_CXXFLAGS="$CXXFLAGS" - ac_save_LIBS="$LIBS" - CXXFLAGS="$CXXFLAGS $GTK___CFLAGS" - LIBS="$LIBS $GTK___LIBS" -dnl -dnl Now check if the installed GTK-- is sufficiently new. (Also sanity -dnl checks the results of gtkmm-config to some extent -dnl - rm -f conf.gtkmmtest - AC_TRY_RUN([ -#include -#include -#include - -int -main () -{ - int major, minor, micro; - char *tmp_version; - - system ("touch conf.gtkmmtest"); - - /* HP/UX 0 (%@#!) writes to sscanf strings */ - tmp_version = g_strdup("$min_gtkmm_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_gtkmm_version"); - exit(1); - } - - if ((gtkmm_major_version != $gtkmm_config_major_version) || - (gtkmm_minor_version != $gtkmm_config_minor_version) || - (gtkmm_micro_version != $gtkmm_config_micro_version)) - { - printf("\n*** 'gtkmm-config --version' returned %d.%d.%d, but GTK-- (%d.%d.%d)\n", - $gtkmm_config_major_version, $gtkmm_config_minor_version, $gtkmm_config_micro_version, - gtkmm_major_version, gtkmm_minor_version, gtkmm_micro_version); - printf ("*** was found! If gtkmm-config was correct, then it is best\n"); - printf ("*** to remove the old version of GTK--. You may also be able to fix the error\n"); - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); - printf("*** required on your system.\n"); - printf("*** If gtkmm-config was wrong, set the environment variable GTKMM_CONFIG\n"); - printf("*** to point to the correct copy of gtkmm-config, and remove the file config.cache\n"); - printf("*** before re-running configure\n"); - } -/* GTK-- does not have the GTKMM_*_VERSION constants */ -/* - else if ((gtkmm_major_version != GTKMM_MAJOR_VERSION) || - (gtkmm_minor_version != GTKMM_MINOR_VERSION) || - (gtkmm_micro_version != GTKMM_MICRO_VERSION)) - { - printf("*** GTK-- header files (version %d.%d.%d) do not match\n", - GTKMM_MAJOR_VERSION, GTKMM_MINOR_VERSION, GTKMM_MICRO_VERSION); - printf("*** library (version %d.%d.%d)\n", - gtkmm_major_version, gtkmm_minor_version, gtkmm_micro_version); - } -*/ - else - { - if ((gtkmm_major_version > major) || - ((gtkmm_major_version == major) && (gtkmm_minor_version > minor)) || - ((gtkmm_major_version == major) && (gtkmm_minor_version == minor) && (gtkmm_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** An old version of GTK-- (%d.%d.%d) was found.\n", - gtkmm_major_version, gtkmm_minor_version, gtkmm_micro_version); - printf("*** You need a version of GTK-- newer than %d.%d.%d. The latest version of\n", - major, minor, micro); - printf("*** GTK-- is always available from ftp://ftp.gtk.org.\n"); - printf("***\n"); - printf("*** If you have already installed a sufficiently new version, this error\n"); - printf("*** probably means that the wrong copy of the gtkmm-config shell script is\n"); - printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of GTK--, but you can also set the GTKMM_CONFIG environment to point to the\n"); - printf("*** correct copy of gtkmm-config. (In this case, you will have to\n"); - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); - printf("*** so that the correct libraries are found at run-time))\n"); - } - } - return 1; -} -],, no_gtkmm=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CXXFLAGS="$ac_save_CXXFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_gtkmm" = x ; then - AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - if test "$GTKMM_CONFIG" = "no" ; then - echo "*** The gtkmm-config script installed by GTK-- could not be found" - echo "*** If GTK-- was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the GTK_CONFIG environment variable to the" - echo "*** full path to gtk-config." - echo "*** The gtkmm-config script was not available in GTK-- versions" - echo "*** prior to 0.9.12. Perhaps you need to update your installed" - echo "*** version to 0.9.12 or newer" - else - if test -f conf.gtkmmtest ; then - : - else - echo "*** Could not run GTK-- test program, checking why..." - CXXFLAGS="$CFLAGS $GTKMM_CXXFLAGS" - LIBS="$LIBS $GTK___LIBS" - AC_TRY_LINK([ -#include -#include -], [ return ((gtkmm_major_version) || (gtkmm_minor_version) || (gtkmm_micro_version)); ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GTK-- or finding the wrong" - echo "*** version of GTK--. If it is not finding GTK--, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GTK-- was incorrectly installed" - echo "*** or that you have moved GTK-- since it was installed. In the latter case, you" - echo "*** may want to edit the gtkmm-config script: $GTKMM_CONFIG" ]) - CXXFLAGS="$ac_save_CXXFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - GTK___CFLAGS="" - GTK__LIBS="" - ifelse([$3], , :, [$3]) - AC_LANG_RESTORE - fi - AC_SUBST(GTK___CFLAGS) - AC_SUBST(GTK___LIBS) - rm -f conf.gtkmmtest -]) - -# Configure paths for GTK--DRAW -# Derek Quinn Wyatt 98-08-21 (adapted from Jan Nieuwenhuizen's code) - -dnl AM_PATH_GTK__DRAW([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) -dnl Test for GTK--DRAW, and define GTK___CFLAGS and GTK___LIBS -dnl -AC_DEFUN(AM_PATH_GTK__DRAW, -[dnl -dnl Get the cflags and libraries from the gtk__-config script -dnl - AC_PATH_PROG(GTKMM_CONFIG, gtkmm-config, no) - min_gtk___version=ifelse([$1], ,0.0.5,$1) - AC_MSG_CHECKING(for GTK--DRAW - version >= $min_gtk___version) - no_gtk__="" - if test "$GTKMM_CONFIG" != "no" ; then - GTK___CFLAGS=`$GTKMM_CONFIG --cflags` - GTK___LIBS=`$GTKMM_CONFIG --libs` - GTK___DLIBS="$GTK___LIBS -lgtkmmdraw" - GTK___LIBS="$GTK___DLIBS" - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - ac_save_CXXFLAGS="$CXXFLAGS" - CFLAGS="$CFLAGS $GTK___CFLAGS" - CXXFLAGS="$CXXFLAGS $GTK___CFLAGS" - LIBS="$LIBS $GTK___LIBS" -dnl -dnl Now check if the installed GTK__ is sufficiently new. (Also sanity -dnl checks the results of gtk__-config to some extent) -dnl - AC_TRY_RUN([ -#include -#include - -int -main () -{ - // urg - return 0; -} -],, no_gtk__=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - CXXFLAGS="$ac_save_CXXFLAGS" - LIBS="$ac_save_LIBS" - else - no_gtk__=yes - fi - if test "x$no_gtk__" = x ; then - AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - GTK___CFLAGS="" - GTK___LIBS="" - ifelse([$3], , :, [$3]) - fi - CXXFLAGS="$CXXFLAGS $GTK___CFLAGS" - AC_SUBST(CXXFLAGS) - AC_SUBST(GTK___CFLAGS) - AC_SUBST(GTK___LIBS) -]) diff --git a/configure b/configure index 67fb475b0d..41c09323d3 100755 --- a/configure +++ b/configure @@ -796,10 +796,11 @@ EOF # Check whether --enable-config or --disable-config was given. if test "${enable_config+set}" = set; then enableval="$enable_config" - CONFIGSUFFIX=-$enableval + CONFIGURATION=$enableval fi + test -n "$CONFIGURATION" && CONFIGSUFFIX="-$CONFIGURATION" CONFIGFILE=config$CONFIGSUFFIX @@ -810,7 +811,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:814: checking host system type" >&5 +echo "configure:815: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -835,7 +836,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:839: checking for $ac_word" >&5 +echo "configure:840: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MAKE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -870,7 +871,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:874: checking for $ac_word" >&5 +echo "configure:875: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_FIND'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -907,7 +908,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:911: checking for $ac_word" >&5 +echo "configure:912: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_TAR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -942,7 +943,7 @@ test -n "$TAR" || TAR="error" # Extract the first word of "bash", so it can be a program name with args. set dummy bash; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:946: checking for $ac_word" >&5 +echo "configure:947: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_BASH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -982,7 +983,7 @@ fi # Extract the first word of "bash", so it can be a program name with args. set dummy bash; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:986: checking for $ac_word" >&5 +echo "configure:987: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_SHELL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1019,7 +1020,7 @@ fi # Extract the first word of "bash", so it can be a program name with args. set dummy bash; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1023: checking for $ac_word" >&5 +echo "configure:1024: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_BASH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1060,7 +1061,7 @@ fi # Extract the first word of "${PYTHON:-python}", so it can be a program name with args. set dummy ${PYTHON:-python}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1064: checking for $ac_word" >&5 +echo "configure:1065: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1261,7 +1262,7 @@ EOF # 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:1265: checking for $ac_word" >&5 +echo "configure:1266: 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 @@ -1291,7 +1292,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:1295: checking for $ac_word" >&5 +echo "configure:1296: 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 @@ -1342,7 +1343,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:1346: checking for $ac_word" >&5 +echo "configure:1347: 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 @@ -1374,7 +1375,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1378: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1379: 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. @@ -1385,12 +1386,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1389 "configure" +#line 1390 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1395: \"$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 @@ -1416,12 +1417,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:1420: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1421: 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:1425: checking whether we are using GNU C" >&5 +echo "configure:1426: 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 @@ -1430,7 +1431,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1434: \"$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:1435: \"$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 @@ -1449,7 +1450,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:1453: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1454: 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 @@ -1485,6 +1486,19 @@ fi CFLAGS="$CFLAGS $OPTIMIZE" CPPFLAGS=${CPPFLAGS:-""} + + echo $ac_n "checking for IEEE-conformance compiler flags""... $ac_c" 1>&6 +echo "configure:1492: checking for IEEE-conformance compiler flags" >&5 + save_cflags="$CFLAGS" + case "$host" in + alpha*-*-*) + echo "$ac_t""-mieee" 1>&6 + CFLAGS="-mieee $CFLAGS" + ;; + *) + echo "$ac_t""none" 1>&6 + ;; + esac @@ -1496,7 +1510,7 @@ fi # AC_HAVE_HEADERS(limits.h malloc.h string.h unistd.h values.h) echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1500: checking how to run the C preprocessor" >&5 +echo "configure:1514: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1511,13 +1525,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:1521: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1535: \"$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 : @@ -1528,13 +1542,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:1538: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1552: \"$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 : @@ -1545,13 +1559,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:1555: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1569: \"$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 : @@ -1579,17 +1593,17 @@ for ac_hdr in assert.h sys/stat.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1583: checking for $ac_hdr" >&5 +echo "configure:1597: 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:1593: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1607: \"$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* @@ -1616,12 +1630,12 @@ fi done echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6 -echo "configure:1620: checking whether stat file-mode macros are broken" >&5 +echo "configure:1634: checking whether stat file-mode macros are broken" >&5 if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1679,7 +1693,7 @@ EOF echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:1683: checking how to run the C++ preprocessor" >&5 +echo "configure:1697: checking how to run the C++ preprocessor" >&5 if test -z "$CXXCPP"; then if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1692,12 +1706,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1701: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1715: \"$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 : @@ -1734,7 +1748,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1738: checking for $ac_word" >&5 +echo "configure:1752: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1766,7 +1780,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1770: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:1784: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1777,12 +1791,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 1781 "configure" +#line 1795 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:1786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1808,12 +1822,12 @@ if test $ac_cv_prog_cxx_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 ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1812: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1826: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1817: checking whether we are using GNU C++" >&5 +echo "configure:1831: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1822,7 +1836,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1826: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1840: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -1841,7 +1855,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}" ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:1845: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1859: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1875,17 +1889,17 @@ fi ac_safe=`echo "FlexLexer.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for FlexLexer.h""... $ac_c" 1>&6 -echo "configure:1879: checking for FlexLexer.h" >&5 +echo "configure:1893: checking for FlexLexer.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:1889: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1903: \"$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* @@ -1921,10 +1935,14 @@ fi - # ugh autoconf - # urg, egcs: how to check for egcs >= 1.1? - if $CXX --version | egrep '2\.[89]' > /dev/null || - $CXX --version | grep 'egcs' > /dev/null + echo $ac_n "checking "g++ version"""... $ac_c" 1>&6 +echo "configure:1940: checking "g++ version"" >&5 + cxx_version=`$CXX --version` + echo "$ac_t"""$cxx_version"" 1>&6 + # urg, egcs: how to check for egcs >= 1.1? + if expr "$cxx_version" : '.*2\.[89]' > /dev/null || + expr "$cxx_version" : '.*egcs' > /dev/null || + expr "$cxx_version" : '3\.0' > /dev/null then true else @@ -1936,12 +1954,12 @@ fi echo $ac_n "checking whether explicit instantiation is needed""... $ac_c" 1>&6 -echo "configure:1940: checking whether explicit instantiation is needed" >&5 +echo "configure:1958: checking whether explicit instantiation is needed" >&5 if eval "test \"`echo '$''{'lily_cv_need_explicit_instantiation'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < struct foo { static int baz; }; @@ -1951,7 +1969,7 @@ int main() { return foo::baz; ; return 0; } EOF -if { (eval echo configure:1955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lily_cv_need_explicit_instantiation=no else @@ -1978,7 +1996,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1982: checking for $ac_word" >&5 +echo "configure:2000: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2021,7 +2039,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2025: checking for $ac_word" >&5 +echo "configure:2043: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_BISON'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2056,7 +2074,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2060: checking for $ac_word" >&5 +echo "configure:2078: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_FLEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2124,7 +2142,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2128: checking for $ac_word" >&5 +echo "configure:2146: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2157,7 +2175,7 @@ test -n "$AR" || AR="error" # 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:2161: checking for $ac_word" >&5 +echo "configure:2179: 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 @@ -2212,7 +2230,7 @@ fi echo $ac_n "checking language""... $ac_c" 1>&6 -echo "configure:2216: checking language" >&5 +echo "configure:2234: checking language" >&5 case "$language" in En* | en* | Am* | am* | US* | us*) lang=English;; @@ -2248,7 +2266,7 @@ EOF echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6 -echo "configure:2252: checking for gettext in -lintl" >&5 +echo "configure:2270: 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 @@ -2256,7 +2274,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:2292: \"$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 @@ -2300,12 +2318,12 @@ fi for ac_func in gettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2304: checking for $ac_func" >&5 +echo "configure:2322: 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:2353: \"$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 @@ -2363,7 +2381,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2367: checking for $ac_word" >&5 +echo "configure:2385: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2394,7 +2412,7 @@ done test -n "$MSGFMT" || MSGFMT="\$(SHELL) \$(step-bindir)/fake-msgfmt.sh " echo $ac_n "checking whether msgfmt accepts -o""... $ac_c" 1>&6 -echo "configure:2398: checking whether msgfmt accepts -o" >&5 +echo "configure:2416: checking whether msgfmt accepts -o" >&5 msgfmt_output="`msgfmt -o bla 2>&1 | grep usage`" if test "$msgfmt_output" = ""; then echo "$ac_t""yes" 1>&6 @@ -2422,7 +2440,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2426: checking for $ac_word" >&5 +echo "configure:2444: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_METAFONT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2458,7 +2476,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2462: checking for $ac_word" >&5 +echo "configure:2480: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MFONT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2496,7 +2514,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2500: checking for $ac_word" >&5 +echo "configure:2518: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_METAPOST'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2532,7 +2550,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2536: checking for $ac_word" >&5 +echo "configure:2554: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MPOST'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2571,7 +2589,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2575: checking for $ac_word" >&5 +echo "configure:2593: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_INIMETAFONT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2607,7 +2625,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2611: checking for $ac_word" >&5 +echo "configure:2629: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_INIMFONT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2645,7 +2663,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2649: checking for $ac_word" >&5 +echo "configure:2667: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_INIMETAPOST'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2681,7 +2699,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2685: checking for $ac_word" >&5 +echo "configure:2703: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_INIMPOST'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2715,7 +2733,7 @@ test -n "$INIMPOST" || INIMPOST="-echo no inimp or inimpost" fi echo $ac_n "checking for working metafont mode""... $ac_c" 1>&6 -echo "configure:2719: checking for working metafont mode" >&5 +echo "configure:2737: checking for working metafont mode" >&5 modelist='ljfour lj4 lj3 lj2 ljet laserjet' for MFMODE in $modelist; do $METAFONT "\mode:=$MFMODE; mode_setup; end." > /dev/null 2>&1 @@ -2726,7 +2744,7 @@ echo "configure:2719: checking for working metafont mode" >&5 echo "$ac_t""$MFMODE" 1>&6 echo $ac_n "checking for mfplain.mp""... $ac_c" 1>&6 -echo "configure:2730: checking for mfplain.mp" >&5 +echo "configure:2748: checking for mfplain.mp" >&5 # # For now let people define these in their environments # @@ -2734,7 +2752,7 @@ echo "configure:2730: checking for mfplain.mp" >&5 echo "$ac_t""$MFPLAIN_MP" 1>&6 echo $ac_n "checking for inimetapost flags""... $ac_c" 1>&6 -echo "configure:2738: checking for inimetapost flags" >&5 +echo "configure:2756: checking for inimetapost flags" >&5 if test ${INIMETAPOST} = "inimp" ; then : ${INIMETAPOST_FLAGS=''} else @@ -2767,7 +2785,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2771: checking for $ac_word" >&5 +echo "configure:2789: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_KPSEWHICH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2798,7 +2816,7 @@ done test -n "$KPSEWHICH" || KPSEWHICH="no" echo $ac_n "checking for tfm path""... $ac_c" 1>&6 -echo "configure:2802: checking for tfm path" >&5 +echo "configure:2820: checking for tfm path" >&5 TFM_FONTS="cmr msam" @@ -2826,13 +2844,13 @@ echo "configure:2802: checking for tfm path" >&5 ## First, let's just see if we can find Guile at all. echo $ac_n "checking "for guile-config"""... $ac_c" 1>&6 -echo "configure:2830: checking "for guile-config"" >&5 +echo "configure:2848: checking "for guile-config"" >&5 for guile_config in guile-config $target-guile-config $build-guile-config; do echo "$ac_t"""$guile_config"" 1>&6 if ! $guile_config --version > /dev/null 2>&1 ; then echo "configure: warning: "cannot execute $guile_config"" 1>&2 echo $ac_n "checking "if we are cross compiling"""... $ac_c" 1>&6 -echo "configure:2836: checking "if we are cross compiling"" >&5 +echo "configure:2854: checking "if we are cross compiling"" >&5 guile_config=error else break @@ -2843,7 +2861,7 @@ echo "configure:2836: checking "if we are cross compiling"" >&5 exit 1 fi echo $ac_n "checking "Guile version"""... $ac_c" 1>&6 -echo "configure:2847: checking "Guile version"" >&5 +echo "configure:2865: checking "Guile version"" >&5 need_guile_version="1.3.4" need_guile_version_numeric=100304 guile_version=`$guile_config --version 2>&1 | awk '{print $NF}'` @@ -2862,7 +2880,7 @@ else {last =0}} ## The GUILE_FLAGS macro. echo $ac_n "checking for Guile""... $ac_c" 1>&6 -echo "configure:2866: checking for Guile" >&5 +echo "configure:2884: checking for Guile" >&5 if ! $guile_config link > /dev/null ; then echo "$ac_t"""cannot execute $guile_config"" 1>&6 { echo "configure: error: "cannot find guile-config; is Guile installed?"" 1>&2; exit 1; } @@ -2877,7 +2895,7 @@ echo "configure:2866: checking for Guile" >&5 # Extract the first word of "guile", so it can be a program name with args. set dummy guile; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2881: checking for $ac_word" >&5 +echo "configure:2899: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GUILE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2927,17 +2945,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2931: checking for $ac_hdr" >&5 +echo "configure:2949: 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:2941: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2959: \"$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* @@ -2964,7 +2982,7 @@ fi done echo $ac_n "checking for kpse_find_file in -lkpathsea""... $ac_c" 1>&6 -echo "configure:2968: checking for kpse_find_file in -lkpathsea" >&5 +echo "configure:2986: checking for kpse_find_file in -lkpathsea" >&5 ac_lib_var=`echo kpathsea'_'kpse_find_file | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2972,7 +2990,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lkpathsea $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3008: \"$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 @@ -3016,12 +3034,12 @@ fi for ac_func in kpse_find_file do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3020: checking for $ac_func" >&5 +echo "configure:3038: 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:3069: \"$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 @@ -3074,7 +3092,7 @@ done fi echo $ac_n "checking whether to use kpathsea""... $ac_c" 1>&6 -echo "configure:3078: checking whether to use kpathsea" >&5 +echo "configure:3096: checking whether to use kpathsea" >&5 if test "$kpathsea_b" = yes; then echo "$ac_t""yes" 1>&6 KPATHSEA=1 @@ -3095,7 +3113,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3099: checking for $ac_word" >&5 +echo "configure:3117: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_BIBTEX2HTML'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3136,7 +3154,7 @@ test -n "$BIBTEX2HTML" || BIBTEX2HTML="error" echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:3140: checking for 8-bit clean memcmp" >&5 +echo "configure:3158: checking for 8-bit clean memcmp" >&5 if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3144,7 +3162,7 @@ else ac_cv_func_memcmp_clean=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_memcmp_clean=yes else @@ -3175,12 +3193,12 @@ echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6 test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}" echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:3179: checking for vprintf" >&5 +echo "configure:3197: 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:3228: \"$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 @@ -3230,12 +3248,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:3234: checking for _doprnt" >&5 +echo "configure:3252: 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:3283: \"$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 @@ -3288,12 +3306,12 @@ fi for ac_func in memmem snprintf vsnprintf gettext isinf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3292: checking for $ac_func" >&5 +echo "configure:3310: 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:3341: \"$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 @@ -3359,7 +3377,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3363: checking for $ac_word" >&5 +echo "configure:3381: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MAKEINFO'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3391,7 +3409,7 @@ test -n "$MAKEINFO" || MAKEINFO="error" if test "$MAKEINFO" != "error"; then echo $ac_n "checking whether makeinfo can split html by @node""... $ac_c" 1>&6 -echo "configure:3395: checking whether makeinfo can split html by @node" >&5 +echo "configure:3413: checking whether makeinfo can split html by @node" >&5 mkdir -p out makeinfo --html --output=out/split <&6 -echo "configure:3423: checking for $ac_word" >&5 +echo "configure:3441: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3976,12 +3994,14 @@ fi fi +test -n "$CONFIGURATION" && mc=" conf=$CONFIGURATION" || mc="" + cat <get_next_arg (); if (!arg) - usage (); + { + usage (); + /* No FILE arguments is now a usage error */ + exit (2); + } else do { @@ -383,8 +387,6 @@ main_prog (int, char**) output_name_global = save_output_name_global; p++; - - oparser_p_static->get_next_arg (); } while ((arg = oparser_p_static->get_next_arg ())); delete oparser_p_static; oparser_p_static = 0; diff --git a/make/out/lilypond.lsm b/make/out/lilypond.lsm index bdfd4d266e..223d9c39f0 100644 --- a/make/out/lilypond.lsm +++ b/make/out/lilypond.lsm @@ -1,15 +1,15 @@ Begin3 Title: LilyPond -Version: 1.4.3 -Entered-date: 13JUN01 +Version: 1.4.4 +Entered-date: 27JUN01 Description: @BLURB@ Keywords: music notation typesetting midi fonts engraving Author: hanwen@cs.uu.nl (Han-Wen Nienhuys) janneke@gnu.org (Jan Nieuwenhuizen) Maintained-by: hanwen@stack.nl (Han-Wen Nienhuys) Primary-site: sunsite.unc.edu /pub/Linux/apps/sound/convert - 1000k lilypond-1.4.3.tar.gz + 1000k lilypond-1.4.4.tar.gz Original-site: ftp.cs.uu.nl /pub/GNU/LilyPond/development/ - 1000k lilypond-1.4.3.tar.gz + 1000k lilypond-1.4.4.tar.gz Copying-policy: GPL End diff --git a/make/out/lilypond.redhat.spec b/make/out/lilypond.redhat.spec index a49a8b0011..d9044e4aab 100644 --- a/make/out/lilypond.redhat.spec +++ b/make/out/lilypond.redhat.spec @@ -1,11 +1,11 @@ %define info yes Name: lilypond -Version: 1.4.3 +Version: 1.4.4 Release: 1 License: GPL Group: Applications/Publishing -Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.4.3.tar.gz +Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.4.4.tar.gz Summary: Create and print music notation URL: http://www.cs.uu.nl/~hanwen/lilypond BuildRoot: /tmp/lilypond-install diff --git a/make/out/lilypond.suse.spec b/make/out/lilypond.suse.spec index 4cca83ccca..864cd17a94 100644 --- a/make/out/lilypond.suse.spec +++ b/make/out/lilypond.suse.spec @@ -14,11 +14,11 @@ Distribution: SuSE Linux 7.0 (i386) Name: lilypond -Version: 1.4.3 +Version: 1.4.4 Release: 2 Copyright: GPL Group: Applications/Publishing -Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.4.3.tar.gz +Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.4.4.tar.gz # music notation software for.. ? Summary: A program for printing sheet music. URL: http://www.lilypond.org/ diff --git a/po/de.po b/po/de.po index 175daf6528..39ee516b13 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Lilypond 1.2.8\n" -"POT-Creation-Date: 2001-05-18 15:48+0200\n" +"POT-Creation-Date: 2001-06-14 13:22+0200\n" "PO-Revision-Date: 1999-09-18 01:30+0200\n" "Last-Translator: Erwin Dieterich \n" "Language-Team: LANGUAGE \n" @@ -22,7 +22,7 @@ msgstr "" msgid "warning: " msgstr "Warnung: " -#: input.cc:90 ly2dvi.py:205 ly2dvi.py:830 mup2ly.py:98 mup2ly.py:188 +#: input.cc:90 ly2dvi.py:205 ly2dvi.py:804 mup2ly.py:98 mup2ly.py:188 #: update-lily.py:123 update-lily.py:211 warn.cc:9 warn.cc:17 msgid "error: " msgstr "Fehler: " @@ -136,7 +136,7 @@ msgstr "Zeige die Versionsnummer" msgid "show warranty and copyright" msgstr "Zeige Garantie und Urheberrechte" -#: ly2dvi.py:383 ly2dvi.py:604 ly2dvi.py:629 +#: ly2dvi.py:383 ly2dvi.py:578 ly2dvi.py:603 #, fuzzy, c-format msgid "Running %s..." msgstr "Uralt-Bitte: `%s'" @@ -156,23 +156,23 @@ msgstr "" msgid "invalid value: %s" msgstr "Ungültiger Buchstabe `%c'" -#: ly2dvi.py:807 scores.cc:44 +#: ly2dvi.py:781 scores.cc:44 #, fuzzy, c-format msgid "dependencies output to `%s'..." msgstr "Ausgabe auf Papier auf %s..." -#: ly2dvi.py:817 +#: ly2dvi.py:791 #, fuzzy, c-format msgid "%s output to `%s'..." msgstr "MIDI-Ausgabe nach %s..." -#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:819 +#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:793 #: midi-score-parser.cc:24 scores.cc:136 scores.cc:142 #, c-format msgid "can't find file: `%s'" msgstr "Kann Datei `%s' nicht finden" -#: ly2dvi.py:830 +#: ly2dvi.py:804 msgid "no files specified on command line." msgstr "" @@ -493,7 +493,7 @@ msgstr "Unerlaubte Subtraktion: nicht Teil eines Akkords: %s" msgid "invalid inversion pitch: not part of chord: %s" msgstr "Unerlaubter Baßton: gehört nicht zum Akkord: %s" -#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:193 +#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:192 #, fuzzy msgid "unterminated chord tremolo" msgstr "Unbeendeter Bindestrich" @@ -667,8 +667,8 @@ msgstr "Unterdr #. No version number or newline here. It confuses help2man #. #: main.cc:136 -#, c-format -msgid "Usage: %s [OPTION]... [FILE]..." +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... FILE..." msgstr "Benutzung: %s [OPTIONEN] ... [DATEI] ..." #: main.cc:138 @@ -859,7 +859,7 @@ msgstr "" msgid "none of these in my family: `%s'" msgstr "" -#: percent-repeat-engraver.cc:118 +#: percent-repeat-engraver.cc:117 #, fuzzy msgid "Don't know how to handle a percent repeat of this length." msgstr "Weiß nicht, wie ich eine fehlende Tonart behandeln soll" diff --git a/po/fr.po b/po/fr.po index 8c1599e052..6cad31a3d9 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: lilypond 1.3.18\n" -"POT-Creation-Date: 2001-05-18 15:48+0200\n" +"POT-Creation-Date: 2001-06-14 13:22+0200\n" "PO-Revision-Date: 1999-12-28 00:32 +1\n" "Last-Translator: Laurent Martelli \n" "Language-Team: \n" @@ -21,7 +21,7 @@ msgstr "" msgid "warning: " msgstr "avertissement: " -#: input.cc:90 ly2dvi.py:205 ly2dvi.py:830 mup2ly.py:98 mup2ly.py:188 +#: input.cc:90 ly2dvi.py:205 ly2dvi.py:804 mup2ly.py:98 mup2ly.py:188 #: update-lily.py:123 update-lily.py:211 warn.cc:9 warn.cc:17 msgid "error: " msgstr "erreur: " @@ -132,7 +132,7 @@ msgstr "afficher le numro de version" msgid "show warranty and copyright" msgstr "" -#: ly2dvi.py:383 ly2dvi.py:604 ly2dvi.py:629 +#: ly2dvi.py:383 ly2dvi.py:578 ly2dvi.py:603 #, fuzzy, c-format msgid "Running %s..." msgstr "Cration des voix..." @@ -152,23 +152,23 @@ msgstr "" msgid "invalid value: %s" msgstr "caractres illgal: `%c'" -#: ly2dvi.py:807 scores.cc:44 +#: ly2dvi.py:781 scores.cc:44 #, fuzzy, c-format msgid "dependencies output to `%s'..." msgstr "Sortie papier vers %s..." -#: ly2dvi.py:817 +#: ly2dvi.py:791 #, fuzzy, c-format msgid "%s output to `%s'..." msgstr "Sortie de Lily vers %s..." -#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:819 +#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:793 #: midi-score-parser.cc:24 scores.cc:136 scores.cc:142 #, c-format msgid "can't find file: `%s'" msgstr "ne peut pas trouver le fichier: `%s'" -#: ly2dvi.py:830 +#: ly2dvi.py:804 msgid "no files specified on command line." msgstr "" @@ -489,7 +489,7 @@ msgstr "soustraction invalide: ne fait pas partie de l'accord: %s" msgid "invalid inversion pitch: not part of chord: %s" msgstr "renversement invalide: ne fait pas partie de l'accord: %s" -#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:193 +#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:192 msgid "unterminated chord tremolo" msgstr "" @@ -660,8 +660,8 @@ msgstr "" #. No version number or newline here. It confuses help2man #. #: main.cc:136 -#, c-format -msgid "Usage: %s [OPTION]... [FILE]..." +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... FILE..." msgstr "Usage: %s [OPTION]... [FICHIER]..." #: main.cc:138 @@ -833,7 +833,7 @@ msgstr "" msgid "none of these in my family: `%s'" msgstr "" -#: percent-repeat-engraver.cc:118 +#: percent-repeat-engraver.cc:117 #, fuzzy msgid "Don't know how to handle a percent repeat of this length." msgstr "ne sait pas traiter les cls vides" diff --git a/po/it.po b/po/it.po index 5129acac40..0aa67d4b4e 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ #, fuzzy msgid "" msgstr "" -"POT-Creation-Date: 2001-05-18 15:48+0200\n" +"POT-Creation-Date: 2001-06-14 13:22+0200\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Date: 1998-05-30 00:17:12+0200\n" "From: \n" @@ -22,7 +22,7 @@ msgstr "" msgid "warning: " msgstr "attenzione: " -#: input.cc:90 ly2dvi.py:205 ly2dvi.py:830 mup2ly.py:98 mup2ly.py:188 +#: input.cc:90 ly2dvi.py:205 ly2dvi.py:804 mup2ly.py:98 mup2ly.py:188 #: update-lily.py:123 update-lily.py:211 warn.cc:9 warn.cc:17 msgid "error: " msgstr "errore: " @@ -137,7 +137,7 @@ msgstr "" msgid "show warranty and copyright" msgstr " -w, --warranty mostra la garanzia e il copyright\n" -#: ly2dvi.py:383 ly2dvi.py:604 ly2dvi.py:629 +#: ly2dvi.py:383 ly2dvi.py:578 ly2dvi.py:603 #, fuzzy, c-format msgid "Running %s..." msgstr "Genero le voci..." @@ -157,23 +157,23 @@ msgstr "" msgid "invalid value: %s" msgstr "carattere illegale: `%c'" -#: ly2dvi.py:807 scores.cc:44 +#: ly2dvi.py:781 scores.cc:44 #, fuzzy, c-format msgid "dependencies output to `%s'..." msgstr "L'output stampato è inviato a %s..." -#: ly2dvi.py:817 +#: ly2dvi.py:791 #, fuzzy, c-format msgid "%s output to `%s'..." msgstr "L'output MIDI è inviato a %s..." -#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:819 +#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:793 #: midi-score-parser.cc:24 scores.cc:136 scores.cc:142 #, c-format msgid "can't find file: `%s'" msgstr "non trovo il file: `%s'" -#: ly2dvi.py:830 +#: ly2dvi.py:804 msgid "no files specified on command line." msgstr "" @@ -489,7 +489,7 @@ msgstr "" msgid "invalid inversion pitch: not part of chord: %s" msgstr "" -#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:193 +#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:192 #, fuzzy msgid "unterminated chord tremolo" msgstr "beam non terminato" @@ -664,8 +664,8 @@ msgstr "" #. No version number or newline here. It confuses help2man #. #: main.cc:136 -#, c-format -msgid "Usage: %s [OPTION]... [FILE]..." +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... FILE..." msgstr "Uso: %s [OPZIONE]... [FILE]..." #: main.cc:138 @@ -851,7 +851,7 @@ msgstr "" msgid "none of these in my family: `%s'" msgstr "" -#: percent-repeat-engraver.cc:118 +#: percent-repeat-engraver.cc:117 #, fuzzy msgid "Don't know how to handle a percent repeat of this length." msgstr "non so manipolare tasti vuoti" diff --git a/po/ja.po b/po/ja.po index 51a1f80b5b..f652910f64 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: lilypond 1.2.17\n" -"POT-Creation-Date: 2001-05-18 15:48+0200\n" +"POT-Creation-Date: 2001-06-14 13:22+0200\n" "PO-Revision-Date: 2000-03-29 20:50+0900\n" "Last-Translator: Daisuke Yamashita \n" "Language-Team: Japanese \n" @@ -22,7 +22,7 @@ msgstr "" msgid "warning: " msgstr "·Ù¹ð: " -#: input.cc:90 ly2dvi.py:205 ly2dvi.py:830 mup2ly.py:98 mup2ly.py:188 +#: input.cc:90 ly2dvi.py:205 ly2dvi.py:804 mup2ly.py:98 mup2ly.py:188 #: update-lily.py:123 update-lily.py:211 warn.cc:9 warn.cc:17 msgid "error: " msgstr "¥¨¥é¡¼: " @@ -135,7 +135,7 @@ msgstr " msgid "show warranty and copyright" msgstr "ÊݾڤÈÃøºî¸¢¤Ë¤Ä¤¤¤Æɽ¼¨¤¹¤ë" -#: ly2dvi.py:383 ly2dvi.py:604 ly2dvi.py:629 +#: ly2dvi.py:383 ly2dvi.py:578 ly2dvi.py:603 #, fuzzy, c-format msgid "Running %s..." msgstr "Í×µá¤ò¼Î¤Æ¤Þ¤¹: `%s'" @@ -155,23 +155,23 @@ msgstr "" msgid "invalid value: %s" msgstr "̵¸ú¤Êʸ»ú: `%c'" -#: ly2dvi.py:807 scores.cc:44 +#: ly2dvi.py:781 scores.cc:44 #, fuzzy, c-format msgid "dependencies output to `%s'..." msgstr "%s ¤Ø paper ½ÐÎÏ..." -#: ly2dvi.py:817 +#: ly2dvi.py:791 #, fuzzy, c-format msgid "%s output to `%s'..." msgstr "%s ¤Ø¤Î MIDI ½ÐÎÏ" -#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:819 +#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:793 #: midi-score-parser.cc:24 scores.cc:136 scores.cc:142 #, fuzzy, c-format msgid "can't find file: `%s'" msgstr "¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: `%s'" -#: ly2dvi.py:830 +#: ly2dvi.py:804 msgid "no files specified on command line." msgstr "" @@ -491,7 +491,7 @@ msgstr "̵ msgid "invalid inversion pitch: not part of chord: %s" msgstr "̵¸ú¤Êž²ó¥Ô¥Ã¥Á: ¥³¡¼¥É¤Î°ìÉô¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó: %s" -#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:193 +#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:192 #, fuzzy msgid "unterminated chord tremolo" msgstr "½ªÃ¼¤Î¤Ê¤¤¥Ï¥¤¥Õ¥ó" @@ -661,8 +661,8 @@ msgstr "̾ #. No version number or newline here. It confuses help2man #. #: main.cc:136 -#, c-format -msgid "Usage: %s [OPTION]... [FILE]..." +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... FILE..." msgstr "»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó]... [¥Õ¥¡¥¤¥ë]..." #: main.cc:138 @@ -869,7 +869,7 @@ msgstr " msgid "none of these in my family: `%s'" msgstr "¥Õ¥¡¥ß¥ê¤ÎÃæ¤Ë¤¢¤ê¤Þ¤»¤ó" -#: percent-repeat-engraver.cc:118 +#: percent-repeat-engraver.cc:117 #, fuzzy msgid "Don't know how to handle a percent repeat of this length." msgstr "¶õ¤Î¥­¡¼¤Î°·¤¤Êý¤¬È½¤ê¤Þ¤»¤ó" diff --git a/po/lilypond.pot b/po/lilypond.pot index 3ad5bfbb95..d85c3cfe60 100644 --- a/po/lilypond.pot +++ b/po/lilypond.pot @@ -6,13 +6,13 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2001-05-18 15:48+0200\n" +"POT-Creation-Date: 2001-06-14 13:22+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8-bit\n" +"Content-Transfer-Encoding: 8bit\n" #: ly2dvi.py:105 msgid "Generate .dvi with LaTeX for LilyPond" @@ -23,7 +23,7 @@ msgstr "" msgid "warning: " msgstr "" -#: input.cc:90 ly2dvi.py:205 ly2dvi.py:830 mup2ly.py:98 mup2ly.py:188 +#: input.cc:90 ly2dvi.py:205 ly2dvi.py:804 mup2ly.py:98 mup2ly.py:188 #: update-lily.py:123 update-lily.py:211 warn.cc:9 warn.cc:17 msgid "error: " msgstr "" @@ -131,7 +131,7 @@ msgstr "" msgid "show warranty and copyright" msgstr "" -#: ly2dvi.py:383 ly2dvi.py:604 ly2dvi.py:629 +#: ly2dvi.py:383 ly2dvi.py:578 ly2dvi.py:603 #, c-format msgid "Running %s..." msgstr "" @@ -151,23 +151,23 @@ msgstr "" msgid "invalid value: %s" msgstr "" -#: ly2dvi.py:807 scores.cc:44 +#: ly2dvi.py:781 scores.cc:44 #, c-format msgid "dependencies output to `%s'..." msgstr "" -#: ly2dvi.py:817 +#: ly2dvi.py:791 #, c-format msgid "%s output to `%s'..." msgstr "" -#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:819 +#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:793 #: midi-score-parser.cc:24 scores.cc:136 scores.cc:142 #, c-format msgid "can't find file: `%s'" msgstr "" -#: ly2dvi.py:830 +#: ly2dvi.py:804 msgid "no files specified on command line." msgstr "" @@ -477,7 +477,7 @@ msgstr "" msgid "invalid inversion pitch: not part of chord: %s" msgstr "" -#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:193 +#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:192 msgid "unterminated chord tremolo" msgstr "" @@ -639,7 +639,7 @@ msgstr "" #. #: main.cc:136 #, c-format -msgid "Usage: %s [OPTION]... [FILE]..." +msgid "Usage: %s [OPTION]... FILE..." msgstr "" #: main.cc:138 @@ -804,7 +804,7 @@ msgstr "" msgid "none of these in my family: `%s'" msgstr "" -#: percent-repeat-engraver.cc:118 +#: percent-repeat-engraver.cc:117 msgid "Don't know how to handle a percent repeat of this length." msgstr "" diff --git a/po/nl.po b/po/nl.po index 94b175542a..c8d1627e0c 100644 --- a/po/nl.po +++ b/po/nl.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: lilypond 1.4.1\n" -"POT-Creation-Date: 2001-05-18 15:48+0200\n" +"POT-Creation-Date: 2001-06-14 13:22+0200\n" "PO-Revision-Date: 2001-05-09 23:29+0200\n" "Last-Translator: Jan Nieuwenhuizen \n" "Language-Team: Dutch \n" @@ -32,7 +32,7 @@ msgstr "Genereer .dvi met LaTeX voor LilyPond" msgid "warning: " msgstr "waarschuwing: " -#: input.cc:90 ly2dvi.py:205 ly2dvi.py:830 mup2ly.py:98 mup2ly.py:188 +#: input.cc:90 ly2dvi.py:205 ly2dvi.py:804 mup2ly.py:98 mup2ly.py:188 #: update-lily.py:123 update-lily.py:211 warn.cc:9 warn.cc:17 msgid "error: " msgstr "fout: " @@ -142,7 +142,7 @@ msgstr "druk versienummer af" msgid "show warranty and copyright" msgstr "toon garantie en auteursrechten" -#: ly2dvi.py:383 ly2dvi.py:604 ly2dvi.py:629 +#: ly2dvi.py:383 ly2dvi.py:578 ly2dvi.py:603 #, c-format msgid "Running %s..." msgstr "Uitvoeren %s..." @@ -162,23 +162,23 @@ msgstr "geen lilypond uitvoer gevonden voor %s" msgid "invalid value: %s" msgstr "ongeldige waarde: %s" -#: ly2dvi.py:807 scores.cc:44 +#: ly2dvi.py:781 scores.cc:44 #, c-format msgid "dependencies output to `%s'..." msgstr "afhankelijkheden uitvoer naar %s..." -#: ly2dvi.py:817 +#: ly2dvi.py:791 #, c-format msgid "%s output to `%s'..." msgstr "%s uitvoer naar `%s'..." -#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:819 +#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:793 #: midi-score-parser.cc:24 scores.cc:136 scores.cc:142 #, c-format msgid "can't find file: `%s'" msgstr "kan bestand niet vinden: `%s'" -#: ly2dvi.py:830 +#: ly2dvi.py:804 msgid "no files specified on command line." msgstr "geen bestanden gespecificeerd op de commandoregel." @@ -490,7 +490,7 @@ msgstr "ongeldige aftrek: maakt geen deel uit van accoord: %s" msgid "invalid inversion pitch: not part of chord: %s" msgstr "ongeldige inversie toon: geen onderdeel van accoord: %s" -#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:193 +#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:192 msgid "unterminated chord tremolo" msgstr "onbeëindigd akkoordtremolo" @@ -654,8 +654,8 @@ msgstr "verbied naamgeving van uitvoer bestand en exportering" #. #: main.cc:136 #, c-format -msgid "Usage: %s [OPTION]... [FILE]..." -msgstr "Gebruik: %s [OPTIE]... [BESTAND]..." +msgid "Usage: %s [OPTION]... FILE..." +msgstr "Gebruik: %s [OPTIE]... BESTAND..." #: main.cc:138 msgid "Typeset music and or play MIDI from FILE" @@ -839,7 +839,7 @@ msgstr "Ben er zelf een: `%s'" msgid "none of these in my family: `%s'" msgstr "geen van deze in mijn gezin: `%s'" -#: percent-repeat-engraver.cc:118 +#: percent-repeat-engraver.cc:117 msgid "Don't know how to handle a percent repeat of this length." msgstr "Weet niet hoe procent herhaling van deze lengte af te handelen." @@ -1415,4 +1415,3 @@ msgstr "MIDI spoor verwacht" #: midi-track-parser.cc:353 msgid "invalid track length" msgstr "ongeldige spoorlengte" - diff --git a/po/ru.po b/po/ru.po index 2f034c0409..67c9d6b344 100644 --- a/po/ru.po +++ b/po/ru.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2001-05-18 15:48+0200\n" +"POT-Creation-Date: 2001-06-14 13:22+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: August S.Sigov \n" "Language-Team: Russian \n" @@ -23,7 +23,7 @@ msgstr "" msgid "warning: " msgstr "ÐÒÅÄÕÐÒÅÖÄÁÀ: " -#: input.cc:90 ly2dvi.py:205 ly2dvi.py:830 mup2ly.py:98 mup2ly.py:188 +#: input.cc:90 ly2dvi.py:205 ly2dvi.py:804 mup2ly.py:98 mup2ly.py:188 #: update-lily.py:123 update-lily.py:211 warn.cc:9 warn.cc:17 msgid "error: " msgstr "ÏÛÉÂËÁ: " @@ -134,7 +134,7 @@ msgstr " msgid "show warranty and copyright" msgstr "ÐÏËÁÚÁÔØ ÇÁÒÁÎÔÉÀ É copyright" -#: ly2dvi.py:383 ly2dvi.py:604 ly2dvi.py:629 +#: ly2dvi.py:383 ly2dvi.py:578 ly2dvi.py:603 #, fuzzy, c-format msgid "Running %s..." msgstr "÷ÙÂÒÁÓÙ×ÁÀ ÍÕÚÙËÕ: `%s'" @@ -154,23 +154,23 @@ msgstr "" msgid "invalid value: %s" msgstr "ÎÅ×ÅÒÎÙÊ ÓÉÍ×ÏÌ: `%c'" -#: ly2dvi.py:807 scores.cc:44 +#: ly2dvi.py:781 scores.cc:44 #, fuzzy, c-format msgid "dependencies output to `%s'..." msgstr "\"ÂÕÍÁÖÎÙÊ\" ×Ù×ÏÄ × %s..." -#: ly2dvi.py:817 +#: ly2dvi.py:791 #, fuzzy, c-format msgid "%s output to `%s'..." msgstr "×Ù×ÏÄ MIDI × %s..." -#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:819 +#: includable-lexer.cc:49 lily-guile.cc:139 ly2dvi.py:793 #: midi-score-parser.cc:24 scores.cc:136 scores.cc:142 #, c-format msgid "can't find file: `%s'" msgstr "ÎÅ ÍÏÇÕ ÎÁÊÔÉ ÆÁÊÌ: `%s'" -#: ly2dvi.py:830 +#: ly2dvi.py:804 msgid "no files specified on command line." msgstr "" @@ -482,7 +482,7 @@ msgstr " msgid "invalid inversion pitch: not part of chord: %s" msgstr "" -#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:193 +#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:192 msgid "unterminated chord tremolo" msgstr "ÎÅÚÁËÏÎÞÅÎÎÏÅ ÔÒÅÍÏÌÏ ÁËËÏÒÄÁ" @@ -647,8 +647,8 @@ msgstr " #. No version number or newline here. It confuses help2man #. #: main.cc:136 -#, c-format -msgid "Usage: %s [OPTION]... [FILE]..." +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... FILE..." msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ïðãéñ]... [æáêì]..." #: main.cc:138 @@ -821,7 +821,7 @@ msgstr " msgid "none of these in my family: `%s'" msgstr "ÏÎÉ ÍÎÅ ÎÅ ÒÏÄÓÔ×ÅÎÎÉËÉ" -#: percent-repeat-engraver.cc:118 +#: percent-repeat-engraver.cc:117 #, fuzzy msgid "Don't know how to handle a percent repeat of this length." msgstr "îÅ ÚÎÁÀ, ÞÔÏ ÄÅÌÁÔØ Ó ÐÕÓÔÙÍÉ ËÌÀÞÁÍÉ" diff --git a/ps/lilyponddefs.ps b/ps/lilyponddefs.ps index 114d0beaaa..53fed1bb2c 100644 --- a/ps/lilyponddefs.ps +++ b/ps/lilyponddefs.ps @@ -46,6 +46,29 @@ grestore } bind def +% +% FIXME. translate to middle of box. +% + +/draw-box % breapth width depth height +{ + /h exch def + /d exch def + /w exch def + /b exch def + gsave + + 0 setlinewidth + b neg d neg rmoveto + b w add 0 rlineto + 0 d h add rlineto + b w add neg 0 rlineto + closepath % 0 d h add neg rlineto + fill + + grestore +} bind def + /start-line % height { dup base-line-skip gt { diff --git a/ps/music-drawing-routines.ps b/ps/music-drawing-routines.ps index f1b9fa0fd8..2ed8afd583 100644 --- a/ps/music-drawing-routines.ps +++ b/ps/music-drawing-routines.ps @@ -10,82 +10,17 @@ 1 copy mul exch 1 copy mul add sqrt } bind def -/simpledraw_box % breapth width depth height -{ - /h exch def - /d exch def - /w exch def - /b exch def - - 0.01 setlinewidth - 1 setlinejoin - 0 0 moveto - b neg d neg rmoveto - b w add 0 rlineto - 0 d h add rlineto - b w add neg 0 rlineto - %closepath gsave stroke grestore fill - closepath fill -} bind def - - -% FIXME. translate to middle of box. -% Nice rectangle with rounded corners -/draw_box % breapth width depth height -{ - 1 setlinejoin - /l 0.05 def - l setlinewidth - 1 setlinejoin - - l 2 div sub /h exch def - l 2 div sub /d exch def - l 2 div sub /w exch def - l 2 div sub /b exch def - - b neg d neg moveto - b w add 0 rlineto - 0 d h add rlineto - b w add neg 0 rlineto - 0 d h add neg rlineto - closepath gsave stroke grestore fill -} bind def - -% ugh, see rectfill -/simpledraw_beam % slope width thick -{ - /t exch def - /w exch def - w mul /h exch def - 1 setlinejoin - % ugh? - 0.05 setlinewidth - - 0 t 2 div neg moveto - w h rlineto - 0 t rlineto - w neg h neg rlineto - 0 t neg rlineto - closepath gsave stroke grestore fill -} bind def - -% Nice beam with rounded corners -/draw_beam % slope width thick -{ - % ugh? - /l 0.1 def - l 2 div setlinewidth - 1 setlinejoin - l sub /t exch def - l sub /w exch def - w mul /h exch def - - l 2 div t 2 div neg moveto - w h rlineto - 0 t rlineto - w neg h neg rlineto - 0 t neg rlineto - closepath gsave stroke grestore fill +/draw_beam % width slope thick +{ + 2 div /beam_thick exch def + /beam_slope exch def + /beam_wd exch def + beam_slope beam_wd mul /beam_ht exch def + 0 beam_thick neg moveto + beam_wd beam_ht rlineto + 0 beam_thick 2 mul rlineto + 0 beam_thick lineto + closepath fill } bind def /draw_repeat_slash % width slope thick diff --git a/scm/chord-name.scm b/scm/chord-name.scm index 454c70c1f3..98a9270875 100644 --- a/scm/chord-name.scm +++ b/scm/chord-name.scm @@ -218,6 +218,7 @@ * TODO: any uneven step that's lower than an uneven step which is chromatically altered " + (write-me "adds: " (let ((evens (filter-list (lambda (x) (!= 0 (modulo (cadr x) 2))) steps)) (altered-unevens (filter-list (lambda (x) @@ -235,13 +236,13 @@ '())))) ;; Hmm, what if we have a step twice, can we ignore that? (uniq-list (sort (apply append evens altered-unevens highest) - pitch::<)))) + pitch::<))))) ;; FIXME: unLOOP, see ::additions ;; find the pitches that are missing from `normal' chord (define (chord::subtractions chord-pitches) - (let ((tonic (car chord-pitches))) + (write-me "subs: " (let ((tonic (car chord-pitches))) (let loop ((step 1) (pitches chord-pitches) (subtractions '())) (if (pair? pitches) (let* ((pitch (car pitches)) @@ -264,7 +265,7 @@ (if (= p-step step) (loop (+ step 2) (cdr pitches) subtractions) (loop step (cdr pitches) subtractions))))) - (reverse subtractions))))) + (reverse subtractions)))))) (define (chord::additions->text-banter additions subtractions) (if (pair? additions) @@ -375,7 +376,7 @@ ;; return (MATCHED-EXCEPTION . BASE-CHORD-WITH-UNMATCHED-STEPS) ;; BASE-CHORD-WITH-UNMATCHED-STEPS always includes (tonic 3 5) (define (chord::exceptions-lookup style steps) - (let* ((result (chord::exceptions-lookup-helper + (write-me "xl: " (let* ((result (chord::exceptions-lookup-helper (chord::restyle 'chord::names-alist- style) steps '() #f)) (exception-part (car result)) @@ -390,7 +391,7 @@ ((= i 0) base) ()) unmatched-steps))) - (list exception-part unmatched-with-1-3-5))) + (list exception-part unmatched-with-1-3-5)))) (define (chord::name->text style tonic steps bass-and-inversion) diff --git a/scm/grob-property-description.scm b/scm/grob-property-description.scm index 023a24668b..a20fc98a6a 100644 --- a/scm/grob-property-description.scm +++ b/scm/grob-property-description.scm @@ -101,7 +101,7 @@ Align_interface::center_on_element). .") (grob-property-description 'dash-period number? "the length of one dash + white space.") (grob-property-description 'dashed number? "[FIXME: use dash-period/dash length; see text-spanner] number representing the length of the dashes.") (grob-property-description 'de-uglify-parameters list? "list of 3 real constants. They define the valid areas for the middle control points. Used in de_uglyfy. They are a bit empirical.") -(grob-property-description 'default-neutral-direction dir? "Where to go if we're in the middle of the staff.") +(grob-property-description 'neutral-direction dir? "Where to go if we're in the middle of the staff.") (grob-property-description 'delta-y number? "amount of ascension.") (grob-property-description 'dependencies list? "list of score-grob pointers that indicate who to compute first for certain global passes.") (grob-property-description 'details list? "alist of parameters for detailed grob behavior.") diff --git a/scm/interface-description.scm b/scm/interface-description.scm index 10f9462a33..2328a217cc 100644 --- a/scm/interface-description.scm +++ b/scm/interface-description.scm @@ -75,7 +75,7 @@ height flag-width-function damping - default-neutral-direction + neutral-direction thickness space-function beamed-stem-shorten @@ -129,7 +129,7 @@ stem-shorten duration-log beaming - default-neutral-direction + neutral-direction stem-end-position support-head heads diff --git a/scm/ps.scm b/scm/ps.scm index a288c77446..9528079126 100644 --- a/scm/ps.scm +++ b/scm/ps.scm @@ -52,9 +52,10 @@ "lilypondpaperoutputscale div scalefont setfont } bind def " "\n")) + (define (beam width slope thick) (string-append - (numbers->string (list slope width thick)) " draw_beam" )) + (numbers->string (list width slope thick)) " draw_beam" )) (define (comment s) (string-append "% " s)) @@ -107,7 +108,7 @@ (define (filledbox breapth width depth height) (string-append (numbers->string (list breapth width depth height)) - " draw_box" )) + " draw-box" )) ;; obsolete? (define (font-def i s) @@ -170,7 +171,7 @@ lilypondpaperoutputscale lilypondpaperoutputscale scale (define (stem breapth width depth height) (string-append (numbers->string (list breapth width depth height)) - " draw_box" )) + " draw-box" )) (define (stop-line) "}\nstop-line\n") diff --git a/scm/tex.scm b/scm/tex.scm index 3321bb9c95..4c8904415d 100644 --- a/scm/tex.scm +++ b/scm/tex.scm @@ -164,18 +164,13 @@ "}\\vss}\\interscoreline\n") (define (stop-last-line) "}\\vss}") - (define (xfilledbox breapth width depth height) + (define (filledbox breapth width depth height) (string-append "\\kern" (number->dim (- breapth)) "\\vrule width " (number->dim (+ breapth width)) "depth " (number->dim depth) "height " (number->dim height) " ")) - (define (filledbox breapth width depth height) - (embedded-ps - (string-append (numbers->string (list breapth width depth height)) - " draw_box" ))) - (define (text s) (string-append "\\hbox{" (output-tex-string s) "}")) diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py index a9e53567ec..e4efd1652a 100644 --- a/scripts/lilypond-book.py +++ b/scripts/lilypond-book.py @@ -986,9 +986,13 @@ def compile_all_files (chunks): if do_deps: depfiles=map (lambda x: re.sub ('(.*)\.ly', '\\1.dep', x), tex) for i in depfiles: - text=open (i).read () + f =open (i) + text=f.read () + f.close () text=re.sub ('\n([^:\n]*):', '\n' + foutn + ':', text) - open (i, 'w').write (text) + f = open (i, 'w') + f.write (text) + f.close () for e in eps: system(r"tex '\nonstopmode \input %s'" % e) diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py index 2311323101..5ac6d69667 100644 --- a/scripts/ly2dvi.py +++ b/scripts/ly2dvi.py @@ -65,7 +65,6 @@ import shutil import __main__ import operator import tempfile -import traceback datadir = '@datadir@' sys.path.append (datadir + '/python') @@ -703,10 +702,8 @@ include_path = map (abspath, include_path) original_output = output_name - if files and files[0] != '-': - # Ugh, maybe make a setup () function files = map (lambda x: strip_extension (x, '.ly'), files) (outdir, outbase) = ('','') @@ -741,44 +738,40 @@ if files and files[0] != '-': os.chdir (tmpdir) + extra = extra_init + if lily_p: - try: +## try: run_lilypond (files, outbase, dep_prefix) - except: - # TODO: friendly message about LilyPond setup/failing? - # - # TODO: lilypond should fail with different - # error codes for: - # - guile setup/startup failure - # - font setup failure - # - init.ly setup failure - # - parse error in .ly - # - unexpected: assert/core dump - targets = {} - traceback.print_exc () +## # except: +## # TODO: friendly message about LilyPond setup/failing? +## # +## # TODO: lilypond should fail with different +## # error codes for: +## # - guile setup/startup failure +## # - font setup failure +## # - init.ly setup failure +## # - parse error in .ly +## # - unexpected: assert/core dump +## # targets = {} if targets.has_key ('DVI') or targets.has_key ('PS'): - try: - run_latex (files, outbase, extra_init) +# try: + run_latex (files, outbase, extra) # unless: add --tex, or --latex? del targets['TEX'] del targets['LATEX'] - except: - # TODO: friendly message about TeX/LaTeX setup, - # trying to run tex/latex by hand - if targets.has_key ('DVI'): - del targets['DVI'] - if targets.has_key ('PS'): - del targets['PS'] - traceback.print_exc () - +# except Foobar: +# # TODO: friendly message about TeX/LaTeX setup, +# # trying to run tex/latex by hand +# if targets.has_key ('DVI'): +# del targets['DVI'] +# if targets.has_key ('PS'): +# del targets['PS'] + + # TODO: does dvips ever fail? if targets.has_key ('PS'): - try: - run_dvips (outbase, extra_init) - except: - if targets.has_key ('PS'): - del targets['PS'] - traceback.print_exc () + run_dvips (outbase, extra) # add DEP to targets? if track_dependencies_p: @@ -787,7 +780,6 @@ if files and files[0] != '-': if os.path.isfile (depfile): progress (_ ("dependencies output to `%s'...") % depfile) - # Hmm, if this were a function, we could call it the except: clauses for i in targets.keys (): ext = string.lower (i) cp_to_dir ('.*\.%s$' % ext, outdir) @@ -807,7 +799,7 @@ if files and files[0] != '-': cleanup_temp () else: - # FIXME: read from stdin when files[0] = '-' + # FIXME help () errorport.write ("ly2dvi: " + _ ("error: ") + _ ("no files specified on command line.") + '\n') sys.exit (2) diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4 index c1db3023dc..a7d59a36f0 100644 --- a/stepmake/aclocal.m4 +++ b/stepmake/aclocal.m4 @@ -63,6 +63,19 @@ AC_DEFUN(AC_STEPMAKE_COMPILE, [ CFLAGS="$CFLAGS $OPTIMIZE" CPPFLAGS=${CPPFLAGS:-""} + + AC_MSG_CHECKING([for IEEE-conformance compiler flags]) + save_cflags="$CFLAGS" + case "$host" in + alpha*-*-*) + dnl should do compile test? + AC_MSG_RESULT(-mieee) + CFLAGS="-mieee $CFLAGS" + ;; + *) + AC_MSG_RESULT([none]) + ;; + esac AC_SUBST(cross_compiling) AC_SUBST(CFLAGS) AC_SUBST(CPPFLAGS) diff --git a/stepmake/aclocal.m4.orig b/stepmake/aclocal.m4.orig deleted file mode 100644 index f060d8cf51..0000000000 --- a/stepmake/aclocal.m4.orig +++ /dev/null @@ -1,1215 +0,0 @@ -dnl aclocal.m4 -*-shell-script-*- -dnl StepMake subroutines for configure.in - -AC_DEFUN(AC_STEPMAKE_BIBTEX2HTML, [ - AC_CHECK_PROGS(BIBTEX2HTML, bibtex2html bib2html, error) - if test "$BIBTEX2HTML" = "bib2html"; then - BIBTEX2HTML_FLAGS='$< $(@)' - else - BIBTEX2HTML_FLAGS='-o $(@D)/$(*F) $<' - fi - AC_SUBST(BIBTEX2HTML) - AC_SUBST(BIBTEX2HTML_FLAGS) -]) - - -AC_DEFUN(AC_STEPMAKE_COMPILE, [ - # -O is necessary to get inlining - CFLAGS=${CFLAGS:-""} - CXXFLAGS=${CXXFLAGS:-$CFLAGS} - LDFLAGS=${LDFLAGS:-""} - checking_b=yes - optimise_b=yes - profile_b=no - debug_b=yes - - AC_ARG_ENABLE(checking, - [ --enable-checking set runtime checks (assert calls). Default: on], - [checking_b=$enableval] ) - - AC_ARG_ENABLE(debugging, - [ --enable-debugging compile with debugging info. Default: on], - [debug_b=$enableval]) - - AC_ARG_ENABLE(profiling, - [ --enable-profiling compile with gprof support. Default: off], - [profile_b=$enableval]) - - - if test "$checking_b" = no; then - # ugh - AC_DEFINE(NDEBUG) - DEFINES="$DEFINES -DNDEBUG" - fi - - if test "$optimise_b" = yes; then - OPTIMIZE="-O2 -finline-functions" - fi - - - if test $profile_b = yes; then - EXTRA_LIBES="-pg" - OPTIMIZE="$OPTIMIZE -pg" - fi - - if test $debug_b = yes; then - OPTIMIZE="$OPTIMIZE -g" - fi - - - AC_PROG_CC - LD='$(CC)' - AC_SUBST(LD) - - CFLAGS="$CFLAGS $OPTIMIZE" - CPPFLAGS=${CPPFLAGS:-""} - AC_SUBST(cross_compiling) - AC_SUBST(CFLAGS) - AC_SUBST(CPPFLAGS) - AC_SUBST(LDFLAGS) - AC_SUBST(ICFLAGS) - AC_SUBST(ILDFLAGS) - AC_SUBST(DEFINES) - AC_SUBST(EXTRA_LIBES) -]) - -AC_DEFUN(AC_STEPMAKE_CXX, [ - AC_LANG_CPLUSPLUS - AC_PROG_CXX - - AC_CHECK_HEADER(FlexLexer.h, true, - AC_STEPMAKE_WARN(can"\'"t find flex header. Please install Flex headers correctly)) - - CPPFLAGS="$CPPFLAGS $DEFINES" - CXXFLAGS="$CXXFLAGS $OPTIMIZE" - LDFLAGS="$LDFLAGS $EXTRA_LIBES" - - AC_SUBST(CXXFLAGS) - AC_SUBST(CXX) - LD='$(CXX)' - AC_SUBST(LD) -]) - -AC_DEFUN(AC_STEPMAKE_CXXTEMPLATE, [ - AC_CACHE_CHECK([whether explicit instantiation is needed], - lily_cv_need_explicit_instantiation, - AC_TRY_LINK([ - template struct foo { static int baz; }; - template int foo::baz = 1; - ], [ return foo::baz; ], - lily_cv_need_explicit_instantiation=no, - lily_cv_need_explicit_instantiation=yes)) - if test x"$lily_cv_need_explicit_instantiation"x = x"yes"x; then - AC_DEFINE(NEED_EXPLICIT_INSTANTIATION) - fi -]) - -AC_DEFUN(AC_STEPMAKE_DATADIR, [ - if test "$datadir" = "\${prefix}/share"; then - datadir='${prefix}/share/'$package - fi - DIR_DATADIR=${datadir} - presome=${prefix} - if test "$prefix" = "NONE"; then - presome=${ac_default_prefix} - fi - DIR_DATADIR=`echo ${DIR_DATADIR} | sed "s!\\\${prefix}!$presome!"` - - AC_SUBST(datadir) - AC_SUBST(DIR_DATADIR) - - dnl yeah, so fuck me gently with a cactus: this doesnt belong here - dnl Please take the person responsible for inventing shell-scripts out - dnl and shoot him. On behalf of the sane world, thank you. - dnl DIR_SHAREDSTATEDIR="foobar" - dnl AC_SUBST(DIR_SHAREDSTATEDIR) - - AC_DEFINE_UNQUOTED(DIR_DATADIR, "${DIR_DATADIR}") -]) - -AC_DEFUN(AC_STEPMAKE_END, [ - AC_OUTPUT($CONFIGFILE.make:config.make.in) - - # regular in-place build - # test for srcdir_build = yes ? - if test "$builddir" = "."; then - rm -f $srcdir/GNUmakefile - cp $srcdir/GNUmakefile.in $srcdir/GNUmakefile - chmod 444 $srcdir/GNUmakefile - else # --srcdir build - rm -f GNUmakefile - cp $srcdir/make/srcdir.make.in GNUmakefile - chmod 444 GNUmakefile - fi -]) - -AC_DEFUN(AC_STEPMAKE_GXX, [ - # ugh autoconf - # urg, egcs: how to check for egcs >= 1.1? - changequote(<<, >>)dnl - if $CXX --version | egrep '2\.[89]' > /dev/null || - $CXX --version | grep 'egcs' > /dev/null - changequote([, ])dnl - then - true - else - AC_STEPMAKE_WARN(can\'t find g++ 2.8, 2.9 or egcs 1.1) - fi -]) - -AC_DEFUN(AC_STEPMAKE_GUILE, [ - ## First, let's just see if we can find Guile at all. - AC_MSG_CHECKING("for guile-config") - for guile_config in guile-config $target-guile-config $build-guile-config; do - AC_MSG_RESULT("$guile_config") - if ! $guile_config --version > /dev/null 2>&1 ; then - AC_MSG_WARN("cannot execute $guile_config") - AC_MSG_CHECKING("if we are cross compiling") - guile_config=error - else - break - fi - done - if test "$guile_config" = "error"; then - AC_MSG_ERROR("cannot find guile-config; is Guile installed?") - exit 1 - fi - AC_MSG_CHECKING("Guile version") - need_guile_version="1.3.4" - need_guile_version_numeric=100304 - guile_version=`$guile_config --version 2>&1 | awk '{print $NF}'` - guile_version_numeric=`echo $guile_version | awk -F. ' -{if ([$]3) {last = [$]3} -else {last =0}} -{printf "%s%s%s\n",[$]1*100, [$]2*10,last}'` - AC_MSG_RESULT("$guile_version") - if test $guile_version_numeric -lt $need_guile_version_numeric - then - AC_STEPMAKE_WARN("Guile version "$need_guile_version" or newer is needed") - fi - GUILE_FLAGS - AC_PATH_PROG(GUILE, guile, error) - AC_SUBST(GUILE) -]) - -AC_DEFUN(AC_STEPMAKE_INIT, [ - - . $srcdir/VERSION - FULL_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$PATCH_LEVEL - if test x$MY_PATCH_LEVEL != x; then - FULL_VERSION=$FULL_VERSION.$MY_PATCH_LEVEL - fi - - # urg: don't "fix" this: irix doesn't know about [:lower:] and [:upper:] - changequote(<<, >>)dnl - PACKAGE=`echo $PACKAGE_NAME | tr '[a-z]' '[A-Z]'` - package=`echo $PACKAGE_NAME | tr '[A-Z]' '[a-z]'` - changequote([, ])dnl - - # No versioning on directory names of sub-packages - # urg, urg - stepmake=${datadir}/stepmake - presome=${prefix} - if test "$prefix" = "NONE"; then - presome=${ac_default_prefix} - fi - stepmake=`echo ${stepmake} | sed "s!\\\${prefix}!$presome!"` - - # urg, how is this supposed to work? - if test "$program_prefix" = "NONE"; then - program_prefix= - fi - if test "$program_suffix" = "NONE"; then - program_suffix= - fi - - AC_MSG_CHECKING(Package) - if test "x$PACKAGE" = "xSTEPMAKE"; then - AC_MSG_RESULT(Stepmake package!) - - AC_MSG_CHECKING(builddir) - if test "$srcdir" = "."; then - builddir=. - else - absolute_builddir="`pwd`" - package_absolute_builddir="`dirname $absolute_builddir`" - package_srcdir="`dirname $srcdir`" - builddir="`dirname $package_srcdir`/`basename $package_absolute_builddir`/`basename $absolute_builddir`" - fi - AC_MSG_RESULT($builddir) - - (cd stepmake 2>/dev/null || mkdir stepmake) - (cd stepmake; rm -f stepmake; ln -s ../$srcdir/stepmake .) - (cd stepmake; rm -f bin; ln -s ../$srcdir/bin .) - AC_CONFIG_AUX_DIR(bin) - stepmake=stepmake - else - AC_MSG_RESULT($PACKAGE) - - AC_MSG_CHECKING(builddir) - if test "$srcdir" = "."; then - builddir=. - srcdir_build=no - else - absolute_builddir="`pwd`" -# builddir="`dirname $srcdir`/`basename $absolute_builddir`" - builddir="`bash $srcdir/buildscripts/walk.sh \"$srcdir\"`" - srcdir_build=yes - fi - AC_MSG_RESULT($builddir) - if expr "$srcdir" : '/' > /dev/null 2>&1; then - absolute_srcdir=yes - AC_STEPMAKE_WARN(Absolute --srcdir specified: $srcdir) - fi - - AC_MSG_CHECKING(for stepmake) - # Check for installed stepmake - if test -d $stepmake; then - AC_MSG_RESULT($stepmake) - else - if test "$absolute_srcdir" != "yes"; then - stepmake='$(depth)'/$srcdir/stepmake - else - stepmake=$srcdir/stepmake - fi - AC_MSG_RESULT($srcdir/stepmake ($datadir/stepmake not found)) - fi - - AC_CONFIG_AUX_DIR(\ - $HOME/usr/local/share/stepmake/bin\ - $HOME/usr/local/lib/stepmake/bin\ - $HOME/usr/share/stepmake/bin\ - $HOME/usr/lib/stepmake/bin\ - /usr/local/share/stepmake/bin\ - /usr/local/lib/stepmake/bin\ - /usr/share/stepmake/bin\ - /usr/lib/stepmake/bin\ - stepmake/bin\ - $srcdir/stepmake/bin\ - ) - fi - - AC_SUBST(builddir) - AC_SUBST(stepmake) - AC_SUBST(package) - AC_SUBST(PACKAGE) - AC_SUBST(PACKAGE_NAME) - AC_DEFINE_UNQUOTED(PACKAGE, "${PACKAGE_NAME}") - AC_DEFINE_UNQUOTED(TOPLEVEL_VERSION, "${FULL_VERSION}") - - if test "$package_depth" = "" ; then - package_depth="." - else - package_depth="../$package_depth" - fi - export package_depth - AC_SUBST(package_depth) - - AUTOGENERATE="This file was automatically generated by configure" - AC_SUBST(AUTOGENERATE) - - CONFIGSUFFIX= - AC_ARG_ENABLE(config, - [ --enable-config=CONF put settings in config-CONF.make and config-CONF.h; - do \`make conf=CONF' to get output in ./out-CONF], - [CONFIGSUFFIX=-$enableval]) - - CONFIGFILE=config$CONFIGSUFFIX - AC_SUBST(CONFIGSUFFIX) - - AC_CANONICAL_HOST - AC_CHECK_PROGS(MAKE, gmake make, error) - AC_CHECK_PROGS(FIND, find, error) - -dnl system supplied INSTALL is unsafe; use our own install. -dnl AC_PROG_INSTALL -dnl if test "$INSTALL" = "bin/install-sh"; then -dnl export INSTALL="\$\(depth\)/bin/install-sh" -dnl fi - - AC_CHECK_PROGS(TAR, tar, error) - - if test "x`uname`" = "xHP-UX"; then - AC_PATH_PROG(BASH, bash, /bin/sh) - AC_STEPMAKE_WARN(avoiding buggy /bin/sh) - AC_PATH_PROG(SHELL, bash, /bin/ksh) - else - AC_PATH_PROG(BASH, bash, /bin/sh) - SHELL=/bin/sh - AC_SUBST(SHELL) - fi - - - AC_PATH_PROG(PYTHON, ${PYTHON:-python}, -echo no python) - AC_SUBST(PYTHON) - - if test $MAKE != "error" ; then - $MAKE -v 2> /dev/null | grep GNU > /dev/null - if test "$?" = 1 - then - AC_STEPMAKE_WARN(Please install *GNU* make) - fi - fi - - AC_CHECK_SEARCH_RESULT($PYTHON, python, You should install Python) - - if test "x$OSTYPE" = "xcygwin32" || test "x$OSTYPE" = "xWindows_NT"; then - LN=cp # hard link does not work under cygnus-nt - LN_S='cp -r' # symbolic link does not work for native nt - ZIP="zip -r -9" # - program_suffix=.exe - # urg - # ROOTSEP=':' - # DIRSEP='\\' - # PATHSEP=';' - # - # cygwin fixes all these things. - # it seems these were used because of dos-style TEXINPUTS and - # MFINPUTS needed for miktex. - # but this breaks parsing of all other cygwin/unix style paths. - # - # if your (mik)tex breaks, make a: - # /usr/local/bin/tex: - # #!/bin/sh - # TEXINPUTS=`cygpath -pw $TEXINPUTS` /texmf/miktex/bin/tex $* - # - # and - # - # /usr/local/bin/mf: - # #!/bin/sh - # MFINPUTS=`cygpath -pw $MFINPUTS` /texmf/miktex/bin/mf $* - # - # this way, you may have buildscripts/out/lilypond-profile - # 'automatically' sourced from /usr/etc/profile.d/ too. - # - ROOTSEP=':' - DIRSEP='/' - PATHSEP=':' - INSTALL="\$(SHELL) \$(stepdir)/../bin/install-dot-exe.sh -c" - else - ROOTSEP=':' - DIRSEP='/' - PATHSEP=':' - LN=ln - LN_S='ln -s' - ZIP="zip -r -9" - INSTALL="\$(SHELL) \$(stepdir)/../bin/install-sh -c" - fi - AC_SUBST(program_prefix) - AC_SUBST(program_suffix) - AC_SUBST(ZIP) - AC_SUBST(LN) - AC_SUBST(LN_S) - AC_SUBST(INSTALL) - AC_DEFINE_UNQUOTED(DIRSEP, '${DIRSEP}') - AC_DEFINE_UNQUOTED(PATHSEP, '${PATHSEP}') - AC_SUBST(PATHSEP) - AC_SUBST(DIRSEP) - - AC_STEPMAKE_DATADIR -]) - -AC_DEFUN(AC_STEPMAKE_KPATHSEA, [ - - kpathsea_b=yes - AC_ARG_WITH(kpathsea, - [ --with-kpathsea use kpathsea lib. Default: on], - [kpathsea_b=$enableval]) - - if test "$kpathsea_b" = "yes"; then - AC_HAVE_HEADERS(kpathsea/kpathsea.h) - AC_CHECK_LIB(kpathsea, kpse_find_file) - AC_CHECK_FUNCS(kpse_find_file,, AC_ERROR(Cannot find kpathsea functions. You should install kpathsea; see INSTALL.txt. Rerun ./configure --without-kpathsea only if kpathsea is not available for your platform.)) - fi - AC_MSG_CHECKING(whether to use kpathsea) - if test "$kpathsea_b" = yes; then - AC_MSG_RESULT(yes) - KPATHSEA=1 - else - AC_MSG_RESULT(no) - KPATHSEA=0 - fi - - AC_SUBST(KPATHSEA) - AC_DEFINE_UNQUOTED(KPATHSEA, $KPATHSEA) -]) - -AC_DEFUN(AC_STEPMAKE_LEXYACC, [ - # ugh, automake: we want (and check for) bison - AC_PROG_YACC - # ugh, automake: we want (and check for) flex - # AC_PROG_LEX - # urg: automake 1.3: hope this doesn't break 1.2 ac_cv_pro_lex_root hack... - - # AC_DECL_YYTEXT - # ugh, ugh - ac_cv_prog_lex_root=lex.yy - - AC_CHECK_PROGS(BISON, bison, error) - AC_CHECK_PROGS(FLEX, flex, error) - AC_CHECK_SEARCH_RESULT($BISON, bison, Please install Bison, 1.25 or newer) - AC_CHECK_SEARCH_RESULT($FLEX, flex, Please install Flex, 2.5 or newer) - - if test $BISON != "error"; then - bison_version=`$BISON --version | sed 's/^.*version 1.//g'` - if test `echo $bison_version | sed 's/\..*$//g'` -lt 25; then - AC_STEPMAKE_WARN(Your bison is a bit old (1.$bison_version). You might have to install 1.25) - fi - fi - - AC_SUBST(BISON) - AC_SUBST(FLEX) -]) - -AC_DEFUN(AC_STEPMAKE_LIB, [ - AC_CHECK_PROGS(AR, ar, error) - AC_PROG_RANLIB - - AC_SUBST(AR) - AC_SUBST(RANLIB) -]) - -AC_DEFUN(AC_STEPMAKE_LIBTOOL, [ - # libtool.info ... - # **Never** try to set library version numbers so that they correspond - # to the release number of your package. This is an abuse that only - # fosters misunderstanding of the purpose of library versions. - - REVISION=$PATCH_LEVEL - # CURRENT=$MINOR_VERSION - CURRENT=`expr $MINOR_VERSION + 1` - # AGE=$(expr $MAJOR_VERSION + 1) - AGE=$MAJOR_VERSION - AC_SUBST(CURRENT) - AC_SUBST(REVISION) - AC_SUBST(AGE) -]) - -AC_DEFUN(AC_STEPMAKE_LOCALE, [ - lang=English - ALL_LINGUAS="en nl" - - # with/enable ?? - AC_ARG_WITH(localedir, - [ --with-localedir=LOCALE use LOCALE as locale dir. Default: - PREFIX/share/locale ], - localedir=$with_localedir, - localedir='${prefix}/share/locale') - - AC_ARG_WITH(lang, - [ --with-lang=LANG use LANG as language to emit messages], - language=$with_lang, - language=English) - - AC_MSG_CHECKING(language) - case "$language" in - En* | en* | Am* | am* | US* | us*) - lang=English;; - NL | nl | Du* | du* | Ned* | ned*) - lang=Dutch;; - "") - lang=English;; - *) - lang=unknown;; - esac - AC_MSG_RESULT($lang) - - if test "$lang" = "unknown" ; then - AC_STEPMAKE_WARN($language not supported; available are: $ALL_LINGUAS) - fi - -]) - -AC_DEFUN(AC_STEPMAKE_GETTEXT, [ - DIR_LOCALEDIR=${localedir} - presome=${prefix} - if test "$prefix" = "NONE"; then - presome=${ac_default_prefix} - fi - DIR_LOCALEDIR=`echo ${DIR_LOCALEDIR} | sed "s!\\\${prefix}!$presome!"` - AC_SUBST(localedir) - AC_SUBST(DIR_LOCALEDIR) - AC_DEFINE_UNQUOTED(DIR_LOCALEDIR, "${DIR_LOCALEDIR}") - - AC_CHECK_LIB(intl, gettext) - AC_CHECK_FUNCS(gettext) -]) - -AC_DEFUN(AC_STEPMAKE_MAKEINFO, [ - AC_CHECK_PROGS(MAKEINFO, makeinfo, error) - if test "$MAKEINFO" != "error"; then - AC_MSG_CHECKING(whether makeinfo can split html by @node) - mkdir -p out - makeinfo --html --output=out/split < /dev/null 2>&1 - if test -f mfput.tfm; then - break; - fi - done - AC_MSG_RESULT($MFMODE) - - AC_MSG_CHECKING(for mfplain.mp) - # - # For now let people define these in their environments - # - : ${MFPLAIN_MP=`kpsewhich mp mfplain.mp`} - AC_MSG_RESULT($MFPLAIN_MP) - - AC_MSG_CHECKING(for inimetapost flags) - if test ${INIMETAPOST} = "inimp" ; then - : ${INIMETAPOST_FLAGS=''} - else - : ${INIMETAPOST_FLAGS='-interaction=nonstopmode'} - fi - AC_MSG_RESULT($INIMETAPOST_FLAGS) - - rm -f mfput.* - - AC_SUBST(METAFONT) - AC_SUBST(METAPOST) - AC_SUBST(MFMODE) - AC_SUBST(INIMETAFONT) - AC_SUBST(INIMETAPOST) - AC_SUBST(MFPLAIN_MP) - AC_SUBST(INIMETAPOST_FLAGS) -]) - -AC_DEFUN(AC_STEPMAKE_WARN, [ - AC_MSG_WARN($1) - warn_b=yes -]) - -AC_DEFUN(AC_STEPMAKE_YODL, [ - if test "x$YODL" = "x"; then - AC_CHECK_PROGS(STRIPROFF, striproff, -echo no striproff) - AC_CHECK_PROGS(YODL, yodl, -echo no yodl) - AC_CHECK_PROGS(YODL2HTML, yodl2html, -echo no yodl) - AC_CHECK_PROGS(YODL2LATEX, yodl2latex, ) - AC_CHECK_PROGS(YODL2MAN, yodl2man, -echo no yodl) - AC_CHECK_PROGS(YODL2MSLESS, yodl2msless, -echo no yodl) - AC_CHECK_PROGS(YODL2TEXINFO, yodl2texinfo, -echo no yodl) - AC_CHECK_PROGS(YODL2TXT, yodl2txt, -echo no yodl) - YODL2LESS_DIR='$(bindir)/' - else - AC_SUBST(STRIPROFF) - AC_SUBST(YODL) - AC_SUBST(YODL2HTML) - AC_SUBST(YODL2LATEX) - AC_SUBST(YODL2LESS_DIR) - AC_SUBST(YODL2MAN) - AC_SUBST(YODL2MSLESS) - AC_SUBST(YODL2TEXINFO) - AC_SUBST(YODL2TXT) - export STRIPROFF YODL YODL2HTML YODL2LATEX YODL2MAN YODL2MSLESS YODL2TEXINFO YODL2TXT - fi - if test "x$YODL" = "-echo no yodl"; then - AC_STEPMAKE_WARN(Did not find YODL (Yodl is Yet Oneother Document Language, see http://www.cs.uu.nl/~hanwen/yodl)) - fi -]) - -dnl should cache result. -dnl should look in $prefix first. -dnl should probably assume TDS - -AC_DEFUN(AC_TEX_PREFIX, [ - - - AC_MSG_CHECKING(TeX/MF root dir directory) - - find_root_prefix="$prefix" - - - test "x$find_root_prefix" = xNONE && find_root_prefix="$ac_default_prefix" - find_texpostfix=""; - for postfix in "/lib/tex/" "/lib/texmf" "/lib" "/tex" "/texmf"; do - find_texprefix="$find_root_prefix$postfix" - if test -d $find_texprefix; then - find_texpostfix=$postfix - break; - fi - done - - if test "x$find_texpostfix" = x; then - find_texpostfix='/lib/texmf/tex' - AC_STEPMAKE_WARN(Cannot determine the TeX-directory. Please use --enable-tex-prefix) - fi - - find_texprefix="$find_root_prefix/$find_texpostfix" - - # only assign if variablename not empty - if test x != "x[$]$1"; then - $1='${prefix}'/"$find_texpostfix" - fi - AC_MSG_RESULT($find_texprefix) - -]) - - -# find a directory inside a prefix, -# $1 the prefix (expanded version) -# $2 variable to assign -# $3 the directory name -# $4 description -AC_DEFUN(AC_FIND_DIR_IN_PREFIX, [ - - AC_MSG_CHECKING($4 directory) - find_dirdir=`(cd $1; - $FIND ./ -type d -a -name $3 -print |sort|head -1|sed 's#^\./##')` - - - if test "x$find_dirdir" = x; then - find_dirdir="/$3"; - AC_STEPMAKE_WARN(Cannot determine $4 subdirectory. Please set from command-line) - true - fi - $2=$find_dirdir - AC_MSG_RESULT($1/$find_dirdir) -]) - -# ugh. this is hopeless -AC_DEFUN(AC_KPSE_TEX_DIR, [ - kpse_paths=`(kpsepath -n latex tex; kpsepath -n tex tex) | sed 's/:/ /g' | tr ' ' '\012' |sort | uniq -d` - kpse_syspaths=`echo $kpse_paths | grep '!'| sed 's/!//g'` - echo $kpse_paths - if test -w "$kpse_syspaths"; - then - dir=`echo $kpse_syspaths | head -1` - else - dir=`echo $kpse_paths | grep -v '!'| head -1` - fi - if test "$prefix" = "NONE"; then - local_prefix=$ac_default_prefix - local_prefix_quote='${prefix}' - - else - local_prefix=$prefix - local_prefix_quote=$prefix - fi - echo $local_prefix_quote = $local_prefix - echo $dir - echo $dir | sed 's!'$local_prefix'!\$local_prefix_quote!g' -]) - -AC_DEFUN(AC_TEX_SUBDIR, [ -dnl AC_REQUIRE([AC_TEX_PREFIX]) - AC_FIND_DIR_IN_PREFIX($find_texprefix, $1, tex,TeX input) - $1="$TEXPREFIX/$$1" -]) - -AC_DEFUN(AC_MF_SUBDIR, [ -dnl AC_REQUIRE([AC_TEX_PREFIX]) - AC_FIND_DIR_IN_PREFIX($find_texprefix, $1, source, MF input) - $1="$TEXPREFIX/$$1" -]) - -AC_DEFUN(AC_CHECK_SEARCH_RESULT, [ - result="`echo \"$1\" | grep echo`" - if test "x$1" = "xerror" -o "x$result" != "x"; then - AC_STEPMAKE_WARN(can\'t find $2. $3) - fi -]) - -dnl GUILE_FLAGS --- set flags for compiling and linking with Guile -dnl -dnl This macro runs the `guile-config' script, installed with Guile, -dnl to find out where Guile's header files and libraries are -dnl installed. It sets two variables, marked for substitution, as -dnl by AC_SUBST. -dnl -dnl GUILE_CFLAGS --- flags to pass to a C or C++ compiler to build -dnl code that uses Guile header files. This is almost -dnl always just a -I flag. -dnl -dnl GUILE_LDFLAGS --- flags to pass to the linker to link a -dnl program against Guile. This includes `-lguile' for -dnl the Guile library itself, any libraries that Guile -dnl itself requires (like -lqthreads), and so on. It may -dnl also include a -L flag to tell the compiler where to -dnl find the libraries. - -AC_DEFUN([GUILE_FLAGS],[ -## The GUILE_FLAGS macro. - AC_MSG_CHECKING(for Guile) - if ! $guile_config link > /dev/null ; then - AC_MSG_RESULT("cannot execute $guile_config") - AC_MSG_ERROR("cannot find guile-config; is Guile installed?") - exit 1 - fi - GUILE_CFLAGS="`$guile_config compile`" - GUILE_LDFLAGS="`$guile_config link`" - AC_SUBST(GUILE_CFLAGS) - AC_SUBST(GUILE_LDFLAGS) - AC_MSG_RESULT(yes) -]) - - -# Configure paths for GTK+ -# Owen Taylor 97-11-3 - -dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) -dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS -dnl -AC_DEFUN(AM_PATH_GTK, -[dnl -dnl Get the cflags and libraries from the gtk-config script -dnl - AC_PATH_PROG(GTK_CONFIG, gtk-config, no) - min_gtk_version=ifelse([$1], ,1.1.1,$1) - AC_MSG_CHECKING(for GTK - version >= $min_gtk_version) - no_gtk="" - if test "$GTK_CONFIG" != "no" ; then - GTK_CFLAGS=`$GTK_CONFIG --cflags` - GTK_LIBS=`$GTK_CONFIG --libs` - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - ac_save_CXXFLAGS="$CXXFLAGS" - CFLAGS="$CFLAGS $GTK_CFLAGS" - CXXFLAGS="$CXXFLAGS $GTK_CFLAGS" - LIBS="$LIBS $GTK_LIBS" -dnl -dnl Now check if the installed GTK is sufficiently new. (Also sanity -dnl checks the results of gtk-config to some extent) -dnl - AC_TRY_RUN([ -#include -#include - -int -main () -{ - int major, minor, micro; - - if (sscanf("$min_gtk_version", "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_gtk_version"); - exit(1); - } - - return !((gtk_major_version > major) || - ((gtk_major_version == major) && (gtk_minor_version > minor)) || - ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))); -} -],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - CXXFLAGS="$ac_save_CXXFLAGS" - LIBS="$ac_save_LIBS" - else - no_gtk=yes - fi - if test "x$no_gtk" = x ; then - AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - GTK_CFLAGS="" - GTK_LIBS="" - ifelse([$3], , :, [$3]) - fi - CXXFLAGS="$CXXFLAGS $GTK_CFLAGS" - AC_SUBST(CXXFLAGS) - AC_SUBST(GTK_CFLAGS) - AC_SUBST(GTK_LIBS) -]) - - -# Configure paths for GTK-- -# Erik Andersen 30 May 1998 -# Modified by Tero Pulkkinen (added the compiler checks... I hope they work..) - -dnl Test for GTK__, and define GTK___CFLAGS and GTK___LIBS -dnl to be used as follows: -dnl AM_PATH_GTKMM([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) -dnl - -dnl Get the cflags and libraries from the gtkmm-config script -dnl -AC_ARG_WITH(gtkmm-prefix,[ --with-gtkmm-prefix=PREFIX - Prefix where GTK-- is installed (optional)], - gtkmm_config_prefix="$withval", gtkmm_config_prefix="") -AC_ARG_WITH(gtkmm-exec-prefix,[ --with-gtkmm-exec-prefix=PREFIX - Exec prefix where GTK-- is installed (optional)], - gtkmm_config_exec_prefix="$withval", gtkmm_config_exec_prefix="") -AC_ARG_ENABLE(gtkmmtest, [ --disable-gtkmmtest Do not try to compile and run a test GTK-- program], - , enable_gtkmmtest=yes) - - if test x$gtkmm_config_exec_prefix != x ; then - gtkmm_config_args="$gtkmm_config_args --exec-prefix=$gtkmm_config_exec_prefix" - if test x${GTKMM_CONFIG+set} != xset ; then - GTKMM_CONFIG=$gtkmm_config_exec_prefix/bin/gtkmm-config - fi - fi - if test x$gtkmm_config_prefix != x ; then - gtkmm_config_args="$gtkmm_config_args --prefix=$gtkmm_config_prefix" - if test x${GTKMM_CONFIG+set} != xset ; then - GTKMM_CONFIG=$gtkmm_config_prefix/bin/gtkmm-config - fi - fi - - -AC_DEFUN(AM_PATH_GTKMM, -[dnl - -dnl -dnl Check if the installed GTK-- is sufficiently new. -dnl - AC_PATH_PROG(GTKMM_CONFIG, gtkmm-config, no) - min_gtkmm_version=ifelse([$1], ,0.9.14,$1) - - AC_MSG_CHECKING(for GTK-- - version >= $min_gtkmm_version) - no_gtkmm="" - if test "$GTKMM_CONFIG" = "no" ; then - no_gtkmm=yes - else - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - - GTK___CFLAGS=`$GTKMM_CONFIG $gtkmm_config_args --cflags` - GTK___LIBS=`$GTKMM_CONFIG $gtkmm_config_args --libs` - gtkmm_config_major_version=`$GTKMM_CONFIG $gtkmm_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - gtkmm_config_minor_version=`$GTKMM_CONFIG $gtkmm_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - gtkmm_config_micro_version=`$GTKMM_CONFIG $gtkmm_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_gtkmmtest" = "xyes" ; then - ac_save_CXXFLAGS="$CXXFLAGS" - ac_save_LIBS="$LIBS" - CXXFLAGS="$CXXFLAGS $GTK___CFLAGS" - LIBS="$LIBS $GTK___LIBS" -dnl -dnl Now check if the installed GTK-- is sufficiently new. (Also sanity -dnl checks the results of gtkmm-config to some extent -dnl - rm -f conf.gtkmmtest - AC_TRY_RUN([ -#include -#include -#include - -int -main () -{ - int major, minor, micro; - char *tmp_version; - - system ("touch conf.gtkmmtest"); - - /* HP/UX 0 (%@#!) writes to sscanf strings */ - tmp_version = g_strdup("$min_gtkmm_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_gtkmm_version"); - exit(1); - } - - if ((gtkmm_major_version != $gtkmm_config_major_version) || - (gtkmm_minor_version != $gtkmm_config_minor_version) || - (gtkmm_micro_version != $gtkmm_config_micro_version)) - { - printf("\n*** 'gtkmm-config --version' returned %d.%d.%d, but GTK-- (%d.%d.%d)\n", - $gtkmm_config_major_version, $gtkmm_config_minor_version, $gtkmm_config_micro_version, - gtkmm_major_version, gtkmm_minor_version, gtkmm_micro_version); - printf ("*** was found! If gtkmm-config was correct, then it is best\n"); - printf ("*** to remove the old version of GTK--. You may also be able to fix the error\n"); - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); - printf("*** required on your system.\n"); - printf("*** If gtkmm-config was wrong, set the environment variable GTKMM_CONFIG\n"); - printf("*** to point to the correct copy of gtkmm-config, and remove the file config.cache\n"); - printf("*** before re-running configure\n"); - } -/* GTK-- does not have the GTKMM_*_VERSION constants */ -/* - else if ((gtkmm_major_version != GTKMM_MAJOR_VERSION) || - (gtkmm_minor_version != GTKMM_MINOR_VERSION) || - (gtkmm_micro_version != GTKMM_MICRO_VERSION)) - { - printf("*** GTK-- header files (version %d.%d.%d) do not match\n", - GTKMM_MAJOR_VERSION, GTKMM_MINOR_VERSION, GTKMM_MICRO_VERSION); - printf("*** library (version %d.%d.%d)\n", - gtkmm_major_version, gtkmm_minor_version, gtkmm_micro_version); - } -*/ - else - { - if ((gtkmm_major_version > major) || - ((gtkmm_major_version == major) && (gtkmm_minor_version > minor)) || - ((gtkmm_major_version == major) && (gtkmm_minor_version == minor) && (gtkmm_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** An old version of GTK-- (%d.%d.%d) was found.\n", - gtkmm_major_version, gtkmm_minor_version, gtkmm_micro_version); - printf("*** You need a version of GTK-- newer than %d.%d.%d. The latest version of\n", - major, minor, micro); - printf("*** GTK-- is always available from ftp://ftp.gtk.org.\n"); - printf("***\n"); - printf("*** If you have already installed a sufficiently new version, this error\n"); - printf("*** probably means that the wrong copy of the gtkmm-config shell script is\n"); - printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of GTK--, but you can also set the GTKMM_CONFIG environment to point to the\n"); - printf("*** correct copy of gtkmm-config. (In this case, you will have to\n"); - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); - printf("*** so that the correct libraries are found at run-time))\n"); - } - } - return 1; -} -],, no_gtkmm=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CXXFLAGS="$ac_save_CXXFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_gtkmm" = x ; then - AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - if test "$GTKMM_CONFIG" = "no" ; then - echo "*** The gtkmm-config script installed by GTK-- could not be found" - echo "*** If GTK-- was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the GTK_CONFIG environment variable to the" - echo "*** full path to gtk-config." - echo "*** The gtkmm-config script was not available in GTK-- versions" - echo "*** prior to 0.9.12. Perhaps you need to update your installed" - echo "*** version to 0.9.12 or newer" - else - if test -f conf.gtkmmtest ; then - : - else - echo "*** Could not run GTK-- test program, checking why..." - CXXFLAGS="$CFLAGS $GTKMM_CXXFLAGS" - LIBS="$LIBS $GTK___LIBS" - AC_TRY_LINK([ -#include -#include -], [ return ((gtkmm_major_version) || (gtkmm_minor_version) || (gtkmm_micro_version)); ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GTK-- or finding the wrong" - echo "*** version of GTK--. If it is not finding GTK--, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GTK-- was incorrectly installed" - echo "*** or that you have moved GTK-- since it was installed. In the latter case, you" - echo "*** may want to edit the gtkmm-config script: $GTKMM_CONFIG" ]) - CXXFLAGS="$ac_save_CXXFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - GTK___CFLAGS="" - GTK__LIBS="" - ifelse([$3], , :, [$3]) - AC_LANG_RESTORE - fi - AC_SUBST(GTK___CFLAGS) - AC_SUBST(GTK___LIBS) - rm -f conf.gtkmmtest -]) - -# Configure paths for GTK--DRAW -# Derek Quinn Wyatt 98-08-21 (adapted from Jan Nieuwenhuizen's code) - -dnl AM_PATH_GTK__DRAW([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) -dnl Test for GTK--DRAW, and define GTK___CFLAGS and GTK___LIBS -dnl -AC_DEFUN(AM_PATH_GTK__DRAW, -[dnl -dnl Get the cflags and libraries from the gtk__-config script -dnl - AC_PATH_PROG(GTKMM_CONFIG, gtkmm-config, no) - min_gtk___version=ifelse([$1], ,0.0.5,$1) - AC_MSG_CHECKING(for GTK--DRAW - version >= $min_gtk___version) - no_gtk__="" - if test "$GTKMM_CONFIG" != "no" ; then - GTK___CFLAGS=`$GTKMM_CONFIG --cflags` - GTK___LIBS=`$GTKMM_CONFIG --libs` - GTK___DLIBS="$GTK___LIBS -lgtkmmdraw" - GTK___LIBS="$GTK___DLIBS" - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - ac_save_CXXFLAGS="$CXXFLAGS" - CFLAGS="$CFLAGS $GTK___CFLAGS" - CXXFLAGS="$CXXFLAGS $GTK___CFLAGS" - LIBS="$LIBS $GTK___LIBS" -dnl -dnl Now check if the installed GTK__ is sufficiently new. (Also sanity -dnl checks the results of gtk__-config to some extent) -dnl - AC_TRY_RUN([ -#include -#include - -int -main () -{ - // urg - return 0; -} -],, no_gtk__=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - CXXFLAGS="$ac_save_CXXFLAGS" - LIBS="$ac_save_LIBS" - else - no_gtk__=yes - fi - if test "x$no_gtk__" = x ; then - AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - GTK___CFLAGS="" - GTK___LIBS="" - ifelse([$3], , :, [$3]) - fi - CXXFLAGS="$CXXFLAGS $GTK___CFLAGS" - AC_SUBST(CXXFLAGS) - AC_SUBST(GTK___CFLAGS) - AC_SUBST(GTK___LIBS) -]) diff --git a/stepmake/configure b/stepmake/configure index 12481314a9..fd1da1eb3e 100755 --- a/stepmake/configure +++ b/stepmake/configure @@ -785,10 +785,11 @@ EOF # Check whether --enable-config or --disable-config was given. if test "${enable_config+set}" = set; then enableval="$enable_config" - CONFIGSUFFIX=-$enableval + CONFIGURATION=$enableval fi + test -n "$CONFIGURATION" && CONFIGSUFFIX="-$CONFIGURATION" CONFIGFILE=config$CONFIGSUFFIX @@ -799,7 +800,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:803: checking host system type" >&5 +echo "configure:804: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -824,7 +825,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:828: checking for $ac_word" >&5 +echo "configure:829: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MAKE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -859,7 +860,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:863: checking for $ac_word" >&5 +echo "configure:864: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_FIND'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -896,7 +897,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:900: checking for $ac_word" >&5 +echo "configure:901: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_TAR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -931,7 +932,7 @@ test -n "$TAR" || TAR="error" # Extract the first word of "bash", so it can be a program name with args. set dummy bash; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:935: checking for $ac_word" >&5 +echo "configure:936: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_BASH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -971,7 +972,7 @@ fi # Extract the first word of "bash", so it can be a program name with args. set dummy bash; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:975: checking for $ac_word" >&5 +echo "configure:976: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_SHELL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1008,7 +1009,7 @@ fi # Extract the first word of "bash", so it can be a program name with args. set dummy bash; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1012: checking for $ac_word" >&5 +echo "configure:1013: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_BASH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1049,7 +1050,7 @@ fi # Extract the first word of "${PYTHON:-python}", so it can be a program name with args. set dummy ${PYTHON:-python}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1053: checking for $ac_word" >&5 +echo "configure:1054: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1222,7 +1223,7 @@ fi echo $ac_n "checking language""... $ac_c" 1>&6 -echo "configure:1226: checking language" >&5 +echo "configure:1227: checking language" >&5 case "$language" in En* | en* | Am* | am* | US* | us*) lang=English;; @@ -1257,7 +1258,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1261: checking for $ac_word" >&5 +echo "configure:1262: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MAKEINFO'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else