+1.3.137.jcn4
+============
+
+* Bugfix: ly2dvi: handle input files with multiple extensions.
+
+* Minor doco updates.
+
+* Bugfix: ly2dvi: can't remove cwd on Solaris.
+
+* Better --enable-conf=CONF message, better INSTALL.tely documentation.
+
+* Bugfix: built of Documentation/user for different conf=CONF.
+
+* Don't append "." to version string without my_patch_level.
+
+* Faked titling for tutorial example.
+
+* Bugfix: don't override GUILE environment settings.
+
+* Small refman fixes.
+
+* Better tutorial orchestral score example.
+
+* Bugfix: input/test/hshift.ly
+
+* Fixed looks of configure options.
+
+* Bugfix: ly2dvi: linewidth < 0.
+
+* Bugfix: documentation build: fixed two macros in refman that
+makeinfo groks, but make texi2dvi barf.
+
+* Bugfix: listing of engraver contexts in autogenerated documentation.
+
+1.3.137.uu1
+===========
+
+* Added function (ly-music-name ), returns the name of a music objects as a
+string.
+
+* Bugfix: \relative on \chords is no-op. (Added Un_relativable_music)
+
+* Refman documentation fixes.
+
+* Property undefine:
+
+ \property X.Y \unset
+
+undoes \property X.Y = Z. \unset is confusingly asymetric with \set.
+
+* removed ChordNamesVoice
+
+* added \alias STRING ; to translator definition, so \name
+RhythmicStaff, \alias Staff is found for \property Staff.XXX
+
1.3.136.hwn2
============
That's a nice thought, Wendy. I've got a few too, to spread
the credits a bit (Again, no particular order) Michelle, Illushka,
-Mieke, Ruth, Eva, Fro/ydis, Monique, Mary Anne, Noor, Sascha, Monique,
+Mieke, Ruth, Eva, Fro/ydis, Monique, Mary Anne, Noor, Sacha, Monique,
Ilse, Monique, Eva, Roos, Judith, Tim, Connie and, of course, Wendy!
JCN
* More movements ::
* A piano excerpt:: Piano music
* An orchestral score::
+* Part extraction::
* end of tutorial:: The end
@end menu
@center @strong{Two miniatures}
@flushright
- Opus 1.
+Opus 1.
@end flushright
@flushleft
@var{Up}
}
@end lilypond
@flushright
- Opus 2.
+Opus 2.
@end flushright
@flushleft
@var{Down}
@node An orchestral score
@section An orchestral score
-[LOTS TODO:
-demonstrate Hara-Kiri, part combining, part extraction,
-scores, transposition, instrument names.]
+If you've come this far, you should have seen enough LilyPond source to
+feel comfortable with an orchestral score. We will not go through the
+input line by line, but only indicate and explain the new elements.
-Hopefully, you have seen enough LilyPond input examples by now to be
-able read the input for a full orchestral score. We will not go through
-the input line by line, but only indicate and explain the new elements.
+This orchestral score example consists of three input files. In the
+first file, @file{os-music.ly}, we define the music for all instruments.
+This file is to be used by the other two files, as you will see below.
+If you run lilypond on this file, no output will be produced.
-@lilypond[verbatim]
-\version "1.3.130";
-\include "paper13.ly";
+@example
+% os-music.ly
+\header @{
+ title = "Zo, goed lieverd?";
+ subtitle = "How's, this babe?";
+ composer = "JCN";
+ opus = "1";
+ piece = "Laid back";
+@}
+global = @{
+ \time 2/4;
+ \skip 2*4; \bar "|.";
+@}
+Key = \notes \key as \major;
+flautoI = \notes\relative c'' @{
+ f8 g f g f g f g
+ bes as bes as bes as bes as
+@}
+flautoII = \notes\relative c'' @{
+ as8 bes as bes R1 d4 ~ d
+@}
+tromboI = \notes\relative c'' @{
+ c4. c8 c8 c4. es4 R1*1/2 es4
+@}
+tromboII = \notes\relative c'' @{
+ as4. as8 as8 as4. R1*1/2 as4 es'
+@}
+timpani = \notes\relative c, @{
+ \times 2/3 @{ f4 f f @}
+ \times 4/5 @{ as8 as as as as @}
+@}
+corno = \notes\relative c' @{
+ bes4 d f, bes d f, bes d
+@}
+@end example
-% #(set! point-and-click #t)
+Things to note here are the definition of @code{\global} where we define
+meter, and set the end bar. And the separate definition of @code{\Key}
+that we will use all staffs except staffs for transposing instruments.
-% Coriolan 218-222
-flautoI = \notes\relative c'' {
- \property Score.currentBarNumber = #218
- des2.()c4|e(f e)f|\break
- r2 des4\sf()c|r2 des4\sf()c|
-}
-flautoII = \notes\relative c'' {
- g2.()as4|bes(as bes)as|
- R1*2
-}
-oboeI = \notes\relative c'' {
- e2.()f4|e(f e)f|
- r2 as|r as\sf|
-}
-oboeII = \notes\relative c'' {
- g2.()as4|bes(as bes)as|
- r2 as'|r as\sf|
-}
-clarinettoI = \notes\relative c' {
- es2.()d4|c(bis c)bes|
-% r2 es4\sf()d|r2 es4\sf()d|
-}
-clarinettoII = \notes\relative c' {
- es2.()d4|c(bes c)bes|
-% r2 es'4\sf()d|r2 es4\sf()d|
-}
-fagottoI = \notes\relative c' {
- bes2.()as4|g(f g)f|
- r r8 des' des4\sf()es|r r8 des des4\sf()es|
-}
-fagottoII = \notes\relative c' {
- bes2.()as4 | g(f g)f|
- f4 r r2 | f4 r r2|
-}
-cornoI = \notes\relative c''' {
- g2. f4|g f g f|
-% r4 r8 f f2|r4 r8 f f2|
-}
-cornoII = \notes\relative c''' {
- g,2. d'4|g, d' g, d'|
- r4 r8 d d4\sf()es|r4 r8 d d4\sf()es|
-}
-tromboI = \notes\relative c'' {
- c2. c4|c c c c|
- R1*2|
-}
-tromboII = \notes\relative c' {
- c2. c4|c c c c|
- R1*2|
-}
-timpani = \notes\relative c {
- c2:16 c4 c|c c c c |
- R1*2|
-}
-violinoI = \notes\relative c' {
- des'2:16\ff des4: c:|e,: f: e: f:|
- r8 as des,4\sf~des()c |r8 as' des,4\sf~des()c|
-}
-violinoII = \notes\relative c' {
- des2:16\ff des4: c: | bes: as: bes: as:|
-% r8 as des,4\sf ~ des()c| r8 as' des,4\sf ~ des()c|
-}
-violaI = \notes\relative c' {
- e2:16\ff e4: f:|b,: c: b: c:|
- r4 r8 as as2\sf|r4 r8 as as2\sf|
-}
-violaII = \notes\relative c' {
- bes2:16\ff bes4: as:|g: f: g: f: |
- r4 r8 f f4\sf()ges|r4 r8 f f4\sf()ges|
-}
-violoncello = \notes\relative c {
- bes2.\ff()as4|g( f g )f |
- r4 r8 f' f4\sf()ges |r4 r8 f f4\sf()ges |
-}
-contrabasso = \notes\relative c {
- bes2.\ff()as4|g( f g )f|
- f4 r r2 |f'4 r r2|
-}
+The second file, @file{os-score.ly} reads the definitions of the first
+(@file{os-music.ly}), and defines the @code{\score} block for the full
+conductor's score.
-#(define text-flat '((font-relative-size . -2) (music "accidentals--1")))
-
-staffCombinePianoStaffProperties = {
- \property PianoStaff.devNullThread = #'()
- \property PianoStaff.soloADue = ##t
- \property PianoStaff.soloText = #""
- \property PianoStaff.soloIIText = #""
- % This is non-conventional, but currently it is
- % the only way to tell the difference.
- \property PianoStaff.aDueText = #"\\`a2"
- \property PianoStaff.splitInterval = #'(1 . 0)
- \property PianoStaff.changeMoment = #`(,(make-moment 1 1) . ,(make-moment 1 1))
- \property PianoStaff.noDirection = ##t
-}
+@example
+% os-score.ly
+\include "os-music.ly";
+\include "paper13.ly";
-%%
-%% Hmm, can't we move this to a `template.ly'
-%%
-\score {
- <
- \context StaffGroup = wood <
+#(set! point-and-click #t)
+#(define text-flat '((font-relative-size . -2)
+ (music "accidentals--1")))
+
+\score @{
+ <
+ \global
+ \context StaffGroup = woodwind <
\context Staff = flauti <
\property Staff.midiInstrument = #"flute"
\property Staff.instrument = "2 Flauti"
\property Staff.instr = "Fl."
- \context Voice=one \partcombine Voice
- \context Thread=one \flautoI
- \context Thread=two \flautoII
- >
- \context Staff = oboes <
- \property Staff.midiInstrument = #"oboe"
- \property Staff.instrument = "2 Oboi"
- \property Staff.instr = "Ob."
- \context Voice=one \partcombine Voice
- \context Thread=one \oboeI
- \context Thread=two \oboeII
- >
- \context Staff = clarinets <
- \property Staff.midiInstrument = #"clarinet"
- \property Staff.instrument = #`(lines
- "2 Clarinetti" (rows "(B" ,text-flat ")"))
- \property Staff.instr = #`(lines
- "Cl." (rows "(B" ,text-flat ")"))
- \property Staff.transposing = #-2
- \notes \key f \major;
- \context Voice=one \partcombine Voice
- \context Thread=one \clarinettoI
- \context Thread=two \clarinettoII
- >
- \context Staff = bassoons <
- \property Staff.midiInstrument = #"bassoon"
- \property Staff.instrument = "2 Fagotti"
- \property Staff.instr = "Fg."
- \clef bass;
- \context Voice=one \partcombine Voice
- \context Thread=one \fagottoI
- \context Thread=two \fagottoII
- >
- >
- \context StaffGroup = brass <
- \context Staff = frenchHorns <
- \property Staff.midiInstrument = #"french horn"
- \property Staff.instrument = #`(lines
- "2 Corni" (rows "(E" ,text-flat ")"))
- \property Staff.instr = #`(lines
- "Cor." (rows "(E" ,text-flat ")"))
- \property Staff.transposing = #3
- \notes \key c \major;
- \context Voice=one \partcombine Voice
- \context Thread=one \cornoI
- \context Thread=two \cornoII
- >
- \context Staff = trumpets <
- \property Staff.midiInstrument = #"trumpet"
- \property Staff.instrument = #`(lines
- "2 Trombe" (rows "(C)"))
- \property Staff.instr = #`(lines
- "Tbe." (rows "(C)"))
- \context Voice=one \partcombine Voice
- \context Thread=one \tromboI
- \context Thread=two \tromboII
+ \Key
+ \context Voice=one @{ \voiceOne \flautoI @}
+ \context Voice=two @{ \voiceTwo \flautoII @}
>
>
\context StaffGroup = timpani <
\context Staff = timpani <
\property Staff.midiInstrument = #"timpani"
- \property Staff.instrument = #'(lines
- "2 Timpani" "(C-G)")
+ \property Staff.instrument = #'(lines "Timpani" "(C-G)")
\property Staff.instr = #"Timp."
\clef bass;
+ \Key
\timpani
>
>
- \context StaffGroup = strings <
- \context GrandStaff = violins <
- \context Staff = viI <
- \property Staff.midiInstrument = #"violin"
- \property Staff.instrument = "Violino I"
- \property Staff.instr = "Vi. I"
- \violinoI
- >
- \context Staff = viII <
- \property Staff.midiInstrument = #"violin"
- \property Staff.instrument = "Violino II"
- \property Staff.instr = "Vi. II"
- \violinoII
- >
- >
- \context Staff = vla <
- \property Staff.midiInstrument = #"viola"
- \property Staff.instrument = "Viola"
- \property Staff.instr = "Vla."
- \clef alto;
+ \context StaffGroup = brass <
+ \context Staff = trombe <
+ \property Staff.midiInstrument = #"trumpet"
+ \property Staff.instrument = #`(lines "2 Trombe" "(C)")
+ \property Staff.instr = #`(lines "Tbe." "(C)")
+ \Key
\context Voice=one \partcombine Voice
- \context Thread=one \violaI
- \context Thread=two \violaII
+ \context Thread=one \tromboI
+ \context Thread=two \tromboII
>
- \context PianoStaff=bass <
- \staffCombinePianoStaffProperties
- \context Staff=one <
- \property Staff.midiInstrument = #"cello"
- \property Staff.instrument = #'(lines
- "Violoncello" " e" "Contrabasso")
- \property Staff.instr = "Vc."
- \clef bass;
- >
- \context Staff=two <
- \property Staff.midiInstrument = #"contrabass"
- \property Staff.instrument = "Contrabasso"
- \property Staff.instr = "C.B."
- \clef bass;
- \skip 1*4; % sustain clef
- >
- \context Staff=one \partcombine Staff
- \context Voice=one \violoncello
- \context Voice=two \contrabasso
+ \context Staff = corni <
+ \property Staff.midiInstrument = #"french horn"
+ \property Staff.instrument = #`(lines "Corno"
+ (rows "(E" ,text-flat ")"))
+ \property Staff.instr = #`(lines "Cor."
+ (rows "(E" ,text-flat ")"))
+ \property Staff.transposing = #3
+ \notes \key bes \major;
+ \context Voice=one \corno
>
>
>
- \paper {
- \paperThirteen
- linewidth = 80 * \staffspace;
- textheight = 200 * \staffspace;
- \translator{
+ \paper @{
+ indent = 15 * \staffspace;
+ linewidth = 60 * \staffspace;
+ textheight = 90 * \staffspace;
+ \translator@{
\ThreadContext
\consists "Rest_engraver";
-
- % Set value for engraver at thread level,
- % to override the default that is set in ScoreContext
- % for added engraver at Voice level
- devNullThread = #'()
- }
- \translator{
+ @}
+ \translator@{
\VoiceContext
\remove "Rest_engraver";
-
- % The staff combine (bassi part) needs a
- % thread_devnull_engraver here.
- % Instead of maintaining two separate hierarchies,
- % we switch add it, but switch it off immediately.
- % --> move to Score level to be able to override
- % The staff combine part switches it on.
-
- %% devNullThread = #'never
- \consists "Thread_devnull_engraver";
- }
- \translator{
+ @}
+ \translator@{
\HaraKiriStaffContext
- \consists "Mark_engraver";
- }
- \translator {
+ @}
+ \translator @{
\OrchestralScoreContext
- % skipBars = ##t
-
- soloText = #"I."
- soloIIText = #"II."
- % By default, turn off the Thread_devnull_engraver
- % at Voice level
- devNullThread = #'never
-
- % Hmm
- currentBarNumber = #218
BarNumber \override #'padding = #3
- RestCollision \override #'maximum-rest-count = #1
- TimeSignature \override #'style = #'C
- }
- }
-}
-@end lilypond
+ @}
+ @}
+ \midi @{
+ \tempo 4 = 75;
+ @}
+@}
+@end example
+
+@center @strong{Zo, goed lieverd?}
+@sp 1
+@center How's, this babe?
+@flushright
+Opus 1.
+@end flushright
+@flushleft
+@sc{Laid back}
+@end flushleft
-Ok, so explain:
+@lilypondfile{os-score.ly}
+First, we need to include the music definitions we made in
+@file{os-music.ly}.
@example
-% #(set! point-and-click #t)
+\include "os-music.ly";
@end example
+In a large orchestral score like this you're bound to make some small
+mistakes, so we enable point and click (See @ref{Point and click})
+editing.
@example
-#(define text-flat '((font-relative-size . -2) (music "accidentals--1")))
+#(set! point-and-click #t)
@end example
+We need a flat sign in text to name the tuning of the french horn, so we
+predefine it with bit of scheme markup text (See @ref{Text markup}).
@example
-staffCombinePianoStaffProperties = @{
+#(define text-flat '((font-relative-size . -2)
+ (music "accidentals--1")))
@end example
+Of course, all staffs are simultaneous and use the same global settings.
@example
-% Coriolan 218-222
+ <
+ \global
@end example
+Then, we start a new staff group for the woodwind section (just the
+flutes in this case). Immediately after that, we start the staff for
+the two flutes, that also play simultaneously.
@example
-flautoI = \notes\relative c'' @{
+ \context StaffGroup = woodwind <
+ \context Staff = flauti <
@end example
+We specify the intrument for MIDI output (see @ref{MIDI instrument
+names}).
@example
- \property Score.currentBarNumber = #218
+ \property Staff.midiInstrument = #"flute"
@end example
+And define the intrument names to be printed in the margin,
+@code{instrument} for the first line of the score, @code{instr} for the
+rest of the score.
@example
-flautoII = \notes\relative c'' @{
+ \property Staff.instrument = "2 Flauti"
+ \property Staff.instr = "Fl."
@end example
-[skip]
-
-
-The hairyness of Staff combining
-
+The flutes play in the default key.
@example
- \property PianoStaff.devNullThread = #'()
+ \Key
@end example
+Last come the actual flute parts. Remember that we're still in
+simultaneous mode. We name both voices differently, so that LilyPond
+will actually create two Voice contexts. The flute parts are simple, so
+we specify manually which voice is which: @code{\voiceOne} forces the
+direction of stems, beams, slurs and ties up, @code{\voiceTwo} sets
+directions down.
@example
- \property PianoStaff.soloADue = ##t
+ \context Voice=one @{ \voiceOne \flautoI @}
+ \context Voice=two @{ \voiceTwo \flautoII @}
@end example
+We close the flutes staff and woodwind staff group.
@example
- \property PianoStaff.soloText = #""
- \property PianoStaff.soloIIText = #""
+ >
+ >
@end example
+The timpani staff only shows a new piece of scheme markup, it sets two
+lines of text.
@example
- % This is non-conventional, but currently it is
- % the only way to tell the difference.
- \property PianoStaff.aDueText = #"\\`a2"
+ \property Staff.instrument = #'(lines "Timpani" "(C-G)")
@end example
+For the trumpets we use the automatic part combiner (see @ref{Automatic
+part combining}) to combine the two simultaneous trumpet parts onto the
+trumpet staff. Each trumpet gets its own Thread context, which must be
+named @code{one} and @code{two}). The part combiner makes these two
+threads share a Voice when they're similar, and splits the threads up
+when they're different.
@example
- \property PianoStaff.splitInterval = #'(1 . 0)
- \property PianoStaff.changeMoment = #`(,(make-moment 1 1) . ,(make-moment 1 1))
+ \context Voice=one \partcombine Voice
+ \context Thread=one \tromboI
+ \context Thread=two \tromboII
@end example
+The french horn has the most complex scheme markup name, made up of two
+lines of text. The second line has two elements (rows), the @code{E}
+and the flat sign @code{text-flat} that we defined before.
@example
- \property PianoStaff.noDirection = ##t
+ \property Staff.instrument = #`(lines "Corno"
+ (rows "(E" ,text-flat ")"))
@end example
-
+The french horn is to be tuned in E-flat, so we tell the MIDI backend to
+transpose this staff by three steps.
@example
-\score @{
- <
+ \property Staff.transposing = #3
@end example
+Therefore, it has a different key.
@example
- \context StaffGroup = wood <
+ \notes \key bes \major;
@end example
+We specify a big indent for the first line and a small linewith for this
+tuturial.
@example
- \context Staff = flauti <
+ indent = 15 * \staffspace;
+ linewidth = 60 * \staffspace;
@end example
+Because we have a Thread representing one instument, we move the
+need the @code{Rest_engraver} from Voice to Thread level.
@example
- \property Staff.midiInstrument = #"flute"
+ \translator@{
+ \ThreadContext
+ \consists "Rest_engraver";
+ @}
+ \translator@{
+ \VoiceContext
+ \remove "Rest_engraver";
+ @}
@end example
+In orchestral scores, it often happens that one instrument has only
+rests during one line of the score. The @code{HaraKiriStaffContext} can
+be used as a regular @code{StaffContext} drop-in and will take care of
+the automatic removing of empty staffs.
@example
- \property Staff.instrument = "2 Flauti"
- \property Staff.instr = "Fl."
+ \translator@{
+ \HaraKiriStaffContext
+ @}
@end example
+We want bar numbering at score level and want to move the bar number a
+few staff spaces up.
@example
- \context Voice=one \partcombine Voice
- \context Thread=one \flautoI
- \context Thread=two \flautoII
- >
+ \translator @{
+ \OrchestralScoreContext
+ BarNumber \override #'padding = #3
+ @}
@end example
-[skip]
+@node Part extraction
+@section Part extraction
-@example
- \property Staff.instrument = #`(lines
- "2 Clarinetti" (rows "(B" ,text-flat ")"))
-@end example
+The third file, @file{os-flute-2.ly} also reads the definitions of the
+first (@file{os-music.ly}), and defines the @code{\score} block for the
+second flute part.
@example
- \property Staff.instr = #`(lines
- "Cl." (rows "(B" ,text-flat ")"))
+\include "os-music.ly";
+\include "paper16.ly";
+
+\score @{
+ \context Staff <
+ \property Staff.midiInstrument = #"flute"
+ \global
+ \Key
+ \flautoII
+ >
+ \header @{
+ instrument = "Flauto II";
+ @}
+ \paper @{
+ linewidth = 80 * \staffspace;
+ textheight = 200 * \staffspace;
+ \translator @{
+ \OrchestralScoreContext
+ skipBars = ##t
+ @}
+ @}
+ \midi @{
+ \tempo 4 = 75;
+ @}
+@}
@end example
+@center @strong{Zo, goed lieverd?}
+@sp 1
+@center How's, this babe?
+@center @emph{Flauto II}
+@flushright
+Opus 1.
+@end flushright
+@flushleft
+@sc{Laid back}
+@end flushleft
+@lilypondfile{os-flute-2.ly}
+
+
+Because we separated the music definitions from the @code{\score}
+instantiations, we can easily define a second score from the music of
+the second flute. This then is the part for the second flute player.
+Of course, we make separate parts for all individual instruments.
+
+In this individual part the second flute has a whole staff for itself,
+so we don't want to force stem or tie directions.
@example
- \property Staff.transposing = #-2
+ \flautoII
@end example
+The @code{\header} definitions were also read from @file{os-music.ly},
+but we need to set the instrument for this particular score.
@example
- \notes \key f \major;
+ \header @{
+ instrument = "Flauto II";
+ @}
@end example
+In the conductor's full score, all bars with rests are printed, but for
+the individual parts, we want to contract pieces of consecutive empty
+bars.
@example
+ skipBars = ##t
@end example
-[the syntax of staff combining]
-[the paper block]
-
@node end of tutorial
@section The end
ac_default_prefix=/usr/local
# Any additions from configure.in:
ac_help="$ac_help
- enable-config=FILE put configure settings in config-FILE.make"
+ --enable-config=CONF put settings in config-CONF.make and config-CONF.h;
+ do \`make conf=CONF' to get output in ./out-CONF"
ac_help="$ac_help
- enable-checking set runtime checks (assert calls). Default: on"
+ --enable-checking set runtime checks (assert calls). Default: on"
ac_help="$ac_help
- enable-optimise use maximal speed optimisations. Default: off"
+ --enable-debugging compile with debugging info. Default: on"
ac_help="$ac_help
- enable-profiling compile with gprof support. Default: off"
+ --enable-optimise use maximal speed optimisations. Default: off"
ac_help="$ac_help
- enable-debugging set debug info. Default: on"
+ --enable-profiling compile with gprof support. Default: off"
ac_help="$ac_help
- enable-mingw-prefix=DIR set the mingw32 directory (standalone windows32 exes)"
+ --enable-mingw-prefix=DIR
+ set the mingw32 directory (standalone windows32 exes)"
ac_help="$ac_help
- with-localedir=LOCALE use LOCALE as locale dir. Default: PREFIX/share/locale "
+ --with-localedir=LOCALE use LOCALE as locale dir. Default:
+ PREFIX/share/locale "
ac_help="$ac_help
- with-lang=LANG use LANG as language to emit messages"
+ --with-lang=LANG use LANG as language to emit messages"
ac_help="$ac_help
- enable-tfm-path=PATH set path of tex directories where tfm files live, esp.: cmr10.tfm. Default: use kpsewhich"
+ --enable-tfm-path=PATH set path of tex directories where tfm files live,
+ esp.: cmr10.tfm. Default: use kpsewhich"
ac_help="$ac_help
- enable-kpathsea use kpathsea lib. Default: on"
+ --with-kpathsea use kpathsea lib. Default: on"
# Initialize some variables set by options.
# The variables have the same names as the options, with
fi
echo $ac_n "checking Package""... $ac_c" 1>&6
-echo "configure:631: checking Package" >&5
+echo "configure:635: checking Package" >&5
if test "x$PACKAGE" = "xSTEPMAKE"; then
echo "$ac_t""Stepmake package!" 1>&6
echo $ac_n "checking builddir""... $ac_c" 1>&6
-echo "configure:636: checking builddir" >&5
+echo "configure:640: checking builddir" >&5
if test "$srcdir" = "."; then
builddir=.
else
echo "$ac_t""$PACKAGE" 1>&6
echo $ac_n "checking builddir""... $ac_c" 1>&6
-echo "configure:674: checking builddir" >&5
+echo "configure:678: checking builddir" >&5
if test "$srcdir" = "."; then
builddir=.
srcdir_build=no
fi
echo $ac_n "checking for stepmake""... $ac_c" 1>&6
-echo "configure:694: checking for stepmake" >&5
+echo "configure:698: checking for stepmake" >&5
# Check for installed stepmake
if test -d $stepmake; then
echo "$ac_t""$stepmake" 1>&6
fi
echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:815: checking host system type" >&5
+echo "configure:819: checking host system type" >&5
host_alias=$host
case "$host_alias" in
# 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:840: checking for $ac_word" >&5
+echo "configure:844: 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
# 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:875: checking for $ac_word" >&5
+echo "configure:879: 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
# 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:912: checking for $ac_word" >&5
+echo "configure:916: 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
# 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:947: checking for $ac_word" >&5
+echo "configure:951: 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
# 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:987: checking for $ac_word" >&5
+echo "configure:991: 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
# 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:1024: checking for $ac_word" >&5
+echo "configure:1028: 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
# 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:1065: checking for $ac_word" >&5
+echo "configure:1069: 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
fi
- # actually, the default is: tja='-O' to get inlining...
- # off='' --jcn
+ # Check whether --enable-debugging or --disable-debugging was given.
+if test "${enable_debugging+set}" = set; then
+ enableval="$enable_debugging"
+ debug_b=$enableval
+fi
+
- #actually, that sucks.
- # tja looks like a typo. Default is optimisation off. --hwn
-
# Check whether --enable-optimise or --disable-optimise was given.
if test "${enable_optimise+set}" = set; then
enableval="$enable_optimise"
fi
- # Check whether --enable-debugging or --disable-debugging was given.
-if test "${enable_debugging+set}" = set; then
- enableval="$enable_debugging"
- debug_b=$enableval
-fi
-
-
# Check whether --enable-mingw-prefix or --disable-mingw-prefix was given.
if test "${enable_mingw_prefix+set}" = set; then
enableval="$enable_mingw_prefix"
# 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:1296: checking for $ac_word" >&5
+echo "configure:1294: 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
# 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:1326: checking for $ac_word" >&5
+echo "configure:1324: 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
# 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:1377: checking for $ac_word" >&5
+echo "configure:1375: 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
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1409: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1407: 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.
cat > conftest.$ac_ext << EOF
-#line 1420 "configure"
+#line 1418 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:1425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1423: \"$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
{ 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:1451: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1449: 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:1456: checking whether we are using GNU C" >&5
+echo "configure:1454: 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
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1465: \"$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:1463: \"$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
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1484: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1482: 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
# 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:1531: checking how to run the C preprocessor" >&5
+echo "configure:1529: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 1546 "configure"
+#line 1544 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1552: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1550: \"$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*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 1563 "configure"
+#line 1561 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1569: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1567: \"$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*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 1580 "configure"
+#line 1578 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1586: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1584: \"$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
:
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1614: checking for $ac_hdr" >&5
+echo "configure:1612: 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
-#line 1619 "configure"
+#line 1617 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1624: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1622: \"$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*
done
echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6
-echo "configure:1651: checking whether stat file-mode macros are broken" >&5
+echo "configure:1649: 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 <<EOF
-#line 1656 "configure"
+#line 1654 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/stat.h>
fi
echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
-echo "configure:1716: checking how to run the C++ preprocessor" >&5
+echo "configure:1714: 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
cross_compiling=$ac_cv_prog_cxx_cross
CXXCPP="${CXX-g++} -E"
cat > conftest.$ac_ext <<EOF
-#line 1729 "configure"
+#line 1727 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1734: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1732: \"$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
:
# 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:1771: checking for $ac_word" >&5
+echo "configure:1769: 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
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1803: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:1801: 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.
cat > conftest.$ac_ext << EOF
-#line 1814 "configure"
+#line 1812 "configure"
#include "confdefs.h"
int main(){return(0);}
EOF
-if { (eval echo configure:1819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1817: \"$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
{ 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:1845: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1843: 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:1850: checking whether we are using GNU C++" >&5
+echo "configure:1848: 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
yes;
#endif
EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1859: \"$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:1857: \"$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
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS=
echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:1878: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:1876: 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
ac_safe=`echo "FlexLexer.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for FlexLexer.h""... $ac_c" 1>&6
-echo "configure:1912: checking for FlexLexer.h" >&5
+echo "configure:1910: 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
-#line 1917 "configure"
+#line 1915 "configure"
#include "confdefs.h"
#include <FlexLexer.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1922: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1920: \"$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*
echo $ac_n "checking whether explicit instantiation is needed""... $ac_c" 1>&6
-echo "configure:1973: checking whether explicit instantiation is needed" >&5
+echo "configure:1971: 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 <<EOF
-#line 1978 "configure"
+#line 1976 "configure"
#include "confdefs.h"
template <class T> struct foo { static int baz; };
return foo<int>::baz;
; return 0; }
EOF
-if { (eval echo configure:1988: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1986: \"$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
# 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:2015: checking for $ac_word" >&5
+echo "configure:2013: 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
# 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:2058: checking for $ac_word" >&5
+echo "configure:2056: 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
# 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:2093: checking for $ac_word" >&5
+echo "configure:2091: 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
# 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:2161: checking for $ac_word" >&5
+echo "configure:2159: 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
# 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:2194: checking for $ac_word" >&5
+echo "configure:2192: 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
echo $ac_n "checking language""... $ac_c" 1>&6
-echo "configure:2250: checking language" >&5
+echo "configure:2248: checking language" >&5
case "$language" in
En* | en* | Am* | am* | US* | us*)
lang=English;;
echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6
-echo "configure:2286: checking for gettext in -lintl" >&5
+echo "configure:2284: 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
ac_save_LIBS="$LIBS"
LIBS="-lintl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2294 "configure"
+#line 2292 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
gettext()
; return 0; }
EOF
-if { (eval echo configure:2308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2306: \"$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
for ac_func in gettext
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2338: checking for $ac_func" >&5
+echo "configure:2336: 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 <<EOF
-#line 2343 "configure"
+#line 2341 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:2369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2367: \"$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
# 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:2401: checking for $ac_word" >&5
+echo "configure:2399: 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
test -n "$MSGFMT" || MSGFMT="\$(SHELL) \$(step-bindir)/fake-msgfmt.sh "
echo $ac_n "checking whether msgfmt accepts -o""... $ac_c" 1>&6
-echo "configure:2432: checking whether msgfmt accepts -o" >&5
+echo "configure:2430: 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
# 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:2460: checking for $ac_word" >&5
+echo "configure:2458: 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
# 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:2496: checking for $ac_word" >&5
+echo "configure:2494: 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
# 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:2534: checking for $ac_word" >&5
+echo "configure:2532: 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
# 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:2570: checking for $ac_word" >&5
+echo "configure:2568: 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
# 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:2609: checking for $ac_word" >&5
+echo "configure:2607: 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
# 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:2645: checking for $ac_word" >&5
+echo "configure:2643: 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
# 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:2683: checking for $ac_word" >&5
+echo "configure:2681: 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
# 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:2719: checking for $ac_word" >&5
+echo "configure:2717: 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
fi
echo $ac_n "checking for working metafont mode""... $ac_c" 1>&6
-echo "configure:2753: checking for working metafont mode" >&5
+echo "configure:2751: 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
echo "$ac_t""$MFMODE" 1>&6
echo $ac_n "checking for mfplain.mp""... $ac_c" 1>&6
-echo "configure:2764: checking for mfplain.mp" >&5
+echo "configure:2762: checking for mfplain.mp" >&5
#
# For now let people define these in their environments
#
echo "$ac_t""$MFPLAIN_MP" 1>&6
echo $ac_n "checking for inimetapost flags""... $ac_c" 1>&6
-echo "configure:2772: checking for inimetapost flags" >&5
+echo "configure:2770: checking for inimetapost flags" >&5
if test ${INIMETAPOST} = "inimp" ; then
: ${INIMETAPOST_FLAGS=''}
else
# 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:2805: checking for $ac_word" >&5
+echo "configure:2803: 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
test -n "$KPSEWHICH" || KPSEWHICH="no"
echo $ac_n "checking for tfm path""... $ac_c" 1>&6
-echo "configure:2836: checking for tfm path" >&5
+echo "configure:2834: checking for tfm path" >&5
TFM_FONTS="cmr msam"
## 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:2864: checking "for guile-config"" >&5
+echo "configure:2862: 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:2870: checking "if we are cross compiling"" >&5
+echo "configure:2868: checking "if we are cross compiling"" >&5
guile_config=error
else
break
exit 1
fi
echo $ac_n "checking "Guile version"""... $ac_c" 1>&6
-echo "configure:2881: checking "Guile version"" >&5
+echo "configure:2879: 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}'`
## The GUILE_FLAGS macro.
echo $ac_n "checking for Guile""... $ac_c" 1>&6
-echo "configure:2900: checking for Guile" >&5
+echo "configure:2898: 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; }
# 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:2915: checking for $ac_word" >&5
+echo "configure:2913: 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
kpathsea_b=yes
- # Check whether --enable-kpathsea or --disable-kpathsea was given.
-if test "${enable_kpathsea+set}" = set; then
- enableval="$enable_kpathsea"
+ # Check whether --with-kpathsea or --without-kpathsea was given.
+if test "${with_kpathsea+set}" = set; then
+ withval="$with_kpathsea"
kpathsea_b=$enableval
fi
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2965: checking for $ac_hdr" >&5
+echo "configure:2963: 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
-#line 2970 "configure"
+#line 2968 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2975: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2973: \"$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*
done
echo $ac_n "checking for kpse_find_file in -lkpathsea""... $ac_c" 1>&6
-echo "configure:3002: checking for kpse_find_file in -lkpathsea" >&5
+echo "configure:3000: 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
ac_save_LIBS="$LIBS"
LIBS="-lkpathsea $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 3010 "configure"
+#line 3008 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
kpse_find_file()
; return 0; }
EOF
-if { (eval echo configure:3024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3022: \"$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
for ac_func in kpse_find_file
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3057: checking for $ac_func" >&5
+echo "configure:3055: 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 <<EOF
-#line 3062 "configure"
+#line 3060 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:3088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3086: \"$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
fi
echo $ac_n "checking whether to use kpathsea""... $ac_c" 1>&6
-echo "configure:3117: checking whether to use kpathsea" >&5
+echo "configure:3115: checking whether to use kpathsea" >&5
if test $kpathsea_b = yes; then
echo "$ac_t""yes" 1>&6
KPATHSEA=1
# 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:3138: checking for $ac_word" >&5
+echo "configure:3136: 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
echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
-echo "configure:3179: checking for 8-bit clean memcmp" >&5
+echo "configure:3177: 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
ac_cv_func_memcmp_clean=no
else
cat > conftest.$ac_ext <<EOF
-#line 3187 "configure"
+#line 3185 "configure"
#include "confdefs.h"
#ifdef __cplusplus
extern "C" void exit(int);
}
EOF
-if { (eval echo configure:3200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3198: \"$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
test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}"
echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:3218: checking for vprintf" >&5
+echo "configure:3216: 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 <<EOF
-#line 3223 "configure"
+#line 3221 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char vprintf(); below. */
; return 0; }
EOF
-if { (eval echo configure:3249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3247: \"$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
if test "$ac_cv_func_vprintf" != yes; then
echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:3273: checking for _doprnt" >&5
+echo "configure:3271: 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 <<EOF
-#line 3278 "configure"
+#line 3276 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char _doprnt(); below. */
; return 0; }
EOF
-if { (eval echo configure:3304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3302: \"$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
for ac_func in memmem snprintf vsnprintf gettext isinf
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3331: checking for $ac_func" >&5
+echo "configure:3329: 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 <<EOF
-#line 3336 "configure"
+#line 3334 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
; return 0; }
EOF
-if { (eval echo configure:3362: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3360: \"$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
# 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:3401: checking for $ac_word" >&5
+echo "configure:3399: 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
# Extract the first word of "perl", so it can be a program name with args.
set dummy perl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3434: checking for $ac_word" >&5
+echo "configure:3432: 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
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-03-06 12:36+0100\n"
+"POT-Creation-Date: 2001-03-16 09:44+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: ENCODING\n"
-#: ly2dvi.py:67 main.cc:95 main.cc:109
+#: ly2dvi.py:74 main.cc:95 main.cc:109
msgid "this help"
msgstr ""
-#: ly2dvi.py:68
+#: ly2dvi.py:75
msgid "change global setting KEY to VAL"
msgstr ""
-#: ly2dvi.py:69
+#: ly2dvi.py:76
msgid "generate PostScript output"
msgstr ""
-#: ly2dvi.py:70
+#: ly2dvi.py:77
msgid "keep all output, and name the directory ly2dvi.dir"
msgstr ""
-#: ly2dvi.py:71
+#: ly2dvi.py:78
msgid "don't run LilyPond"
msgstr ""
-#: ly2dvi.py:72 main.cc:104 main.cc:119
+#: ly2dvi.py:79 main.cc:104 main.cc:119
msgid "print version number"
msgstr ""
-#: ly2dvi.py:73 main.cc:106 main.cc:121
+#: ly2dvi.py:80 main.cc:106 main.cc:121
msgid "show warranty and copyright"
msgstr ""
-#: ly2dvi.py:74
+#: ly2dvi.py:81
msgid "dump all final output into DIR"
msgstr ""
-#: ly2dvi.py:75 main.cc:113
+#: ly2dvi.py:82 main.cc:113
msgid "write Makefile dependencies for every input file"
msgstr ""
-#: ly2dvi.py:101
+#: data-file.cc:118 input.cc:85 ly2dvi.py:108 midi-parser.cc:100 warn.cc:23
+msgid "warning: "
+msgstr ""
+
+#: input.cc:90 ly2dvi.py:113 ly2dvi.py:247 warn.cc:9 warn.cc:17
+msgid "error: "
+msgstr ""
+
+#: ly2dvi.py:115
msgid "Exiting ... "
msgstr ""
-#: ly2dvi.py:120
+#: ly2dvi.py:134
#, c-format
msgid "Reading `%s'"
msgstr ""
-#: ly2dvi.py:124 mapped-file-storage.cc:87 mudela-stream.cc:111
+#: ly2dvi.py:138 mapped-file-storage.cc:87 mudela-stream.cc:111
#: paper-stream.cc:40 scores.cc:48 simple-file-storage.cc:44 text-stream.cc:23
#, c-format
msgid "can't open file: `%s'"
msgstr ""
-#: ly2dvi.py:187
+#: ly2dvi.py:201
#, c-format
msgid "Usage: %s [OPTION]... FILE"
msgstr ""
-#: ly2dvi.py:189
+#: ly2dvi.py:203
msgid "Generate .dvi with LaTeX for LilyPond"
msgstr ""
-#: ly2dvi.py:191 main.cc:119 main.cc:151
+#: ly2dvi.py:205 main.cc:119 main.cc:151
msgid "Options:"
msgstr ""
-#: data-file.cc:118 input.cc:85 ly2dvi.py:195 midi-parser.cc:100 warn.cc:23
-msgid "warning: "
-msgstr ""
-
-#: ly2dvi.py:196
+#: ly2dvi.py:209
msgid "all output is written in the CURRENT directory"
msgstr ""
-#: ly2dvi.py:198 main.cc:123 main.cc:174
+#: ly2dvi.py:211 main.cc:123 main.cc:174
#, c-format
msgid "Report bugs to %s"
msgstr ""
-#: ly2dvi.py:230
+#: ly2dvi.py:243
#, c-format
msgid "Invoking `%s'"
msgstr ""
-#: input.cc:90 ly2dvi.py:234 warn.cc:9 warn.cc:17
-msgid "error: "
-msgstr ""
-
-#: ly2dvi.py:234
+#: ly2dvi.py:247
#, c-format
msgid "command exited with value %d"
msgstr ""
-#: ly2dvi.py:236
+#: ly2dvi.py:249
msgid "(ignored)"
msgstr ""
-#: ly2dvi.py:277
+#: ly2dvi.py:278
+#, c-format
+msgid "invalid value: %s"
+msgstr ""
+
+#: ly2dvi.py:284
+#, c-format
+msgid "no such setting: %s"
+msgstr ""
+
+#: ly2dvi.py:292
#, c-format
msgid "Analyzing `%s'"
msgstr ""
-#: ly2dvi.py:539 scores.cc:44
+#: ly2dvi.py:336
+#, c-format
+msgid "no lilypond output found for %s"
+msgstr ""
+
+#: ly2dvi.py:568 scores.cc:44
#, c-format
msgid "dependencies output to %s..."
msgstr ""
-#: ly2dvi.py:540
+#: ly2dvi.py:569
#, c-format
msgid "%s file left in `%s'"
msgstr ""
msgid "invalid inversion pitch: not part of chord: %s"
msgstr ""
-#: chord-tremolo-engraver.cc:141
+#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:162
msgid "unterminated chord tremolo"
msgstr ""
msgid "no one to print a tremolos"
msgstr ""
-#: collision.cc:116
+#: collision.cc:118
msgid "Too many clashing notecolumns. Ignoring them."
msgstr ""
msgid "already have a decrescendo"
msgstr ""
-#: dynamic-engraver.cc:307
+#: dynamic-engraver.cc:315
msgid "unterminated (de)crescendo"
msgstr ""
msgid "Transposition by %s makes accidental larger than two"
msgstr ""
-#: music.cc:222
+#: music.cc:226
msgid "ly_get_mus_property (): Not a Music"
msgstr ""
-#: music.cc:236
+#: music.cc:240
msgid "ly_set_mus_property (): Not a symbol"
msgstr ""
-#: music.cc:248
+#: music.cc:252
msgid "ly_set_mus_property (): not of type Music"
msgstr ""
+#: music.cc:266
+msgid "ly_make_music (): Not a string"
+msgstr ""
+
#: music-output-def.cc:115
#, c-format
msgid "can't find `%s' context"
msgid "Parsing..."
msgstr ""
-#: my-lily-parser.cc:55
+#: my-lily-parser.cc:57
msgid "Braces don't match"
msgstr ""
msgid "Preprocessing elements..."
msgstr ""
-#: paper-score.cc:113
+#: paper-score.cc:114
msgid "Outputting Score, defined at: "
msgstr ""
msgid "none of these in my family: `%s'"
msgstr ""
+#: percent-repeat-engraver.cc:108
+msgid "Don't know yet how to handle this percent repeat."
+msgstr ""
+
+#: percent-repeat-iterator.cc:53
+msgid "no one to print a percent"
+msgstr ""
+
#: performance.cc:51
msgid "Track ... "
msgstr ""
msgid "elapsed time: %.2f seconds"
msgstr ""
-#: score-engraver.cc:177
+#: score-engraver.cc:183
#, c-format
msgid "unbound spanner `%s'"
msgstr ""
msgid "unterminated slur"
msgstr ""
-#: slur-engraver.cc:142
+#. How to shut up this warning, when Voice_devnull_engraver has
+#. eaten start request?
+#: slur-engraver.cc:144
msgid "can't find start of slur"
msgstr ""
msgid "can't find ascii character: %d"
msgstr ""
-#: tfm-reader.cc:105
+#: tfm-reader.cc:106
#, c-format
-msgid "TFM header of `%s' has only %u word(s)"
+msgid "TFM header of `%s' has only %u word (s)"
msgstr ""
-#: tfm-reader.cc:139
+#: tfm-reader.cc:140
#, c-format
msgid "%s: TFM file has %u parameters, which is more than the %u I can handle"
msgstr ""
-#: tie-engraver.cc:211 tie-performer.cc:173
+#. How to shut up this warning, when no notes appeared because
+#. they were suicided by Thread_devnull_engraver?
+#: tie-engraver.cc:213 tie-performer.cc:173
msgid "No ties were created!"
msgstr ""
-#: tie-engraver.cc:230
+#: tie-engraver.cc:232
msgid "lonely tie"
msgstr ""
msgid "Oldest supported input version: %s"
msgstr ""
-#: parser.yy:471
+#: parser.yy:472
msgid "Wrong type for property value"
msgstr ""
-#: parser.yy:666
+#: parser.yy:667
msgid "More alternatives than repeats. Junking excess alternatives."
msgstr ""
-#: parser.yy:730
+#: parser.yy:731
msgid "Second argument must be a symbol"
msgstr ""
-#: parser.yy:735
+#: parser.yy:736
msgid "First argument must be a procedure taking 1 argument"
msgstr ""
-#: parser.yy:1211
+#: parser.yy:1212
msgid "Expecting string as script definition"
msgstr ""
-#: parser.yy:1221
+#: parser.yy:1222
msgid "Can't specify direction for this request"
msgstr ""
msgid "Must be positive integer"
msgstr ""
-#: lexer.ll:165
+#: lexer.ll:166
msgid "EOF found inside a comment"
msgstr ""
-#: lexer.ll:179
+#: lexer.ll:180
msgid "\\maininput disallowed outside init files"
msgstr ""
-#: lexer.ll:203
+#: lexer.ll:204
#, c-format
msgid "wrong or undefined identifier: `%s'"
msgstr ""
#. backup rule
-#: lexer.ll:208
+#: lexer.ll:209
msgid "Missing end quote"
msgstr ""
#. backup rule
-#: lexer.ll:230 lexer.ll:234
+#: lexer.ll:231 lexer.ll:235
msgid "white expected"
msgstr ""
-#: lexer.ll:243
+#: lexer.ll:244
msgid "Can't evaluate Scheme in safe mode"
msgstr ""
-#: lexer.ll:335
+#: lexer.ll:336
msgid "Brace found at end of lyric. Did you forget a space?"
msgstr ""
-#: lexer.ll:439
+#: lexer.ll:440
#, c-format
msgid "invalid character: `%c'"
msgstr ""
-#: lexer.ll:520
+#: lexer.ll:521
#, c-format
msgid "unknown escaped string: `\\%s'"
msgstr ""
-#: lexer.ll:602
+#: lexer.ll:603
#, c-format
msgid "incorrect lilypond version: %s (%s, %s)"
msgstr ""
-#: lexer.ll:603
+#: lexer.ll:604
msgid "Consider converting the input with the convert-ly script"
msgstr ""
msgid ""
msgstr ""
"Project-Id-Version: lilypond 1.3.59\n"
-"POT-Creation-Date: 2001-03-06 12:36+0100\n"
+"POT-Creation-Date: 2001-03-16 09:44+0100\n"
"PO-Revision-Date: 2000-06-09 02:23+0200\n"
"Last-Translator: Jan Nieuwenhuizen <janneke@gnu.org>\n"
"Language-Team: Dutch <nl@li.org>\n"
"Content-Transfer-Encoding: 8bit\n"
"Date: 1998-05-26 11:26:28+0200\n"
"From: <janneke@gnu.org>\n"
-"Xgettext-Options: --c++ --default-domain=lilypond --join --output-dir=../po "
-"--add-comments --keyword=_\n"
+"Xgettext-Options: --c++ --default-domain=lilypond --join --output-dir=../po --add-comments --keyword=_\n"
"Files: bow.cc int.cc\n"
-#: ly2dvi.py:67 main.cc:95 main.cc:109
+#: ly2dvi.py:74 main.cc:95 main.cc:109
msgid "this help"
msgstr "deze hulp"
-#: ly2dvi.py:68
+#: ly2dvi.py:75
msgid "change global setting KEY to VAL"
msgstr "verander globale instelling SLEUTEL in WAARDE"
-#: ly2dvi.py:69
+#: ly2dvi.py:76
msgid "generate PostScript output"
msgstr "genereer PostScipt uitvoer"
-#: ly2dvi.py:70
+#: ly2dvi.py:77
msgid "keep all output, and name the directory ly2dvi.dir"
msgstr "bewaar alle uitvoer, en noem de directory ly2dvi.dir"
-#: ly2dvi.py:71
+#: ly2dvi.py:78
msgid "don't run LilyPond"
msgstr "draai LilyPond niet"
-#: ly2dvi.py:72 main.cc:104 main.cc:119
+#: ly2dvi.py:79 main.cc:104 main.cc:119
msgid "print version number"
msgstr "druk versienummer af"
-#: ly2dvi.py:73 main.cc:106 main.cc:121
+#: ly2dvi.py:80 main.cc:106 main.cc:121
msgid "show warranty and copyright"
msgstr "toon garantie en auteursrechten"
-#: ly2dvi.py:74
+#: ly2dvi.py:81
msgid "dump all final output into DIR"
msgstr "dump alle uiteindelijke uivoer in DIR"
-#: ly2dvi.py:75 main.cc:113
+#: ly2dvi.py:82 main.cc:113
msgid "write Makefile dependencies for every input file"
msgstr "schrijf Makefile afhankelijkheden voor elk invoerbestand"
-#: ly2dvi.py:101
+#: data-file.cc:118 input.cc:85 ly2dvi.py:108 midi-parser.cc:100 warn.cc:23
+msgid "warning: "
+msgstr "waarschuwing: "
+
+#: input.cc:90 ly2dvi.py:113 ly2dvi.py:247 warn.cc:9 warn.cc:17
+msgid "error: "
+msgstr "fout: "
+
+#: ly2dvi.py:115
msgid "Exiting ... "
msgstr "Beëidigen ..."
-#: ly2dvi.py:120
+#: ly2dvi.py:134
#, c-format
msgid "Reading `%s'"
msgstr "Inlezen `%s'"
-#: ly2dvi.py:124 mapped-file-storage.cc:87 mudela-stream.cc:111
+#: ly2dvi.py:138 mapped-file-storage.cc:87 mudela-stream.cc:111
#: paper-stream.cc:40 scores.cc:48 simple-file-storage.cc:44 text-stream.cc:23
#, c-format
msgid "can't open file: `%s'"
msgstr "kan bestand niet openen: `%s'"
-#: ly2dvi.py:187
+#: ly2dvi.py:201
#, c-format
msgid "Usage: %s [OPTION]... FILE"
msgstr "Gebruik: %s [OPTIE]... BESTAND"
-#: ly2dvi.py:189
+#: ly2dvi.py:203
msgid "Generate .dvi with LaTeX for LilyPond"
msgstr "Genereer .dvi met LaTeX voor LilyPond"
-#: ly2dvi.py:191 main.cc:119 main.cc:151
+#: ly2dvi.py:205 main.cc:119 main.cc:151
msgid "Options:"
msgstr "Opties:"
-#: data-file.cc:118 input.cc:85 ly2dvi.py:195 midi-parser.cc:100 warn.cc:23
-msgid "warning: "
-msgstr "waarschuwing: "
-
-#: ly2dvi.py:196
+#: ly2dvi.py:209
msgid "all output is written in the CURRENT directory"
msgstr "alle uitvoer wordt naar HUIDIGE directory geschreven"
-#: ly2dvi.py:198 main.cc:123 main.cc:174
+#: ly2dvi.py:211 main.cc:123 main.cc:174
#, c-format
msgid "Report bugs to %s"
msgstr ""
"Meld luizen in het programma aan %s;\n"
"meld onjuistheden in de vertaling aan <janneke@gnu.org> of <hanwen@cs.uu.nl>"
-#: ly2dvi.py:230
+#: ly2dvi.py:243
#, c-format
msgid "Invoking `%s'"
msgstr "Uitvoeren `%s'"
-#: input.cc:90 ly2dvi.py:234 warn.cc:9 warn.cc:17
-msgid "error: "
-msgstr "fout: "
-
-#: ly2dvi.py:234
+#: ly2dvi.py:247
#, c-format
msgid "command exited with value %d"
msgstr "opdracht eindigde met waarde %d"
-#: ly2dvi.py:236
+#: ly2dvi.py:249
msgid "(ignored)"
msgstr "(genegeerd)"
-#: ly2dvi.py:277
+#: ly2dvi.py:278
+#, c-format
+msgid "invalid value: %s"
+msgstr "ongeldige waarde: %s"
+
+#: ly2dvi.py:284
+#, c-format
+msgid "no such setting: %s"
+msgstr "geen dergelijke instelling: %s"
+
+#: ly2dvi.py:292
#, c-format
msgid "Analyzing `%s'"
msgstr "Analyseren `%s'"
-#: ly2dvi.py:539 scores.cc:44
+#: ly2dvi.py:336
+#, c-format
+msgid "no lilypond output found for %s"
+msgstr "geen lilypond uitvoer gevonden voor %s"
+
+#: ly2dvi.py:568 scores.cc:44
#, c-format
msgid "dependencies output to %s..."
msgstr "afhankelijkheden uitvoer naar %s..."
-#: ly2dvi.py:540
+#: ly2dvi.py:569
#, c-format
msgid "%s file left in `%s'"
msgstr "%s bestand achtergelaten in `%s'"
msgid "invalid inversion pitch: not part of chord: %s"
msgstr "ongeldige inversie toon: geen onderdeel van accoord: %s"
-#: chord-tremolo-engraver.cc:141
+#: chord-tremolo-engraver.cc:141 percent-repeat-engraver.cc:162
msgid "unterminated chord tremolo"
msgstr "onbeëindigd akkoordtremolo"
msgid "no one to print a tremolos"
msgstr "niemand om tremolos af te drukken"
-#: collision.cc:116
+#: collision.cc:118
msgid "Too many clashing notecolumns. Ignoring them."
msgstr "Te veel botsende nootkolommen. Negeer ze."
msgid "already have a decrescendo"
msgstr "heb al een decrescendo"
-#: dynamic-engraver.cc:307
+#: dynamic-engraver.cc:315
msgid "unterminated (de)crescendo"
msgstr "onbeëindigd (de)crescendo"
msgid "Transposition by %s makes accidental larger than two"
msgstr "Transponering van %s geeft tripel kruizen/mollen"
-#: music.cc:222
+#: music.cc:226
msgid "ly_get_mus_property (): Not a Music"
msgstr "ly_get_mus_property (): Geen Muziek"
-#: music.cc:236
+#: music.cc:240
msgid "ly_set_mus_property (): Not a symbol"
msgstr "ly_set_mus_property (): Geen symbool"
-#: music.cc:248
+#: music.cc:252
msgid "ly_set_mus_property (): not of type Music"
msgstr "ly_set_mus_property (): niet van type Muziek"
+#: music.cc:266
+msgid "ly_make_music (): Not a string"
+msgstr "ly_make_music (): Geen string"
+
#: music-output-def.cc:115
#, c-format
msgid "can't find `%s' context"
msgid "Parsing..."
msgstr "Ontleden..."
-#: my-lily-parser.cc:55
+#: my-lily-parser.cc:57
msgid "Braces don't match"
msgstr "Haakjes paren niet"
msgid "Preprocessing elements..."
msgstr "Voorbewerken van elementen..."
-#: paper-score.cc:113
+#: paper-score.cc:114
msgid "Outputting Score, defined at: "
msgstr "Uitvoer van Score, gedefinieerd op: "
msgid "none of these in my family: `%s'"
msgstr "geen van deze in mijn gezin: `%s'"
+#: percent-repeat-engraver.cc:108
+msgid "Don't know yet how to handle this percent repeat."
+msgstr "Weet nog niet hoe deze procent herhaling af te handelen."
+
+#: percent-repeat-iterator.cc:53
+msgid "no one to print a percent"
+msgstr "niemand om een procent herhaling af te drukken"
+
#: performance.cc:51
msgid "Track ... "
msgstr "Spoor ... "
msgid "elapsed time: %.2f seconds"
msgstr "duur: %.2f seconden"
-#: score-engraver.cc:177
+#: score-engraver.cc:183
#, c-format
msgid "unbound spanner `%s'"
msgstr "ongebonden spanner `%s'"
msgid "unterminated slur"
msgstr "onbeëindigde bindingsboog"
-#: slur-engraver.cc:142
+#. How to shut up this warning, when Voice_devnull_engraver has
+#. eaten start request?
+#: slur-engraver.cc:144
msgid "can't find start of slur"
msgstr "kan start van bindingsboog niet vinden"
msgid "can't find ascii character: %d"
msgstr "kan ascii teken niet vinden: %d"
-#: tfm-reader.cc:105
+#: tfm-reader.cc:106
#, c-format
-msgid "TFM header of `%s' has only %u word(s)"
+msgid "TFM header of `%s' has only %u word (s)"
msgstr "TFM kop van `%s' heeft slechts %u woord(en)"
-#: tfm-reader.cc:139
+#: tfm-reader.cc:140
#, c-format
msgid "%s: TFM file has %u parameters, which is more than the %u I can handle"
msgstr ""
"%s: TFM bestand heeft %u parameters, wat meer is dan de %u die ik aan kan"
-#: tie-engraver.cc:211 tie-performer.cc:173
+#. How to shut up this warning, when no notes appeared because
+#. they were suicided by Thread_devnull_engraver?
+#: tie-engraver.cc:213 tie-performer.cc:173
msgid "No ties were created!"
msgstr "Geen overbindingen geschapen!"
-#: tie-engraver.cc:230
+#: tie-engraver.cc:232
msgid "lonely tie"
msgstr "eenzame overbinding"
msgid "Oldest supported input version: %s"
msgstr "Oudst ondersteunde invoerversie: %s"
-#: parser.yy:471
+#: parser.yy:472
msgid "Wrong type for property value"
msgstr "Verkeerd type voor property waarde"
-#: parser.yy:666
+#: parser.yy:667
msgid "More alternatives than repeats. Junking excess alternatives."
msgstr ""
"Meer alternatieven dan herhalingen. Schroot overvloedige alternatieven."
-#: parser.yy:730
+#: parser.yy:731
msgid "Second argument must be a symbol"
msgstr "Tweede argument moet een symbool zijn"
-#: parser.yy:735
+#: parser.yy:736
msgid "First argument must be a procedure taking 1 argument"
msgstr "Eerste argument moet een procedure zijn met 1 argument"
-#: parser.yy:1211
+#: parser.yy:1212
msgid "Expecting string as script definition"
msgstr "Verwacht string voor script definitie"
-#: parser.yy:1221
+#: parser.yy:1222
msgid "Can't specify direction for this request"
msgstr "Kan richting voor dit verzoek niet specificeren"
msgid "Must be positive integer"
msgstr "Moet positieve integer zijn"
-#: lexer.ll:165
+#: lexer.ll:166
msgid "EOF found inside a comment"
msgstr "EOF gevonden in een kommentaar"
-#: lexer.ll:179
+#: lexer.ll:180
msgid "\\maininput disallowed outside init files"
msgstr "\\maininput niet toegestaan buiten init bestanden"
-#: lexer.ll:203
+#: lexer.ll:204
#, c-format
msgid "wrong or undefined identifier: `%s'"
msgstr "verkeerde of ongedefiniëerde identifier: `%s'"
#. backup rule
-#: lexer.ll:208
+#: lexer.ll:209
msgid "Missing end quote"
msgstr "Aanhalingsteken sluiten mist"
#. backup rule
-#: lexer.ll:230 lexer.ll:234
+#: lexer.ll:231 lexer.ll:235
msgid "white expected"
msgstr "wit verwacht"
-#: lexer.ll:243
+#: lexer.ll:244
msgid "Can't evaluate Scheme in safe mode"
msgstr "Kan Scheme niet evalueren in veilige modus"
-#: lexer.ll:335
+#: lexer.ll:336
msgid "Brace found at end of lyric. Did you forget a space?"
msgstr "Accolade gevonden aan het eind van liedtektst. Een spatie vergeten?"
-#: lexer.ll:439
+#: lexer.ll:440
#, c-format
msgid "invalid character: `%c'"
msgstr "ongeldig teken: `%c'"
-#: lexer.ll:520
+#: lexer.ll:521
#, c-format
msgid "unknown escaped string: `\\%s'"
msgstr "onbekende ontsnapte string: `\\%s'"
-#: lexer.ll:602
+#: lexer.ll:603
#, c-format
msgid "incorrect lilypond version: %s (%s, %s)"
msgstr "verkeerde lilypond versie: %s (%s, %s)"
-#: lexer.ll:603
+#: lexer.ll:604
msgid "Consider converting the input with the convert-ly script"
msgstr "Overweeg de invoer te converteren met het convert-ly script"
# Note: gettext work best if we use ' for docstrings and "
# for gettextable strings
-''' TODO: --dependencies
+'''
+TODO:
+
+ * --dependencies
+
+ * dvi from lilypond .tex output? This is hairy, because we create dvi
+ from lilypond .tex *and* header output.
'''
'''Make the progress messages stand out between lilypond stuff'''
# Why should they have to stand out? Blend in would be nice too.
sys.stderr.write ('*** ' + s+ '\n')
+
+def warning (s):
+ sys.stderr.write (_ ("warning: ") + s)
+ sys.stderr.write ('\n')
+
def error (s):
- sys.stderr.write (s)
+ sys.stderr.write (_ ("error: ") + s)
+ sys.stderr.write ('\n')
raise _ ("Exiting ... ")
sys.stdout.write ('\n')
sys.stdout.write (options_help_str (option_definitions))
sys.stdout.write ('\n\n')
- sys.stdout.write (_ ("warning: "))
- sys.stdout.write (_ ("all output is written in the CURRENT directory"))
- sys.stdout.write ('\n\n')
+ warning (_ ("all output is written in the CURRENT directory"))
+ sys.stdout.write ('\n')
sys.stdout.write (_ ("Report bugs to %s") % 'bug-gnu-music@gnu.org')
sys.stdout.write ('\n')
sys.exit (0)
temp_dir = tempfile.mktemp ('ly2dvi')
try:
- os.mkdir (temp_dir)
+ os.mkdir (temp_dir, 0777)
except OSError:
pass
try:
val = string.atof (val)
except ValueError:
+ warning (_ ("invalid value: %s") % `val`)
pass
try:
dict[key].append (val)
except KeyError:
+ warning (_ ("no such setting: %s") % `key`)
dict[key] = [val]
x = 0
while 1:
fname = os.path.basename (f)
- fname = os.path.splitext (fname)[0]
+ fname = strip_ly_suffix (fname)
if x:
fname = fname + '-%d' % x
else:
break
- x = x +1
+ x = x + 1
+ if not x:
+ warning (_ ("no lilypond output found for %s") % `files`)
return tfiles
def one_latex_definition (defn, first):
orientation = 'portrait'
if extra['orientation']:
orientation = extra['orientation'][0]
-
- s = s + '\geometry{width=%spt%s,headheight=2mm,headsep=0pt,footskip=2mm,%s}\n' % (extra['linewidth'][0], textheight, orientation)
+
+ # set sane geometry width (a4-width) for linewidth = -1.
+ linewidth = extra['linewidth'][0]
+ if linewidth < 0:
+ linewidth = 597
+ s = s + '\geometry{width=%spt%s,headheight=2mm,headsep=0pt,footskip=2mm,%s}\n' % (linewidth, textheight, orientation)
s= s + r'''
\usepackage[latin1]{inputenc}
if track_dependencies_p:
generate_dependency_file (depfile, dest)
+ os.chdir (original_dir)
cleanup_temp ()
# most insteresting info last
ac_default_prefix=/usr/local
# Any additions from configure.in:
ac_help="$ac_help
- enable-config=FILE put configure settings in config-FILE.make"
+ --enable-config=CONF put settings in config-CONF.make and config-CONF.h;
+ do \`make conf=CONF' to get output in ./out-CONF"
ac_help="$ac_help
- with-localedir=LOCALE use LOCALE as locale dir. Default: PREFIX/share/locale "
+ --with-localedir=LOCALE use LOCALE as locale dir. Default:
+ PREFIX/share/locale "
ac_help="$ac_help
- with-lang=LANG use LANG as language to emit messages"
+ --with-lang=LANG use LANG as language to emit messages"
# Initialize some variables set by options.
# The variables have the same names as the options, with
fi
echo $ac_n "checking Package""... $ac_c" 1>&6
-echo "configure:617: checking Package" >&5
+echo "configure:619: checking Package" >&5
if test "x$PACKAGE" = "xSTEPMAKE"; then
echo "$ac_t""Stepmake package!" 1>&6
echo $ac_n "checking builddir""... $ac_c" 1>&6
-echo "configure:622: checking builddir" >&5
+echo "configure:624: checking builddir" >&5
if test "$srcdir" = "."; then
builddir=.
else
echo "$ac_t""$PACKAGE" 1>&6
echo $ac_n "checking builddir""... $ac_c" 1>&6
-echo "configure:660: checking builddir" >&5
+echo "configure:662: checking builddir" >&5
if test "$srcdir" = "."; then
builddir=.
srcdir_build=no
fi
echo $ac_n "checking for stepmake""... $ac_c" 1>&6
-echo "configure:680: checking for stepmake" >&5
+echo "configure:682: checking for stepmake" >&5
# Check for installed stepmake
if test -d $stepmake; then
echo "$ac_t""$stepmake" 1>&6
fi
echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:801: checking host system type" >&5
+echo "configure:803: checking host system type" >&5
host_alias=$host
case "$host_alias" in
# 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:826: checking for $ac_word" >&5
+echo "configure:828: 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
# 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:861: checking for $ac_word" >&5
+echo "configure:863: 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
# 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:898: checking for $ac_word" >&5
+echo "configure:900: 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
# 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:933: checking for $ac_word" >&5
+echo "configure:935: 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
# 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:973: checking for $ac_word" >&5
+echo "configure:975: 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
# 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:1010: checking for $ac_word" >&5
+echo "configure:1012: 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
# 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:1051: checking for $ac_word" >&5
+echo "configure:1053: 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
echo $ac_n "checking language""... $ac_c" 1>&6
-echo "configure:1224: checking language" >&5
+echo "configure:1226: checking language" >&5
case "$language" in
En* | en* | Am* | am* | US* | us*)
lang=English;;
# 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:1259: checking for $ac_word" >&5
+echo "configure:1261: 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