From c64a05795e51367c17589a9e7d60bad426305159 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Tue, 8 Dec 1998 15:17:56 +0100 Subject: [PATCH] release: 1.1.13 --- Documentation/faq.yo | 2 +- Documentation/man/lilypond.yo | 3 + Documentation/man/out/lilypond.1 | 3 + Documentation/tex/engraving.bib | 12 +- Documentation/tex/other-packages.bib | 7 + Documentation/tex/refman.yo | 14 +- Documentation/tex/tutorial.yo | 41 +- Documentation/topdocs/INSTALL.yo | 8 +- INSTALL.txt | 19 +- NEWS | 39 +- TODO | 11 +- VERSION | 4 +- configure | 3615 ++++++++++++++++++++++ init/GNUmakefile | 4 +- init/chord-modifiers.ly | 15 + init/declarations.ly | 1 + init/engraver.ly | 2 +- init/mudela-book-defs.py | 17 + init/nederlands.ly | 1 + init/property.ly | 1 - init/table11.ly | 2 +- init/table13.ly | 5 +- init/table26.ly | 2 +- input/GNUmakefile | 2 +- input/test/c.ly | 51 + input/test/chords.ly | 8 +- input/test/tup.ly | 2 +- input/twinkle-pop.ly | 38 +- lib/simple-file-storage.cc | 8 +- lily/chord-name-engraver.cc | 61 +- lily/includable-lexer.cc | 9 +- lily/include/includable-lexer.hh | 2 + lily/include/lily-guile.hh | 1 + lily/include/main.hh | 2 + lily/include/musical-pitch.hh | 7 +- lily/include/my-lily-lexer.hh | 9 +- lily/include/my-lily-parser.hh | 47 +- lily/lexer.ll | 26 +- lily/lily-guile.cc | 21 +- lily/lookup.cc | 2 +- lily/main.cc | 7 + lily/music-output-def.cc | 5 +- lily/musical-pitch.cc | 16 +- lily/my-lily-lexer.cc | 31 +- lily/my-lily-parser.cc | 71 +- lily/paper-def.cc | 9 +- lily/paper-outputter.cc | 6 + lily/parser.yy | 54 +- lily/tuplet-spanner.cc | 1 + make/out/lelievijver.lsm | 8 +- make/out/lilypond.lsm | 8 +- make/out/lilypond.spec | 4 +- make/toplevel.make.in | 2 +- mf/GNUmakefile | 4 +- mutopia/D.Zipoli/GNUmakefile | 10 + mutopia/D.Zipoli/verso_2.ly | 104 + mutopia/F.Schubert/AnSylvia.ly | 404 +++ mutopia/F.Schubert/GNUmakefile | 10 + mutopia/{ => F.Schubert}/standchen-16.ly | 0 mutopia/{ => F.Schubert}/standchen-20.ly | 0 mutopia/{ => F.Schubert}/standchen.ly | 0 mutopia/GNUmakefile | 4 +- mutopia/Hymns/GNUmakefile | 10 + mutopia/Hymns/diademata.ly | 90 + mutopia/Hymns/laudatedom.ly | 76 + mutopia/Hymns/maccabaeus.ly | 109 + mutopia/Hymns/ode.ly | 74 + mutopia/Hymns/passion.ly | 85 + mutopia/Hymns/stille.ly | 187 ++ scm/GNUmakefile | 14 + scripts/mudela-book.py | 27 +- stepmake/configure | 1807 +++++++++++ 72 files changed, 7139 insertions(+), 222 deletions(-) create mode 100644 init/chord-modifiers.ly create mode 100644 init/mudela-book-defs.py create mode 100644 input/test/c.ly create mode 100644 mutopia/D.Zipoli/GNUmakefile create mode 100644 mutopia/D.Zipoli/verso_2.ly create mode 100644 mutopia/F.Schubert/AnSylvia.ly create mode 100644 mutopia/F.Schubert/GNUmakefile rename mutopia/{ => F.Schubert}/standchen-16.ly (100%) rename mutopia/{ => F.Schubert}/standchen-20.ly (100%) rename mutopia/{ => F.Schubert}/standchen.ly (100%) create mode 100644 mutopia/Hymns/GNUmakefile create mode 100644 mutopia/Hymns/diademata.ly create mode 100644 mutopia/Hymns/laudatedom.ly create mode 100644 mutopia/Hymns/maccabaeus.ly create mode 100644 mutopia/Hymns/ode.ly create mode 100644 mutopia/Hymns/passion.ly create mode 100644 mutopia/Hymns/stille.ly create mode 100644 scm/GNUmakefile diff --git a/Documentation/faq.yo b/Documentation/faq.yo index 5689cfe7bf..1939a8e11f 100644 --- a/Documentation/faq.yo +++ b/Documentation/faq.yo @@ -398,7 +398,7 @@ verb( \melodic { c4 c g g } \paper {} \midi { - \output "myfile.mid"; + output = "myfile.midi"; \tempo 4=70; } } diff --git a/Documentation/man/lilypond.yo b/Documentation/man/lilypond.yo index dc69bc4fe5..45e87bde23 100644 --- a/Documentation/man/lilypond.yo +++ b/Documentation/man/lilypond.yo @@ -35,6 +35,9 @@ dit(-D,--debug) Turn debugging info on. GNU LilyPond reads the file file(.dstreamrc), which lists what functions and classes may produce copious debugging output. +dit(-s,--safe) + Disallow untrusted code(\include) directives, backslashes in TeX() +code and named output. dit(-t,--test) Switch on any experimental features. Not for general public use. dit(-w,--warranty) diff --git a/Documentation/man/out/lilypond.1 b/Documentation/man/out/lilypond.1 index c757203f29..4cea9bf664 100644 --- a/Documentation/man/out/lilypond.1 +++ b/Documentation/man/out/lilypond.1 @@ -28,6 +28,9 @@ Also output rules to be included in Makefile\&. Turn debugging info on\&. GNU LilyPond reads the file \fB\&.dstreamrc\fP, which lists what functions and classes may produce copious debugging output\&. +.IP "-s,--safe" +Disallow untrusted \f(CW\einclude\fP directives, backslashes in +code and named output\&. .IP "-t,--test" Switch on any experimental features\&. Not for general public use\&. .IP "-w,--warranty" diff --git a/Documentation/tex/engraving.bib b/Documentation/tex/engraving.bib index a234775e2e..560647d93b 100644 --- a/Documentation/tex/engraving.bib +++ b/Documentation/tex/engraving.bib @@ -29,7 +29,17 @@ } - +@Book{banter, + author = {Harald Banter}, + title = {Akkord Lexikon}, + publisher = {Schott's S\"ohne}, + year = {1987}, + isbn = {ISBN 3-7957-2095-8}, + note = {Comprehensive overview of commonly used + chords. Suggests (and uses) a unification for all different kinds + of chord names.}, + address = {Mainz, Germany}, +} @Book {read78, diff --git a/Documentation/tex/other-packages.bib b/Documentation/tex/other-packages.bib index 84bda2dcf1..78e2391355 100644 --- a/Documentation/tex/other-packages.bib +++ b/Documentation/tex/other-packages.bib @@ -15,6 +15,13 @@ +@Misc{mosaic, + title = {Mosaic}, +note={Macintosh DTP-notation program}, +publisher={Mark of the Unicorn}, +html={http://www.markoftheunicorn.com/english/software/mosaic/mosaic.html} +} + @Misc{graph_music_press, title = {Graphire Music Press}, publisher={Graphire Corporation} , diff --git a/Documentation/tex/refman.yo b/Documentation/tex/refman.yo index 574362f31b..a357d2d33e 100644 --- a/Documentation/tex/refman.yo +++ b/Documentation/tex/refman.yo @@ -1604,10 +1604,16 @@ property code(\fontsize). dit(code(arithmetic_basicspace) and code(arithmetic_multiplier)) The space taken by a note is determined by the formula -verb(arithmetic_multiplier * ( c + time )) -where code(time) is the amount of time a note occupies. The value of -code(c) is affected by code(arithmetic_basicspace). Increasing -code(arithmetic_basicspace) will increase code(c). +COMMENT( + +)verb(arithmetic_multiplier * ( c + log2 (time) ))COMMENT( + +) where code(time) is the amount of time a note occupies. The value +of code(c) is chosen such that the smallest space within a measure is +arithmetic_basicspace. The smallest space is the one following the +shortest note in the measure. Typically arithmetic_basicspace is set +to the width of a quarter note head. + dit(code(barsize)) Specify height of bars. This value may need to be adjusted if you change the number of lines in the staff. dit(code(beam_dir_algorithm)) Specify algorithm for determining diff --git a/Documentation/tex/tutorial.yo b/Documentation/tex/tutorial.yo index 297a1fb3a5..4e751abc1a 100644 --- a/Documentation/tex/tutorial.yo +++ b/Documentation/tex/tutorial.yo @@ -563,16 +563,18 @@ can print it. We'll start out by explaining how to obtain the smallest grains of nuance: the articulation of a single note. Articulation is entered by writing a dash and the name of the desired articulation mark. You have to add a backslash in front of the name to distinguish -it from the name of a note. mudela(fragment,verbatim)( +it from the name of a note. COMMENT( + +)mudela(fragment,verbatim)( c''4-\staccato - c''4-\tenuto ) + c''4-\tenuto )COMMENT( -Typing a lot of staccato notes in this syntax will get tedious very +) Typing a lot of staccato notes in this syntax will get tedious very quickly. Therefore, Mudela has some handy abbreviations for articulation marks such as staccato and tenuto. They are shown in the -following example: +following example: COMMENT( -mudela()( +)mudela()( \score{ < \property Score.textstyle = typewriter \type Staff \notes { @@ -587,20 +589,21 @@ mudela()( "."4 "-" "+" "|" ">" "\^{ }" } > \paper { linewidth = 12.\cm; } -}) +})COMMENT( -Text and digits for fingering can be entered in the same manner: add a +)Text and digits for fingering can be entered in the same manner: add a dash and the text or digit to be printed: -mudela(fragment,verbatim)( - c''4-1 g''4-5 c''-"Sul tasto" ) +COMMENT( + +)mudela(fragment,verbatim)(c''4-1 g''4-5 c''-"Sul tasto" ) COMMENT(Currently, the meaning of the syntax `note-dash-digit/articulation/text' is just ``add a superscript to this -note.'' This is not in line with our goal to em(define) music with +note.'' This is not in line with our goal to em (define) music with Mudela. We hope that this will be fixed in a future version of the language. In the meantime you can abuse this: the super- and subscripts can be forced into up or down position respectively by entering an -a caret (code(^)) or an underscore, code(_) instead of the dash: -mudela(fragment,verbatim,center)( +a caret (code(^)) or an underscore, code (_) instead of the dash: +mudela (fragment,verbatim,center) ( c'4-^ c'4^^ c'''4-^ c'''4_^ )) @@ -608,12 +611,14 @@ Dynamic markings are another way to add a nuance to a note. They are entered by adding the name for the dynamic sign after the note. You should not enter a dash between the name and the note.footnote(This is inconsistent. We hope that this will be fixed in a later - version of the language.) -mudela(verbatim,fragment)( + version of the language.)COMMENT( + +)mudela(verbatim,fragment)( c4 \ff c4 \fp c4 c4 \ppp c4 c4 \sfz -) +)COMMENT( +UGH -COMMENT(UGH) +) sect(Bridging the notes: beams, slurs and ties) @@ -682,9 +687,9 @@ Crescendi and decrescendi can be printed in hairpin style. The starting marker for the crescendo is code(\<), and for the decrescendo code(\>). Both have code(\!) as the ending marker. mudela(fragment, verbatim)( - c4 \< \! c4 \> \! c2 + \relative c'' { c4 \< \! c4 \> \! c2 < c1 - { s4 \< \! s4 \> \! s2 } > + { s4 \< \! s4 \> \! s2 } > } ) This example shows a trick: by attaching the markings to space rests that run parallel to the whole note, you can have dynamic markings diff --git a/Documentation/topdocs/INSTALL.yo b/Documentation/topdocs/INSTALL.yo index 3fc8c63f9a..cf505663fb 100644 --- a/Documentation/topdocs/INSTALL.yo +++ b/Documentation/topdocs/INSTALL.yo @@ -28,8 +28,7 @@ it() GNU C++ version 2.7 or newer (2.8 and egcs are also fine). it() Python 1.5 (Strictly speaking, you shouldn't need Python for compiling and installing, but you'll need it to regenerate the font tables, e.g.). - -it() GUILE 1.3 (no, GUILE 1.2 won't work) +it() GUILE 1.3 (no, GUILE 1.2 won't work), check out lurl(http://www.gnu.org/programs/guile.html) ) sect(RUNNING) @@ -42,6 +41,7 @@ it()TeX it()A PostScript printer and/or viewer (such as Ghostscript) is strongly recommended. Xdvi will show all embedded PostScript too if you have Ghostscript installed. +it() GUILE 1.3 (no, GUILE 1.2 won't work), check out lurl(http://www.gnu.org/programs/guile.html) ) @@ -67,16 +67,14 @@ itemize( it()GNU make. Check out lurl(ftp://ftp.gnu.org) or any mirror of this site. - it()Flex (version 2.5.4 or newer). Check out lurl(ftp://ftp.gnu.org) or any mirror of this site. it()Bison (version 1.25 or newer). Check out lurl(ftp://ftp.gnu.org) or any mirror of this site. +it() GUILE 1.3 (no, GUILE 1.2 won't work), check out lurl(http://www.gnu.org/programs/guile.html) -it()GUILE (version 1.2) -Check out lurl(http://www.gnu.org/programs/guile.html) it()Python (version 1.5 or newer). Check out lurl(ftp://ftp.python.org) or lurl(ftp://ftp.cwi.nl/pub/python). diff --git a/INSTALL.txt b/INSTALL.txt index 040486f1e5..dfc89fc498 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -66,26 +66,29 @@ o Python 1.5 (Strictly speaking, you shouldn't need Python for compiling and installing, but you'll need it to regenerate the font tables, e.g.). - -o GUILE 1.3 (no, GUILE 1.2 won't work) +o GUILE 1.3 (no, GUILE 1.2 won't work), check out + http://www.gnu.org/programs/guile.html 3: RUNNING -GNU LilyPond does use a lot of resources. For operation you +GNU LilyPond does use a lot of resources. For operation you need the following: o TeX o A PostScript printer and/or viewer (such as - Ghostscript) is strongly recommended. Xdvi will show - all embedded PostScript too if you have Ghostscript + Ghostscript) is strongly recommended. Xdvi will show + all embedded PostScript too if you have Ghostscript installed. +o GUILE 1.3 (no, GUILE 1.2 won't work), check out + http://www.gnu.org/programs/guile.html + 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 @@ -118,16 +121,14 @@ have. o GNU make. Check out ftp://ftp.gnu.org or any mirror of this site. - o Flex (version 2.5.4 or newer). Check out ftp://ftp.gnu.org or any mirror of this site. o Bison (version 1.25 or newer). Check out ftp://ftp.gnu.org or any mirror of this site. - -o GUILE (version 1.2) Check out http://www.gnu.org/pro- - grams/guile.html +o GUILE 1.3 (no, GUILE 1.2 won't work), check out + http://www.gnu.org/programs/guile.html o Python (version 1.5 or newer). Check out diff --git a/NEWS b/NEWS index 236d384bbc..9a22a07bae 100644 --- a/NEWS +++ b/NEWS @@ -1,8 +1,45 @@ +pl 13 + - mutopia stuff (thanks, Peter) + - bugfix : \maininput + +********* + + +pl 12 +pl 11.jcn3 + - bf: missing triads + - @c @c min (* is taken, <<, <> don't work) + - chord-modifiers (urg, "sus" should also subtract 2...) + +pl 11.uu3 + - --safe: security paranoia: disallow untrusted \include, +disallow untrusted TeX code, disallow named output + +pl 11.jcn2 + - duration with chords + change: @4 c @c7 + +pl 11.jcn1 + - minor chord syntax change: *c6 iso @c6; + +********** + +pl 11 + +pl9.tca1 + - included that missing init/mudela-book-defs.py. Added + one line to init/GNUMakefile to make .py-files be included. + - fragment and nonfragment options to override autodetection + pl 10.jcn1 - input/test/chords.ly - \type ChordNames and chord-name-engraver.* - chords mode: \chords { @c; @d7; } +pl 10.uu1 + - scm/ directory. install .scm stuff too. + - tuplet bug fixed. + +********** pl 10 pl 9.jcn3 @@ -34,7 +71,7 @@ pl 9.uu1 - added faq entry - copertina (thanks Maurizio) - +***************** pl 9 - fixed \relative diff --git a/TODO b/TODO index 587a96c2e5..dc35057fb1 100644 --- a/TODO +++ b/TODO @@ -21,7 +21,6 @@ BUGS: * who is trying to print too (small/big) piano braces all the time? warning: piano brace too small (16.000pt) - * latex bla.tex broken (titles / \lilyfooter stuff?) * msgfmt -o check? @@ -44,7 +43,7 @@ BUGS: * space after bars? - * [/3 c8 c16 c c c]/1 + * \type Voice \times 2/3 { [c8 c16 c16 c16 c16] } * fix singleStaffBracket @@ -52,7 +51,7 @@ BUGS: * The time signature warnings still remain, will be fixed later. -ii Summary of minor spelling irregularities: + Summary of minor spelling irregularities: - capitalization/use of underscores in property names * fix SkipBars -> skipBars @@ -92,9 +91,7 @@ STUFF * typo checks on property names? - * make engraver hacking robust. - - * --safe: disallow backslashes, disallow \include. + * --safe: disallow backslashes * use streambufs and iostream to provide IO handling for TeX stream, mudela stream, data-file. @@ -325,6 +322,8 @@ ydirection and hshift preset 3RD PARTY BUGS: + * make GCC warn about ctor that leaves member vars uninitialised. + * redhat (v?) graphical install bomb-out? * GNU diff 2.7: diff -rN does not see a new directory with empty file diff --git a/VERSION b/VERSION index 11d2f10b15..8c6a8f419e 100644 --- a/VERSION +++ b/VERSION @@ -1,8 +1,8 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=1 -PATCH_LEVEL=10 -MY_PATCH_LEVEL=jcn1 +PATCH_LEVEL=13 +MY_PATCH_LEVEL= # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/configure b/configure index e69de29bb2..683d723e9a 100755 --- a/configure +++ b/configure @@ -0,0 +1,3615 @@ +#! /bin/sh + +ac_help="$ac_help + --with-gtkmm-prefix=PREFIX + Prefix where GTK-- is installed (optional)" +# Check whether --with-gtkmm-prefix or --without-gtkmm-prefix was given. +if test "${with_gtkmm_prefix+set}" = set; then + withval="$with_gtkmm_prefix" + gtkmm_config_prefix="$withval" +else + gtkmm_config_prefix="" +fi + +ac_help="$ac_help + --with-gtkmm-exec-prefix=PREFIX + Exec prefix where GTK-- is installed (optional)" +# Check whether --with-gtkmm-exec-prefix or --without-gtkmm-exec-prefix was given. +if test "${with_gtkmm_exec_prefix+set}" = set; then + withval="$with_gtkmm_exec_prefix" + gtkmm_config_exec_prefix="$withval" +else + gtkmm_config_exec_prefix="" +fi + +ac_help="$ac_help + --disable-gtkmmtest Do not try to compile and run a test GTK-- program" +# Check whether --enable-gtkmmtest or --disable-gtkmmtest was given. +if test "${enable_gtkmmtest+set}" = set; then + enableval="$enable_gtkmmtest" + : +else + enable_gtkmmtest=yes +fi + + + 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 + + + + +# Configure paths for GTK--DRAW +# Derek Quinn Wyatt 98-08-21 (adapted from Jan Nieuwenhuizen's code) + + + +# Guess values for system-dependent variables and create Makefiles. +# Generated automatically using autoconf version 2.12 +# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. +# +# This configure script is free software; the Free Software Foundation +# gives unlimited permission to copy, distribute and modify it. + +# Defaults: +ac_help= +ac_default_prefix=/usr/local +# Any additions from configure.in: +ac_help="$ac_help + enable-config=FILE put configure settings in config-FILE.make" +ac_help="$ac_help + enable-checking set runtime checks (assert calls). Default: on" +ac_help="$ac_help + enable-optimise use maximal speed optimisations. Default: off" +ac_help="$ac_help + enable-profiling compile with gprof support. Default: off" +ac_help="$ac_help + enable-debugging set debug info. Default: on" +ac_help="$ac_help + enable-mingw-prefix=DIR set the mingw32 directory (standalone windows32 exes)" +ac_help="$ac_help + enable-printing turn on debug printing. Default: off" +ac_help="$ac_help + 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" + +# Initialize some variables set by options. +# The variables have the same names as the options, with +# dashes changed to underlines. +build=NONE +cache_file=./config.cache +exec_prefix=NONE +host=NONE +no_create= +nonopt=NONE +no_recursion= +prefix=NONE +program_prefix=NONE +program_suffix=NONE +program_transform_name=s,x,x, +silent= +site= +srcdir= +target=NONE +verbose= +x_includes=NONE +x_libraries=NONE +bindir='${exec_prefix}/bin' +sbindir='${exec_prefix}/sbin' +libexecdir='${exec_prefix}/libexec' +datadir='${prefix}/share' +sysconfdir='${prefix}/etc' +sharedstatedir='${prefix}/com' +localstatedir='${prefix}/var' +libdir='${exec_prefix}/lib' +includedir='${prefix}/include' +oldincludedir='/usr/include' +infodir='${prefix}/info' +mandir='${prefix}/man' + +# Initialize some other variables. +subdirs= +MFLAGS= MAKEFLAGS= +# Maximum number of lines to put in a shell here document. +ac_max_here_lines=12 + +ac_prev= +for ac_option +do + + # If the previous option needs an argument, assign it. + if test -n "$ac_prev"; then + eval "$ac_prev=\$ac_option" + ac_prev= + continue + fi + + case "$ac_option" in + -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;; + *) ac_optarg= ;; + esac + + # Accept the important Cygnus configure options, so we can diagnose typos. + + case "$ac_option" in + + -bindir | --bindir | --bindi | --bind | --bin | --bi) + ac_prev=bindir ;; + -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) + bindir="$ac_optarg" ;; + + -build | --build | --buil | --bui | --bu) + ac_prev=build ;; + -build=* | --build=* | --buil=* | --bui=* | --bu=*) + build="$ac_optarg" ;; + + -cache-file | --cache-file | --cache-fil | --cache-fi \ + | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) + ac_prev=cache_file ;; + -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ + | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) + cache_file="$ac_optarg" ;; + + -datadir | --datadir | --datadi | --datad | --data | --dat | --da) + ac_prev=datadir ;; + -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ + | --da=*) + datadir="$ac_optarg" ;; + + -disable-* | --disable-*) + ac_feature=`echo $ac_option|sed -e 's/-*disable-//'` + # Reject names that are not valid shell variable names. + if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then + { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } + fi + ac_feature=`echo $ac_feature| sed 's/-/_/g'` + eval "enable_${ac_feature}=no" ;; + + -enable-* | --enable-*) + ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'` + # Reject names that are not valid shell variable names. + if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then + { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } + fi + ac_feature=`echo $ac_feature| sed 's/-/_/g'` + case "$ac_option" in + *=*) ;; + *) ac_optarg=yes ;; + esac + eval "enable_${ac_feature}='$ac_optarg'" ;; + + -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ + | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ + | --exec | --exe | --ex) + ac_prev=exec_prefix ;; + -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ + | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ + | --exec=* | --exe=* | --ex=*) + exec_prefix="$ac_optarg" ;; + + -gas | --gas | --ga | --g) + # Obsolete; use --with-gas. + with_gas=yes ;; + + -help | --help | --hel | --he) + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. + cat << EOF +Usage: configure [options] [host] +Options: [defaults in brackets after descriptions] +Configuration: + --cache-file=FILE cache test results in FILE + --help print this message + --no-create do not create output files + --quiet, --silent do not print \`checking...' messages + --version print the version of autoconf that created configure +Directory and file names: + --prefix=PREFIX install architecture-independent files in PREFIX + [$ac_default_prefix] + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX + [same as prefix] + --bindir=DIR user executables in DIR [EPREFIX/bin] + --sbindir=DIR system admin executables in DIR [EPREFIX/sbin] + --libexecdir=DIR program executables in DIR [EPREFIX/libexec] + --datadir=DIR read-only architecture-independent data in DIR + [PREFIX/share] + --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data in DIR + [PREFIX/com] + --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var] + --libdir=DIR object code libraries in DIR [EPREFIX/lib] + --includedir=DIR C header files in DIR [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include] + --infodir=DIR info documentation in DIR [PREFIX/info] + --mandir=DIR man documentation in DIR [PREFIX/man] + --srcdir=DIR find the sources in DIR [configure dir or ..] + --program-prefix=PREFIX prepend PREFIX to installed program names + --program-suffix=SUFFIX append SUFFIX to installed program names + --program-transform-name=PROGRAM + run sed PROGRAM on installed program names +EOF + cat << EOF +Host type: + --build=BUILD configure for building on BUILD [BUILD=HOST] + --host=HOST configure for HOST [guessed] + --target=TARGET configure for TARGET [TARGET=HOST] +Features and packages: + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --x-includes=DIR X include files are in DIR + --x-libraries=DIR X library files are in DIR +EOF + if test -n "$ac_help"; then + echo "--enable and --with options recognized:$ac_help" + fi + exit 0 ;; + + -host | --host | --hos | --ho) + ac_prev=host ;; + -host=* | --host=* | --hos=* | --ho=*) + host="$ac_optarg" ;; + + -includedir | --includedir | --includedi | --included | --include \ + | --includ | --inclu | --incl | --inc) + ac_prev=includedir ;; + -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ + | --includ=* | --inclu=* | --incl=* | --inc=*) + includedir="$ac_optarg" ;; + + -infodir | --infodir | --infodi | --infod | --info | --inf) + ac_prev=infodir ;; + -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) + infodir="$ac_optarg" ;; + + -libdir | --libdir | --libdi | --libd) + ac_prev=libdir ;; + -libdir=* | --libdir=* | --libdi=* | --libd=*) + libdir="$ac_optarg" ;; + + -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ + | --libexe | --libex | --libe) + ac_prev=libexecdir ;; + -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ + | --libexe=* | --libex=* | --libe=*) + libexecdir="$ac_optarg" ;; + + -localstatedir | --localstatedir | --localstatedi | --localstated \ + | --localstate | --localstat | --localsta | --localst \ + | --locals | --local | --loca | --loc | --lo) + ac_prev=localstatedir ;; + -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ + | --localstate=* | --localstat=* | --localsta=* | --localst=* \ + | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) + localstatedir="$ac_optarg" ;; + + -mandir | --mandir | --mandi | --mand | --man | --ma | --m) + ac_prev=mandir ;; + -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) + mandir="$ac_optarg" ;; + + -nfp | --nfp | --nf) + # Obsolete; use --without-fp. + with_fp=no ;; + + -no-create | --no-create | --no-creat | --no-crea | --no-cre \ + | --no-cr | --no-c) + no_create=yes ;; + + -no-recursion | --no-recursion | --no-recursio | --no-recursi \ + | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) + no_recursion=yes ;; + + -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ + | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ + | --oldin | --oldi | --old | --ol | --o) + ac_prev=oldincludedir ;; + -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ + | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ + | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) + oldincludedir="$ac_optarg" ;; + + -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) + ac_prev=prefix ;; + -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) + prefix="$ac_optarg" ;; + + -program-prefix | --program-prefix | --program-prefi | --program-pref \ + | --program-pre | --program-pr | --program-p) + ac_prev=program_prefix ;; + -program-prefix=* | --program-prefix=* | --program-prefi=* \ + | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) + program_prefix="$ac_optarg" ;; + + -program-suffix | --program-suffix | --program-suffi | --program-suff \ + | --program-suf | --program-su | --program-s) + ac_prev=program_suffix ;; + -program-suffix=* | --program-suffix=* | --program-suffi=* \ + | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) + program_suffix="$ac_optarg" ;; + + -program-transform-name | --program-transform-name \ + | --program-transform-nam | --program-transform-na \ + | --program-transform-n | --program-transform- \ + | --program-transform | --program-transfor \ + | --program-transfo | --program-transf \ + | --program-trans | --program-tran \ + | --progr-tra | --program-tr | --program-t) + ac_prev=program_transform_name ;; + -program-transform-name=* | --program-transform-name=* \ + | --program-transform-nam=* | --program-transform-na=* \ + | --program-transform-n=* | --program-transform-=* \ + | --program-transform=* | --program-transfor=* \ + | --program-transfo=* | --program-transf=* \ + | --program-trans=* | --program-tran=* \ + | --progr-tra=* | --program-tr=* | --program-t=*) + program_transform_name="$ac_optarg" ;; + + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + silent=yes ;; + + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) + ac_prev=sbindir ;; + -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ + | --sbi=* | --sb=*) + sbindir="$ac_optarg" ;; + + -sharedstatedir | --sharedstatedir | --sharedstatedi \ + | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ + | --sharedst | --shareds | --shared | --share | --shar \ + | --sha | --sh) + ac_prev=sharedstatedir ;; + -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ + | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ + | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ + | --sha=* | --sh=*) + sharedstatedir="$ac_optarg" ;; + + -site | --site | --sit) + ac_prev=site ;; + -site=* | --site=* | --sit=*) + site="$ac_optarg" ;; + + -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) + ac_prev=srcdir ;; + -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) + srcdir="$ac_optarg" ;; + + -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ + | --syscon | --sysco | --sysc | --sys | --sy) + ac_prev=sysconfdir ;; + -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ + | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) + sysconfdir="$ac_optarg" ;; + + -target | --target | --targe | --targ | --tar | --ta | --t) + ac_prev=target ;; + -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) + target="$ac_optarg" ;; + + -v | -verbose | --verbose | --verbos | --verbo | --verb) + verbose=yes ;; + + -version | --version | --versio | --versi | --vers) + echo "configure generated by autoconf version 2.12" + exit 0 ;; + + -with-* | --with-*) + ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'` + # Reject names that are not valid shell variable names. + if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then + { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } + fi + ac_package=`echo $ac_package| sed 's/-/_/g'` + case "$ac_option" in + *=*) ;; + *) ac_optarg=yes ;; + esac + eval "with_${ac_package}='$ac_optarg'" ;; + + -without-* | --without-*) + ac_package=`echo $ac_option|sed -e 's/-*without-//'` + # Reject names that are not valid shell variable names. + if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then + { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } + fi + ac_package=`echo $ac_package| sed 's/-/_/g'` + eval "with_${ac_package}=no" ;; + + --x) + # Obsolete; use --with-x. + with_x=yes ;; + + -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ + | --x-incl | --x-inc | --x-in | --x-i) + ac_prev=x_includes ;; + -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ + | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) + x_includes="$ac_optarg" ;; + + -x-libraries | --x-libraries | --x-librarie | --x-librari \ + | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) + ac_prev=x_libraries ;; + -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ + | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) + x_libraries="$ac_optarg" ;; + + -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; } + ;; + + *) + if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then + echo "configure: warning: $ac_option: invalid host type" 1>&2 + fi + if test "x$nonopt" != xNONE; then + { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } + fi + nonopt="$ac_option" + ;; + + esac +done + +if test -n "$ac_prev"; then + { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; } +fi + +trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 + +# File descriptor usage: +# 0 standard input +# 1 file creation +# 2 errors and warnings +# 3 some systems may open it to /dev/tty +# 4 used on the Kubota Titan +# 6 checking for... messages and results +# 5 compiler messages saved in config.log +if test "$silent" = yes; then + exec 6>/dev/null +else + exec 6>&1 +fi +exec 5>./config.log + +echo "\ +This file contains any messages produced by compilers while +running configure, to aid debugging if configure makes a mistake. +" 1>&5 + +# Strip out --no-create and --no-recursion so they do not pile up. +# Also quote any args containing shell metacharacters. +ac_configure_args= +for ac_arg +do + case "$ac_arg" in + -no-create | --no-create | --no-creat | --no-crea | --no-cre \ + | --no-cr | --no-c) ;; + -no-recursion | --no-recursion | --no-recursio | --no-recursi \ + | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; + *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*) + ac_configure_args="$ac_configure_args '$ac_arg'" ;; + *) ac_configure_args="$ac_configure_args $ac_arg" ;; + esac +done + +# NLS nuisances. +# Only set these to C if already set. These must not be set unconditionally +# because not all systems understand e.g. LANG=C (notably SCO). +# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! +# Non-C LC_CTYPE values break the ctype check. +if test "${LANG+set}" = set; then LANG=C; export LANG; fi +if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi +if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi +if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi + +# confdefs.h avoids OS command line length limits that DEFS can exceed. +rm -rf conftest* confdefs.h +# AIX cpp loses on an empty file, so make sure it contains at least a newline. +echo > confdefs.h + +# A filename unique to this package, relative to the directory that +# configure is in, which we can look for to find out if srcdir is correct. +ac_unique_file=make/lilypond.lsm.in + +# Find the source files, if location was not specified. +if test -z "$srcdir"; then + ac_srcdir_defaulted=yes + # Try the directory containing this script, then its parent. + ac_prog=$0 + ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'` + test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. + srcdir=$ac_confdir + if test ! -r $srcdir/$ac_unique_file; then + srcdir=.. + fi +else + ac_srcdir_defaulted=no +fi +if test ! -r $srcdir/$ac_unique_file; then + if test "$ac_srcdir_defaulted" = yes; then + { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; } + else + { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; } + fi +fi +srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` + +# Prefer explicitly selected file to automatically selected ones. +if test -z "$CONFIG_SITE"; then + if test "x$prefix" != xNONE; then + CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" + else + CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" + fi +fi +for ac_site_file in $CONFIG_SITE; do + if test -r "$ac_site_file"; then + echo "loading site script $ac_site_file" + . "$ac_site_file" + fi +done + +if test -r "$cache_file"; then + echo "loading cache $cache_file" + . $cache_file +else + echo "creating cache $cache_file" + > $cache_file +fi + +ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross + +if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then + # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. + if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then + ac_n= ac_c=' +' ac_t=' ' + else + ac_n=-n ac_c= ac_t= + fi +else + ac_n= ac_c='\c' ac_t= +fi + + + + +# Bootstrap StepMake configure + + + . $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:] + PACKAGE=`echo $PACKAGE_NAME | tr '[a-z]' '[A-Z]'` + package=`echo $PACKAGE_NAME | tr '[A-Z]' '[a-z]'` + + # 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!"` + + if test "x$PACKAGE" = "xSTEPMAKE"; then + echo Stepmake package! + (cd stepmake; rm -f stepmake; ln -s ../stepmake .) + (cd stepmake; rm -f bin; ln -s ../bin .) + ac_aux_dir= +for ac_dir in bin $srcdir/bin; do + if test -f $ac_dir/install-sh; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f $ac_dir/install.sh; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + fi +done +if test -z "$ac_aux_dir"; then + { echo "configure: error: can not find install-sh or install.sh in bin $srcdir/bin" 1>&2; exit 1; } +fi +ac_config_guess=$ac_aux_dir/config.guess +ac_config_sub=$ac_aux_dir/config.sub +ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. + + stepmake=stepmake + else + echo Package: $PACKAGE + # Check for installed stepmake + if test -d $stepmake; then + echo Using installed stepmake: $stepmake + else + stepmake='$(depth)'/stepmake + echo Using local stepmake: $datadir/stepmake not found + fi + ac_aux_dir= +for ac_dir in \ + $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/\ + $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\ + ; do + if test -f $ac_dir/install-sh; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f $ac_dir/install.sh; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + fi +done +if test -z "$ac_aux_dir"; then + { echo "configure: error: can not find install-sh or install.sh in \ + $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/\ + $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\ + " 1>&2; exit 1; } +fi +ac_config_guess=$ac_aux_dir/config.guess +ac_config_sub=$ac_aux_dir/config.sub +ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. + + fi + + + + + + cat >> confdefs.h <> confdefs.h </dev/null` + if test "x$STATE_VECTOR" != "x"; then + STATE_VECTOR="\$(depth)/$STATE_VECTOR" + fi + + + CONFIGSUFFIX= + # Check whether --enable-config or --disable-config was given. +if test "${enable_config+set}" = set; then + enableval="$enable_config" + CONFIGSUFFIX=$enableval +fi + + + if test "$CONFIGSUFFIX" != "" ; then + CONFIGFILE=config-$CONFIGSUFFIX + else + CONFIGFILE=config + fi + + + +# Make sure we can run config.sub. +if $ac_config_sub sun4 >/dev/null 2>&1; then : +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:761: checking host system type" >&5 + +host_alias=$host +case "$host_alias" in +NONE) + case $nonopt in + NONE) + if host_alias=`$ac_config_guess`; then : + else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } + fi ;; + *) host_alias=$nonopt ;; + esac ;; +esac + +host=`$ac_config_sub $host_alias` +host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +echo "$ac_t""$host" 1>&6 + + for ac_prog in make +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:786: 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 + if test -n "$MAKE"; then + ac_cv_prog_MAKE="$MAKE" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_MAKE="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +MAKE="$ac_cv_prog_MAKE" +if test -n "$MAKE"; then + echo "$ac_t""$MAKE" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$MAKE" && break +done +test -n "$MAKE" || MAKE="error" + + for ac_prog in find +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:820: 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 + if test -n "$FIND"; then + ac_cv_prog_FIND="$FIND" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_FIND="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +FIND="$ac_cv_prog_FIND" +if test -n "$FIND"; then + echo "$ac_t""$FIND" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$FIND" && break +done +test -n "$FIND" || FIND="error" + + + + + for ac_prog in tar +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:857: 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 + if test -n "$TAR"; then + ac_cv_prog_TAR="$TAR" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_TAR="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +TAR="$ac_cv_prog_TAR" +if test -n "$TAR"; then + echo "$ac_t""$TAR" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$TAR" && break +done +test -n "$TAR" || TAR="error" + + for ac_prog in bash +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:891: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_BASH'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$BASH"; then + ac_cv_prog_BASH="$BASH" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_BASH="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +BASH="$ac_cv_prog_BASH" +if test -n "$BASH"; then + echo "$ac_t""$BASH" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$BASH" && break +done +test -n "$BASH" || BASH="/bin/sh" + + + # 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:924: 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 + case "$PYTHON" in + /*) + ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_PYTHON="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_PYTHON" && ac_cv_path_PYTHON="-echo no python" + ;; +esac +fi +PYTHON="$ac_cv_path_PYTHON" +if test -n "$PYTHON"; then + echo "$ac_t""$PYTHON" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + + + + + result="`echo \"$MAKE\" | grep echo`" + if test "x$MAKE" = "xerror" -o "x$result" != "x"; then + + echo "configure: warning: can\'t find GNU make. You should install GNU make" 1>&2 + warn_b=yes + + fi + + if test $MAKE != "error" ; then + $MAKE -v| grep GNU > /dev/null + if test "$?" = 1 + then + + echo "configure: warning: Please install *GNU* make" 1>&2 + warn_b=yes + + fi + fi + + + result="`echo \"$PYTHON\" | grep echo`" + if test "x$PYTHON" = "xerror" -o "x$result" != "x"; then + + echo "configure: warning: can\'t find python. You should install Python" 1>&2 + warn_b=yes + + fi + + + if test "x$OSTYPE" = "xcygwin32" || test "x$OSTYPE" = "xWindows_NT"; then + LN=cp # hard link does not work under cygnus-nt + LN_S=cp # symbolic link does not work for native nt + ZIP="zip -r -9" # + DOTEXE=.exe + DIRSEP='\\' + PATHSEP=';' + INSTALL="\$(SHELL) \$(stepdir)/../bin/install-dot-exe.sh -c" + else + DIRSEP='/' + PATHSEP=':' + LN=ln + LN_S='ln -s' + ZIP="zip -r -9" + INSTALL="\$(SHELL) \$(stepdir)/../bin/install-sh -c" + fi + + + + + + cat >> confdefs.h <> confdefs.h <> confdefs.h <> confdefs.h <<\EOF +#define NPRINT 1 +EOF + + DEFINES="$DEFINES -DNPRINT" + fi + + if test "$checking_b" = no; then + # ugh + cat >> confdefs.h <<\EOF +#define NDEBUG 1 +EOF + + DEFINES="$DEFINES -DNDEBUG" + fi + + if test "$optimise_b" = yes; then + OPTIMIZE="-O2 -finline-functions" + fi + + if test "$optimise_b" = no; then + OPTIMIZE="" + fi + + if test $profile_b = yes; then + EXTRA_LIBES="-pg" + OPTIMIZE="$OPTIMIZE -pg" + fi + + if test $debug_b = yes; then + OPTIMIZE="$OPTIMIZE -g" + fi + + # however, C++ support in mingw32 v 0.1.4 is still flaky + if test x$MINGWPREFIX != xno; then + ICFLAGS="-I$MINGWPREFIX/include" + ILDFLAGS="-$MINGWPREFIX/lib" + fi + + # Extract the first word of "gcc", so it can be a program name with args. +set dummy gcc; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1140: 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 + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_CC="gcc" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +CC="$ac_cv_prog_CC" +if test -n "$CC"; then + echo "$ac_t""$CC" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +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:1169: 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 + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + ac_prog_rejected=no + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + break + fi + done + IFS="$ac_save_ifs" +if test $ac_prog_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. + set dummy $ac_cv_prog_CC + shift + if test $# -gt 0; then + # We chose a different compiler from the bogus one. + # However, it has the same basename, so the bogon will be chosen + # first if we set CC to just the basename; use the full file name. + shift + set dummy "$ac_dir/$ac_word" "$@" + shift + ac_cv_prog_CC="$@" + fi +fi +fi +fi +CC="$ac_cv_prog_CC" +if test -n "$CC"; then + echo "$ac_t""$CC" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } +fi + +echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +echo "configure:1217: 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. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross + +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; 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 + ac_cv_prog_cc_cross=no + else + ac_cv_prog_cc_cross=yes + fi +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_cv_prog_cc_works=no +fi +rm -fr conftest* + +echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 +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:1251: 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:1256: 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 + cat > conftest.c <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then + ac_cv_prog_gcc=yes +else + ac_cv_prog_gcc=no +fi +fi + +echo "$ac_t""$ac_cv_prog_gcc" 1>&6 + +if test $ac_cv_prog_gcc = yes; then + GCC=yes + 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:1280: 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 + echo 'void f(){}' > conftest.c +if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then + ac_cv_prog_cc_g=yes +else + ac_cv_prog_cc_g=no +fi +rm -f conftest* + +fi + +echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 + if test "$ac_test_CFLAGS" = set; then + CFLAGS="$ac_save_CFLAGS" + elif test $ac_cv_prog_cc_g = yes; then + CFLAGS="-g -O2" + else + CFLAGS="-O2" + fi +else + GCC= + test "${CFLAGS+set}" = set || CFLAGS="-g" +fi + + LD='$(CC)' + + + CPPFLAGS=${CPPFLAGS:-""} + + + + + + + +# AC_HAVE_HEADERS(limits.h malloc.h string.h unistd.h values.h) + +printing_b=no +# Check whether --enable-printing or --disable-printing was given. +if test "${enable_printing+set}" = set; then + enableval="$enable_printing" + printing_b=$enableval +fi + + +if test "$optimise_b" = yes; then + DEFINES="$DEFINES -DSTRING_UTILS_INLINED" + cat >> confdefs.h <<\EOF +#define STRINGS_UTILS_INLINED 1 +EOF + +fi + +echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 +echo "configure:1337: 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 +else + ac_ext=C +# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +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:1355: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out` +if test -z "$ac_err"; then + : +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + CXXCPP=/lib/cpp +fi +rm -f conftest* + ac_cv_prog_CXXCPP="$CXXCPP" +fi +fi +CXXCPP="$ac_cv_prog_CXXCPP" +echo "$ac_t""$CXXCPP" 1>&6 + + + ac_ext=C +# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cxx_cross + + for ac_prog in $CCC c++ g++ gcc CC cxx cc++ +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:1386: 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 + if test -n "$CXX"; then + ac_cv_prog_CXX="$CXX" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_CXX="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +CXX="$ac_cv_prog_CXX" +if test -n "$CXX"; then + echo "$ac_t""$CXX" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$CXX" && break +done +test -n "$CXX" || CXX="gcc" + + +echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +echo "configure:1417: 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. +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cxx_cross + +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; 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 + ac_cv_prog_cxx_cross=no + else + ac_cv_prog_cxx_cross=yes + fi +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_cv_prog_cxx_works=no +fi +rm -fr conftest* + +echo "$ac_t""$ac_cv_prog_cxx_works" 1>&6 +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:1451: 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:1456: 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 + cat > conftest.C <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then + ac_cv_prog_gxx=yes +else + ac_cv_prog_gxx=no +fi +fi + +echo "$ac_t""$ac_cv_prog_gxx" 1>&6 + +if test $ac_cv_prog_gxx = yes; then + GXX=yes + 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:1480: 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 + echo 'void f(){}' > conftest.cc +if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then + ac_cv_prog_cxx_g=yes +else + ac_cv_prog_cxx_g=no +fi +rm -f conftest* + +fi + +echo "$ac_t""$ac_cv_prog_cxx_g" 1>&6 + if test "$ac_test_CXXFLAGS" = set; then + CXXFLAGS="$ac_save_CXXFLAGS" + elif test $ac_cv_prog_cxx_g = yes; then + CXXFLAGS="-g -O2" + else + CXXFLAGS="-O2" + fi +else + GXX= + test "${CXXFLAGS+set}" = set || CXXFLAGS="-g" +fi + + + ac_safe=`echo "FlexLexer.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for FlexLexer.h""... $ac_c" 1>&6 +echo "configure:1510: 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:1520: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + true +else + echo "$ac_t""no" 1>&6 + + echo "configure: warning: can"\'"t find flex header. Please install Flex headers correctly" 1>&2 + warn_b=yes + +fi + + + CPPFLAGS="$CPPFLAGS $DEFINES" + CXXFLAGS="$CXXFLAGS $OPTIMIZE" + LDFLAGS=$EXTRA_LIBES + + + + LD='$(CXX)' + + + + # ugh autoconf + if $CXX --version | grep '2\.[78]' > /dev/null || + $CXX --version | grep 'egcs' > /dev/null + then + true + else + + echo "configure: warning: can\'t find g++ 2.7" 1>&2 + warn_b=yes + + fi + + + echo $ac_n "checking whether explicit instantiation is needed""... $ac_c" 1>&6 +echo "configure:1570: 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; }; + template int foo::baz = 1; + +int main() { + return foo::baz; +; return 0; } +EOF +if { (eval echo configure:1585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + lily_cv_need_explicit_instantiation=no +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + lily_cv_need_explicit_instantiation=yes +fi +rm -f conftest* +fi + +echo "$ac_t""$lily_cv_need_explicit_instantiation" 1>&6 + if test x"$lily_cv_need_explicit_instantiation"x = x"yes"x; then + cat >> confdefs.h <<\EOF +#define NEED_EXPLICIT_INSTANTIATION 1 +EOF + + fi + + + # ugh, automake: we want (and check for) bison + for ac_prog in 'bison -y' byacc +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:1612: 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 + if test -n "$YACC"; then + ac_cv_prog_YACC="$YACC" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_YACC="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +YACC="$ac_cv_prog_YACC" +if test -n "$YACC"; then + echo "$ac_t""$YACC" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$YACC" && break +done +test -n "$YACC" || YACC="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 + + for ac_prog in bison +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:1654: 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 + if test -n "$BISON"; then + ac_cv_prog_BISON="$BISON" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_BISON="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +BISON="$ac_cv_prog_BISON" +if test -n "$BISON"; then + echo "$ac_t""$BISON" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$BISON" && break +done +test -n "$BISON" || BISON="error" + + for ac_prog in flex +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:1688: 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 + if test -n "$FLEX"; then + ac_cv_prog_FLEX="$FLEX" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_FLEX="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +FLEX="$ac_cv_prog_FLEX" +if test -n "$FLEX"; then + echo "$ac_t""$FLEX" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$FLEX" && break +done +test -n "$FLEX" || FLEX="error" + + + result="`echo \"$BISON\" | grep echo`" + if test "x$BISON" = "xerror" -o "x$result" != "x"; then + + echo "configure: warning: can\'t find bison. Please install Bison" 1>&2 + warn_b=yes + + fi + + + result="`echo \"$FLEX\" | grep echo`" + if test "x$FLEX" = "xerror" -o "x$result" != "x"; then + + echo "configure: warning: can\'t find flex. Please install Flex" 1>&2 + warn_b=yes + + fi + + + if test $BISON != "error"; then + bison_version=`$BISON --version| sed 's/^.*version 1.//g' ` + if test $bison_version -lt 25; then + + echo "configure: warning: Your bison is a bit old (1.$bison_version). You might have to install 1.25" 1>&2 + warn_b=yes + + fi + fi + + + + + + for ac_prog in ar +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:1755: 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 + if test -n "$AR"; then + ac_cv_prog_AR="$AR" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_AR="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +AR="$ac_cv_prog_AR" +if test -n "$AR"; then + echo "$ac_t""$AR" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$AR" && break +done +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:1787: 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 + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_RANLIB="ranlib" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":" +fi +fi +RANLIB="$ac_cv_prog_RANLIB" +if test -n "$RANLIB"; then + echo "$ac_t""$RANLIB" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + + + + +# AC_STEPMAKE_LIBTOOL + + lang=English + ALL_LINGUAS="en nl" + + # with/enable ?? + # Check whether --with-localedir or --without-localedir was given. +if test "${with_localedir+set}" = set; then + withval="$with_localedir" + localedir=$with_localedir +else + localedir='${prefix}/share/locale' +fi + + + # Check whether --with-lang or --without-lang was given. +if test "${with_lang+set}" = set; then + withval="$with_lang" + language=$with_lang +else + language=English +fi + + + echo $ac_n "checking language""... $ac_c" 1>&6 +echo "configure:1842: checking language" >&5 + case "$language" in + En* | en* | Am* | am* | US* | us*) + lang=English;; + NL | nl | Du* | du* | Ned* | ned*) + lang=Dutch;; + "") + lang=English;; + *) + lang=unknown;; + esac + echo "$ac_t""$lang" 1>&6 + + if test "$lang" = "unknown" ; then + + echo "configure: warning: $language not supported; available are: $ALL_LINGUAS" 1>&2 + warn_b=yes + + fi + + + + DIR_LOCALEDIR=${localedir} + presome=${prefix} + if test "$prefix" = "NONE"; then + presome=${ac_default_prefix} + fi + DIR_LOCALEDIR=`echo ${DIR_LOCALEDIR} | sed "s!\\\${prefix}!$presome!"` + + + cat >> confdefs.h <&6 +echo "configure:1878: 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 +else + ac_save_LIBS="$LIBS" +LIBS="-lintl $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_lib=HAVE_LIB`echo intl | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h <&6 +fi + + for ac_func in gettext +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:1930: 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 < +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +$ac_func(); +#endif + +; return 0; } +EOF +if { (eval echo configure:1961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <&6 +fi +done + + + + # AC_CHECK_PROGS(MSGFMT, msgfmt, -echo no msgfmt) + for ac_prog in msgfmt +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:1993: 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 + if test -n "$MSGFMT"; then + ac_cv_prog_MSGFMT="$MSGFMT" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_MSGFMT="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +MSGFMT="$ac_cv_prog_MSGFMT" +if test -n "$MSGFMT"; then + echo "$ac_t""$MSGFMT" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$MSGFMT" && break +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:2023: 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 + else + # urg + MSGFMT="\$(SHELL) \$(step-bindir)/fake-msgfmt.sh" + echo "$ac_t""no" 1>&6 + + echo "configure: warning: please install msgfmt from GNU gettext" 1>&2 + warn_b=yes + + fi + if test ! -n "$MSGFMT"; then + + echo "configure: warning: please install msgfmt from GNU gettext" 1>&2 + warn_b=yes + + fi + + + # urg, never know what names these teTeX guys will think up + for ac_prog in mf +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:2050: 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 + if test -n "$METAFONT"; then + ac_cv_prog_METAFONT="$METAFONT" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_METAFONT="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +METAFONT="$ac_cv_prog_METAFONT" +if test -n "$METAFONT"; then + echo "$ac_t""$METAFONT" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$METAFONT" && break +done +test -n "$METAFONT" || METAFONT="no" + + if test "x$METAFONT" = "xno"; then + for ac_prog in mfont +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:2085: 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 + if test -n "$MFONT"; then + ac_cv_prog_MFONT="$MFONT" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_MFONT="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +MFONT="$ac_cv_prog_MFONT" +if test -n "$MFONT"; then + echo "$ac_t""$MFONT" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$MFONT" && break +done +test -n "$MFONT" || MFONT="-echo no mf or mfont" + + METAFONT=$MFONT + fi + + for ac_prog in mp +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:2122: 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 + if test -n "$METAPOST"; then + ac_cv_prog_METAPOST="$METAPOST" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_METAPOST="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +METAPOST="$ac_cv_prog_METAPOST" +if test -n "$METAPOST"; then + echo "$ac_t""$METAPOST" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$METAPOST" && break +done +test -n "$METAPOST" || METAPOST="no" + + if test "x$METAPOST" = "xno"; then + for ac_prog in mpost +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:2157: 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 + if test -n "$MPOST"; then + ac_cv_prog_MPOST="$MPOST" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_MPOST="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +MPOST="$ac_cv_prog_MPOST" +if test -n "$MPOST"; then + echo "$ac_t""$MPOST" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$MPOST" && break +done +test -n "$MPOST" || MPOST="-echo no mp or mpost" + + METAPOST=$MPOST + fi + + + + +# AC_STEPMAKE_TEXMF_DIRS + + if test "x$YODL" = "x"; then + for ac_prog in striproff +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:2200: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_STRIPROFF'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$STRIPROFF"; then + ac_cv_prog_STRIPROFF="$STRIPROFF" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_STRIPROFF="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +STRIPROFF="$ac_cv_prog_STRIPROFF" +if test -n "$STRIPROFF"; then + echo "$ac_t""$STRIPROFF" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$STRIPROFF" && break +done +test -n "$STRIPROFF" || STRIPROFF="-echo no striproff" + + for ac_prog in yodl +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:2234: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_YODL'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$YODL"; then + ac_cv_prog_YODL="$YODL" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_YODL="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +YODL="$ac_cv_prog_YODL" +if test -n "$YODL"; then + echo "$ac_t""$YODL" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$YODL" && break +done +test -n "$YODL" || YODL="-echo no yodl" + + for ac_prog in yodl2html +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:2268: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_YODL2HTML'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$YODL2HTML"; then + ac_cv_prog_YODL2HTML="$YODL2HTML" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_YODL2HTML="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +YODL2HTML="$ac_cv_prog_YODL2HTML" +if test -n "$YODL2HTML"; then + echo "$ac_t""$YODL2HTML" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$YODL2HTML" && break +done +test -n "$YODL2HTML" || YODL2HTML="-echo no yodl" + + for ac_prog in yodl2latex +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:2302: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_YODL2LATEX'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$YODL2LATEX"; then + ac_cv_prog_YODL2LATEX="$YODL2LATEX" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_YODL2LATEX="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +YODL2LATEX="$ac_cv_prog_YODL2LATEX" +if test -n "$YODL2LATEX"; then + echo "$ac_t""$YODL2LATEX" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$YODL2LATEX" && break +done + + for ac_prog in yodl2man +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:2335: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_YODL2MAN'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$YODL2MAN"; then + ac_cv_prog_YODL2MAN="$YODL2MAN" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_YODL2MAN="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +YODL2MAN="$ac_cv_prog_YODL2MAN" +if test -n "$YODL2MAN"; then + echo "$ac_t""$YODL2MAN" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$YODL2MAN" && break +done +test -n "$YODL2MAN" || YODL2MAN="-echo no yodl" + + for ac_prog in yodl2msless +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:2369: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_YODL2MSLESS'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$YODL2MSLESS"; then + ac_cv_prog_YODL2MSLESS="$YODL2MSLESS" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_YODL2MSLESS="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +YODL2MSLESS="$ac_cv_prog_YODL2MSLESS" +if test -n "$YODL2MSLESS"; then + echo "$ac_t""$YODL2MSLESS" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$YODL2MSLESS" && break +done +test -n "$YODL2MSLESS" || YODL2MSLESS="-echo no yodl" + + for ac_prog in yodl2texinfo +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:2403: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_YODL2TEXINFO'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$YODL2TEXINFO"; then + ac_cv_prog_YODL2TEXINFO="$YODL2TEXINFO" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_YODL2TEXINFO="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +YODL2TEXINFO="$ac_cv_prog_YODL2TEXINFO" +if test -n "$YODL2TEXINFO"; then + echo "$ac_t""$YODL2TEXINFO" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$YODL2TEXINFO" && break +done +test -n "$YODL2TEXINFO" || YODL2TEXINFO="-echo no yodl" + + for ac_prog in yodl2txt +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:2437: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_YODL2TXT'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$YODL2TXT"; then + ac_cv_prog_YODL2TXT="$YODL2TXT" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_YODL2TXT="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +YODL2TXT="$ac_cv_prog_YODL2TXT" +if test -n "$YODL2TXT"; then + echo "$ac_t""$YODL2TXT" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$YODL2TXT" && break +done +test -n "$YODL2TXT" || YODL2TXT="-echo no yodl" + + YODL2LESS_DIR='$(bindir)/' + else + + + + + + + + + + export STRIPROFF YODL YODL2HTML YODL2LATEX YODL2MAN YODL2MSLESS YODL2TEXINFO YODL2TXT + fi + if test "x$YODL" = "-echo no yodl"; then + + echo "configure: warning: Did not find YODL (Yodl is Yet Oneother Document Language, see http://www.cs.uu.nl/~hanwen/yodl)" 1>&2 + warn_b=yes + + fi + + + # on some systems, -lguile succeeds for guile-1.3 + # others need readline, dl (or even more) + # urg, must check for different functions in libguile + # to force new check iso reading from cache + echo $ac_n "checking for scm_shell in -lguile""... $ac_c" 1>&6 +echo "configure:2492: checking for scm_shell in -lguile" >&5 +ac_lib_var=`echo guile'_'scm_shell | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lguile $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + \ + LIBS="-lguile $LIBS"; cat >> confdefs.h <<\EOF +#define HAVE_LIBGUILE 1 +EOF + +else + echo "$ac_t""no" 1>&6 +\ + echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6 +echo "configure:2538: checking for readline in -lreadline" >&5 +ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lreadline $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_lib=HAVE_LIB`echo readline | sed -e 's/^a-zA-Z0-9_/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h <&6 +fi + \ + echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 +echo "configure:2588: checking for dlopen in -ldl" >&5 +ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-ldl $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_lib=HAVE_LIB`echo dl | sed -e 's/^a-zA-Z0-9_/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h <&6 +fi + \ + echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 +echo "configure:2638: checking for socket in -lsocket" >&5 +ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lsocket $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_lib=HAVE_LIB`echo socket | sed -e 's/^a-zA-Z0-9_/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h <&6 +fi +\ + echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 +echo "configure:2688: checking for tgetent in -ltermcap" >&5 +ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-ltermcap $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_lib=HAVE_LIB`echo termcap | sed -e 's/^a-zA-Z0-9_/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h <&6 +fi +\ + echo $ac_n "checking for fabs in -lm""... $ac_c" 1>&6 +echo "configure:2738: checking for fabs in -lm" >&5 +ac_lib_var=`echo m'_'fabs | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lm $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_lib=HAVE_LIB`echo m | sed -e 's/^a-zA-Z0-9_/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h <&6 +fi +\ + echo $ac_n "checking for scm_boot_guile in -lguile""... $ac_c" 1>&6 +echo "configure:2788: checking for scm_boot_guile in -lguile" >&5 +ac_lib_var=`echo guile'_'scm_boot_guile | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lguile $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_lib=HAVE_LIB`echo guile | sed -e 's/^a-zA-Z0-9_/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h <&6 +fi +\ + +fi + + if test "$ac_cv_lib_guile_scm_shell" != yes -a \ + "$ac_cv_lib_guile_scm_boot_guile" != yes ; then + + echo "configure: warning: You should install guile 1.3 or newer" 1>&2 + warn_b=yes + + fi + + +CXXFLAGS="$CXXFLAGS -fhandle-signatures" + + +echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 +echo "configure:2853: 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 + if test "$cross_compiling" = yes; then + ac_cv_func_memcmp_clean=no +else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +then + ac_cv_func_memcmp_clean=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + ac_cv_func_memcmp_clean=no +fi +rm -fr conftest* +fi + +fi + +echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6 +test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.o" + +echo $ac_n "checking for vprintf""... $ac_c" 1>&6 +echo "configure:2892: 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 < +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char vprintf(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_vprintf) || defined (__stub___vprintf) +choke me +#else +vprintf(); +#endif + +; return 0; } +EOF +if { (eval echo configure:2923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + eval "ac_cv_func_vprintf=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_vprintf=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'vprintf`\" = yes"; then + echo "$ac_t""yes" 1>&6 + cat >> confdefs.h <<\EOF +#define HAVE_VPRINTF 1 +EOF + +else + echo "$ac_t""no" 1>&6 +fi + +if test "$ac_cv_func_vprintf" != yes; then +echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 +echo "configure:2947: 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 < +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char _doprnt(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub__doprnt) || defined (__stub____doprnt) +choke me +#else +_doprnt(); +#endif + +; return 0; } +EOF +if { (eval echo configure:2978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + eval "ac_cv_func__doprnt=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func__doprnt=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'_doprnt`\" = yes"; then + echo "$ac_t""yes" 1>&6 + cat >> confdefs.h <<\EOF +#define HAVE_DOPRNT 1 +EOF + +else + echo "$ac_t""no" 1>&6 +fi + +fi + +for ac_func in memmem snprintf vsnprintf gettext +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:3005: 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 < +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +$ac_func(); +#endif + +; return 0; } +EOF +if { (eval echo configure:3036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <&6 +fi +done + + +cat >> confdefs.h <> confdefs.h <&6 +echo "configure:3075: 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 + if test -n "$MAKEINFO"; then + ac_cv_prog_MAKEINFO="$MAKEINFO" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_MAKEINFO="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +MAKEINFO="$ac_cv_prog_MAKEINFO" +if test -n "$MAKEINFO"; then + echo "$ac_t""$MAKEINFO" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$MAKEINFO" && break +done +test -n "$MAKEINFO" || MAKEINFO="error" + + + result="`echo \"$YODL2TEXINFO\" | grep echo`" + if test "x$YODL2TEXINFO" = "xerror" -o "x$result" != "x"; then + + echo "configure: warning: can\'t find yodl. You should install Yodl 1.30.2 or newer" 1>&2 + warn_b=yes + + fi + + + + trap '' 1 2 15 +cat > confcache <<\EOF +# This file is a shell script that caches the results of configure +# tests run on this system so they can be shared between configure +# scripts and configure runs. It is not useful on other systems. +# If it contains results you don't want to keep, you may remove or edit it. +# +# By default, configure uses ./config.cache as the cache file, +# creating it if it does not exist already. You can give configure +# the --cache-file=FILE option to use a different cache file; that is +# what configure does when it calls configure scripts in +# subdirectories, so they share the cache. +# Giving --cache-file=/dev/null disables caching, for debugging configure. +# config.status only pays attention to the cache file if you give it the +# --recheck option to rerun configure. +# +EOF +# The following way of writing the cache mishandles newlines in values, +# but we know of no workaround that is simple, portable, and efficient. +# So, don't put newlines in cache variables' values. +# Ultrix sh set writes to stderr and can't be redirected directly, +# and sets the high bit in the cache file unless we assign to the vars. +(set) 2>&1 | + case `(ac_space=' '; set) 2>&1` in + *ac_space=\ *) + # `set' does not quote correctly, so add quotes (double-quote substitution + # turns \\\\ into \\, and sed turns \\ into \). + sed -n \ + -e "s/'/'\\\\''/g" \ + -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" + ;; + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. + sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' + ;; + esac >> confcache +if cmp -s $cache_file confcache; then + : +else + if test -w $cache_file; then + echo "updating cache $cache_file" + cat confcache > $cache_file + else + echo "not updating unwritable cache $cache_file" + fi +fi +rm -f confcache + +trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 + +test "x$prefix" = xNONE && prefix=$ac_default_prefix +# Let make expand exec_prefix. +test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' + +# Any assignment to VPATH causes Sun make to only execute +# the first set of double-colon rules, so remove it if not needed. +# If there is a colon in the path, we need to keep it. +if test "x$srcdir" = x.; then + ac_vpsub='/^[ ]*VPATH[ ]*=[^:]*$/d' +fi + +trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 + +DEFS=-DHAVE_CONFIG_H + +# Without the "./", some shells look in PATH for config.status. +: ${CONFIG_STATUS=./config.status} + +echo creating $CONFIG_STATUS +rm -f $CONFIG_STATUS +cat > $CONFIG_STATUS </dev/null | sed 1q`: +# +# $0 $ac_configure_args +# +# Compiler output produced by configure, useful for debugging +# configure, is in ./config.log if it exists. + +ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]" +for ac_option +do + case "\$ac_option" in + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) + echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" + exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; + -version | --version | --versio | --versi | --vers | --ver | --ve | --v) + echo "$CONFIG_STATUS generated by autoconf version 2.12" + exit 0 ;; + -help | --help | --hel | --he | --h) + echo "\$ac_cs_usage"; exit 0 ;; + *) echo "\$ac_cs_usage"; exit 1 ;; + esac +done + +ac_given_srcdir=$srcdir + +trap 'rm -fr `echo "$CONFIGFILE.make:config.make.in $CONFIGFILE.h:config.hh.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 +EOF +cat >> $CONFIG_STATUS < conftest.subs <<\\CEOF +$ac_vpsub +$extrasub +s%@CFLAGS@%$CFLAGS%g +s%@CPPFLAGS@%$CPPFLAGS%g +s%@CXXFLAGS@%$CXXFLAGS%g +s%@DEFS@%$DEFS%g +s%@LDFLAGS@%$LDFLAGS%g +s%@LIBS@%$LIBS%g +s%@exec_prefix@%$exec_prefix%g +s%@prefix@%$prefix%g +s%@program_transform_name@%$program_transform_name%g +s%@bindir@%$bindir%g +s%@sbindir@%$sbindir%g +s%@libexecdir@%$libexecdir%g +s%@datadir@%$datadir%g +s%@sysconfdir@%$sysconfdir%g +s%@sharedstatedir@%$sharedstatedir%g +s%@localstatedir@%$localstatedir%g +s%@libdir@%$libdir%g +s%@includedir@%$includedir%g +s%@oldincludedir@%$oldincludedir%g +s%@infodir@%$infodir%g +s%@mandir@%$mandir%g +s%@stepmake@%$stepmake%g +s%@package@%$package%g +s%@PACKAGE@%$PACKAGE%g +s%@PACKAGE_NAME@%$PACKAGE_NAME%g +s%@package_depth@%$package_depth%g +s%@AUTOGENERATE@%$AUTOGENERATE%g +s%@absolute_builddir@%$absolute_builddir%g +s%@STATE_VECTOR@%$STATE_VECTOR%g +s%@CONFIGSUFFIX@%$CONFIGSUFFIX%g +s%@host@%$host%g +s%@host_alias@%$host_alias%g +s%@host_cpu@%$host_cpu%g +s%@host_vendor@%$host_vendor%g +s%@host_os@%$host_os%g +s%@MAKE@%$MAKE%g +s%@FIND@%$FIND%g +s%@TAR@%$TAR%g +s%@BASH@%$BASH%g +s%@PYTHON@%$PYTHON%g +s%@DOTEXE@%$DOTEXE%g +s%@ZIP@%$ZIP%g +s%@LN@%$LN%g +s%@LN_S@%$LN_S%g +s%@INSTALL@%$INSTALL%g +s%@PATHSEP@%$PATHSEP%g +s%@DIRSEP@%$DIRSEP%g +s%@DIR_DATADIR@%$DIR_DATADIR%g +s%@subdirs@%$subdirs%g +s%@CC@%$CC%g +s%@LD@%$LD%g +s%@ICFLAGS@%$ICFLAGS%g +s%@ILDFLAGS@%$ILDFLAGS%g +s%@DEFINES@%$DEFINES%g +s%@EXTRA_LIBES@%$EXTRA_LIBES%g +s%@CXX@%$CXX%g +s%@CXXCPP@%$CXXCPP%g +s%@YACC@%$YACC%g +s%@BISON@%$BISON%g +s%@FLEX@%$FLEX%g +s%@AR@%$AR%g +s%@RANLIB@%$RANLIB%g +s%@localedir@%$localedir%g +s%@DIR_LOCALEDIR@%$DIR_LOCALEDIR%g +s%@MSGFMT@%$MSGFMT%g +s%@METAFONT@%$METAFONT%g +s%@MFONT@%$MFONT%g +s%@METAPOST@%$METAPOST%g +s%@MPOST@%$MPOST%g +s%@STRIPROFF@%$STRIPROFF%g +s%@YODL@%$YODL%g +s%@YODL2HTML@%$YODL2HTML%g +s%@YODL2LATEX@%$YODL2LATEX%g +s%@YODL2MAN@%$YODL2MAN%g +s%@YODL2MSLESS@%$YODL2MSLESS%g +s%@YODL2TEXINFO@%$YODL2TEXINFO%g +s%@YODL2TXT@%$YODL2TXT%g +s%@YODL2LESS_DIR@%$YODL2LESS_DIR%g +s%@LIBOBJS@%$LIBOBJS%g +s%@MAKEINFO@%$MAKEINFO%g + +CEOF +EOF + +cat >> $CONFIG_STATUS <<\EOF + +# Split the substitutions into bite-sized pieces for seds with +# small command number limits, like on Digital OSF/1 and HP-UX. +ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script. +ac_file=1 # Number of current file. +ac_beg=1 # First line for current file. +ac_end=$ac_max_sed_cmds # Line after last line for current file. +ac_more_lines=: +ac_sed_cmds="" +while $ac_more_lines; do + if test $ac_beg -gt 1; then + sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file + else + sed "${ac_end}q" conftest.subs > conftest.s$ac_file + fi + if test ! -s conftest.s$ac_file; then + ac_more_lines=false + rm -f conftest.s$ac_file + else + if test -z "$ac_sed_cmds"; then + ac_sed_cmds="sed -f conftest.s$ac_file" + else + ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file" + fi + ac_file=`expr $ac_file + 1` + ac_beg=$ac_end + ac_end=`expr $ac_end + $ac_max_sed_cmds` + fi +done +if test -z "$ac_sed_cmds"; then + ac_sed_cmds=cat +fi +EOF + +cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF +for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then + # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". + case "$ac_file" in + *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` + ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; + *) ac_file_in="${ac_file}.in" ;; + esac + + # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories. + + # Remove last slash and all that follows it. Not all systems have dirname. + ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` + if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then + # The file is in a subdirectory. + test ! -d "$ac_dir" && mkdir "$ac_dir" + ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`" + # A "../" for each directory in $ac_dir_suffix. + ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'` + else + ac_dir_suffix= ac_dots= + fi + + case "$ac_given_srcdir" in + .) srcdir=. + if test -z "$ac_dots"; then top_srcdir=. + else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; + /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; + *) # Relative path. + srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" + top_srcdir="$ac_dots$ac_given_srcdir" ;; + esac + + + echo creating "$ac_file" + rm -f "$ac_file" + configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure." + case "$ac_file" in + *Makefile*) ac_comsub="1i\\ +# $configure_input" ;; + *) ac_comsub= ;; + esac + + ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` + sed -e "$ac_comsub +s%@configure_input@%$configure_input%g +s%@srcdir@%$srcdir%g +s%@top_srcdir@%$top_srcdir%g +" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file +fi; done +rm -f conftest.s* + +# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where +# NAME is the cpp macro being defined and VALUE is the value it is being given. +# +# ac_d sets the value in "#define NAME VALUE" lines. +ac_dA='s%^\([ ]*\)#\([ ]*define[ ][ ]*\)' +ac_dB='\([ ][ ]*\)[^ ]*%\1#\2' +ac_dC='\3' +ac_dD='%g' +# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE". +ac_uA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' +ac_uB='\([ ]\)%\1#\2define\3' +ac_uC=' ' +ac_uD='\4%g' +# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE". +ac_eA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' +ac_eB='$%\1#\2define\3' +ac_eC=' ' +ac_eD='%g' + +if test "${CONFIG_HEADERS+set}" != set; then +EOF +cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF +fi +for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then + # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". + case "$ac_file" in + *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` + ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; + *) ac_file_in="${ac_file}.in" ;; + esac + + echo creating $ac_file + + rm -f conftest.frag conftest.in conftest.out + ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` + cat $ac_file_inputs > conftest.in + +EOF + +# Transform confdefs.h into a sed script conftest.vals that substitutes +# the proper values into config.h.in to produce config.h. And first: +# Protect against being on the right side of a sed subst in config.status. +# Protect against being in an unquoted here document in config.status. +rm -f conftest.vals +cat > conftest.hdr <<\EOF +s/[\\&%]/\\&/g +s%[\\$`]%\\&%g +s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp +s%ac_d%ac_u%gp +s%ac_u%ac_e%gp +EOF +sed -n -f conftest.hdr confdefs.h > conftest.vals +rm -f conftest.hdr + +# This sed command replaces #undef with comments. This is necessary, for +# example, in the case of _POSIX_SOURCE, which is predefined and required +# on some systems where configure will not decide to define it. +cat >> conftest.vals <<\EOF +s%^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */% +EOF + +# Break up conftest.vals because some shells have a limit on +# the size of here documents, and old seds have small limits too. + +rm -f conftest.tail +while : +do + ac_lines=`grep -c . conftest.vals` + # grep -c gives empty output for an empty file on some AIX systems. + if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi + # Write a limited-size here document to conftest.frag. + echo ' cat > conftest.frag <> $CONFIG_STATUS + sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS + echo 'CEOF + sed -f conftest.frag conftest.in > conftest.out + rm -f conftest.in + mv conftest.out conftest.in +' >> $CONFIG_STATUS + sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail + rm -f conftest.vals + mv conftest.tail conftest.vals +done +rm -f conftest.vals + +cat >> $CONFIG_STATUS <<\EOF + rm -f conftest.frag conftest.h + echo "/* $ac_file. Generated automatically by configure. */" > conftest.h + cat conftest.in >> conftest.h + rm -f conftest.in + if cmp -s $ac_file conftest.h 2>/dev/null; then + echo "$ac_file is unchanged" + rm -f conftest.h + else + # Remove last slash and all that follows it. Not all systems have dirname. + ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` + if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then + # The file is in a subdirectory. + test ! -d "$ac_dir" && mkdir "$ac_dir" + fi + rm -f $ac_file + mv conftest.h $ac_file + fi +fi; done + +EOF +cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF + +exit 0 +EOF +chmod +x $CONFIG_STATUS +rm -fr confdefs* $ac_clean_files +test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 + +if test "$no_recursion" != yes; then + + # Remove --cache-file and --srcdir arguments so they do not pile up. + ac_sub_configure_args= + ac_prev= + for ac_arg in $ac_configure_args; do + if test -n "$ac_prev"; then + ac_prev= + continue + fi + case "$ac_arg" in + -cache-file | --cache-file | --cache-fil | --cache-fi \ + | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) + ac_prev=cache_file ;; + -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ + | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) + ;; + -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) + ac_prev=srcdir ;; + -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) + ;; + *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;; + esac + done + + for ac_config_dir in stepmake; do + + # Do not complain, so a configure script can configure whichever + # parts of a large source tree are present. + if test ! -d $srcdir/$ac_config_dir; then + continue + fi + + echo configuring in $ac_config_dir + + case "$srcdir" in + .) ;; + *) + if test -d ./$ac_config_dir || mkdir ./$ac_config_dir; then :; + else + { echo "configure: error: can not create `pwd`/$ac_config_dir" 1>&2; exit 1; } + fi + ;; + esac + + ac_popdir=`pwd` + cd $ac_config_dir + + # A "../" for each directory in /$ac_config_dir. + ac_dots=`echo $ac_config_dir|sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'` + + case "$srcdir" in + .) # No --srcdir option. We are building in place. + ac_sub_srcdir=$srcdir ;; + /*) # Absolute path. + ac_sub_srcdir=$srcdir/$ac_config_dir ;; + *) # Relative path. + ac_sub_srcdir=$ac_dots$srcdir/$ac_config_dir ;; + esac + + # Check for guested configure; otherwise get Cygnus style configure. + if test -f $ac_sub_srcdir/configure; then + ac_sub_configure=$ac_sub_srcdir/configure + elif test -f $ac_sub_srcdir/configure.in; then + ac_sub_configure=$ac_configure + else + echo "configure: warning: no configuration information is in $ac_config_dir" 1>&2 + ac_sub_configure= + fi + + # The recursion is here. + if test -n "$ac_sub_configure"; then + + # Make the cache file name correct relative to the subdirectory. + case "$cache_file" in + /*) ac_sub_cache_file=$cache_file ;; + *) # Relative path. + ac_sub_cache_file="$ac_dots$cache_file" ;; + esac + + echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" + # The eval makes quoting arguments work. + if eval ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir + then : + else + { echo "configure: error: $ac_sub_configure failed for $ac_config_dir" 1>&2; exit 1; } + fi + fi + + cd $ac_popdir + done +fi + + + rm -f GNUmakefile + cp make/toplevel.make.in ./GNUmakefile + chmod 444 GNUmakefile + + diff --git a/init/GNUmakefile b/init/GNUmakefile index 105ca5fc69..1157e404da 100644 --- a/init/GNUmakefile +++ b/init/GNUmakefile @@ -3,8 +3,8 @@ depth = .. INI_FILES = $(FLY_FILES) $(LY_FILES) -SCM_FILES = $(wildcard *.scm) -EXTRA_DIST_FILES = $(SCM_FILES) +PY_FILES=$(wildcard *.py) +EXTRA_DIST_FILES = $(SCM_FILES) $(PY_FILES) INSTALLATION_DIR=$(datadir)/ly/ INSTALLATION_FILES=$(INI_FILES) diff --git a/init/chord-modifiers.ly b/init/chord-modifiers.ly new file mode 100644 index 0000000000..48cc2f09f4 --- /dev/null +++ b/init/chord-modifiers.ly @@ -0,0 +1,15 @@ +%{ + chord modifiers +%} + +\chordmodifiers { + m = \musicalpitch { 0 2 -1 } + min = \musicalpitch { 0 2 -1 } + aug = \musicalpitch { 0 4 1 } + dim = \musicalpitch { 0 4 -1 } + % urg, not actually a chord-modifier, but it works + % c7 -> , c 7+ -> c b + maj = \musicalpitch { 0 6 1 } + % sus4 should delete 2 too... + sus = \musicalpitch { 0 3 0 } +} diff --git a/init/declarations.ly b/init/declarations.ly index 15573483f7..69b33ac2ce 100644 --- a/init/declarations.ly +++ b/init/declarations.ly @@ -5,6 +5,7 @@ longa = \duration { -2 0 } \include "dynamic.ly" \include "nederlands.ly" % dutch +\include "chord-modifiers.ly" \include "script.ly" diff --git a/init/engraver.ly b/init/engraver.ly index ff73fab9e5..a7c13b6bbc 100644 --- a/init/engraver.ly +++ b/init/engraver.ly @@ -103,7 +103,7 @@ VoiceContext = \translator { \consists "Font_size_engraver"; \consists "Slur_engraver"; \consists "Ties_engraver"; -% \consists "Tuplet_engraver"; + \consists "Tuplet_engraver"; \consists "Note_heads_engraver" ; \consists "Skip_req_swallow_translator"; }; diff --git a/init/mudela-book-defs.py b/init/mudela-book-defs.py new file mode 100644 index 0000000000..9348a8e9c4 --- /dev/null +++ b/init/mudela-book-defs.py @@ -0,0 +1,17 @@ +# Default mudela-book init-file +{ 'mudela': r""" +\begin{mudela}[eps \fontoptions] + \maininput +\end{mudela} +""", + 'mudelaRhythm': r""" +\begin{mudela}[eps \fontoptions] +\score{ + \type RhythmicStaff{ + \notes{\stemup \maininput} + } + \paper{linewidth = -1.\cm;} +} +\end{mudela} +""" +} diff --git a/init/nederlands.ly b/init/nederlands.ly index 35b568d30e..9b652a6bd2 100644 --- a/init/nederlands.ly +++ b/init/nederlands.ly @@ -97,3 +97,4 @@ } + diff --git a/init/property.ly b/init/property.ly index 4ab97b920f..7348a4f6c9 100644 --- a/init/property.ly +++ b/init/property.ly @@ -77,7 +77,6 @@ instrument ascii midi instrument table lookup %hmm, (these) abbrevs suck, imo % i guess they're meant as some form of doco % that's what i use them for... -% should compile a list with recognised properties! stemup = { \skip 1*0; % Stupid hack to make < { \stemup } > work diff --git a/init/table11.ly b/init/table11.ly index 11cb57b9b1..b28e661056 100644 --- a/init/table11.ly +++ b/init/table11.ly @@ -47,7 +47,7 @@ table_eleven = \symboltables { "bars" = \table { "empty" "emptybar" 0 - "" "" 0 0.0\pt 0.0\pt 0.0\pt 16.0\pt + "" "emptybar" 0 0.0\pt 0.0\pt 0.0\pt 16.0\pt "|" "maatstreep" 1 0.0\pt 0.64\pt 0.0\pt 20.0\pt "||" "doublebar" 1 0.0\pt 5.0\pt 0.0\pt 20.0\pt "|." "finishbar" 1 -5.0\pt 0.0\pt 0.0\pt 20.0\pt diff --git a/init/table13.ly b/init/table13.ly index c57132ec46..78ae676aa5 100644 --- a/init/table13.ly +++ b/init/table13.ly @@ -42,12 +42,9 @@ table_thirteen = \symboltables { "1" "rightalign" 1 } - - - "bars" = \table { "empty" "emptybar" 0 - "" "" 0 0.0\pt 0.0\pt 0.0\pt 16.0\pt + "" "emptybar" 0 0.0\pt 0.0\pt 0.0\pt 16.0\pt "|" "maatstreep" 1 0.0\pt 0.64\pt 0.0\pt 20.0\pt "||" "doublebar" 1 0.0\pt 5.0\pt 0.0\pt 20.0\pt "|." "finishbar" 1 -5.0\pt 0.0\pt 0.0\pt 20.0\pt diff --git a/init/table26.ly b/init/table26.ly index 07590b0353..76925b35bb 100644 --- a/init/table26.ly +++ b/init/table26.ly @@ -47,7 +47,7 @@ table_twentysix = \symboltables { "bars" = \table { "empty" "emptybar" 0 - "" "" 0 0.0\pt 0.0\pt 0.0\pt 16.0\pt + "" "emptybar" 0 0.0\pt 0.0\pt 0.0\pt 16.0\pt "|" "maatstreep" 1 0.0\pt 0.64\pt 0.0\pt 20.0\pt "||" "doublebar" 1 0.0\pt 5.0\pt 0.0\pt 20.0\pt "|." "finishbar" 1 -5.0\pt 0.0\pt 0.0\pt 20.0\pt diff --git a/input/GNUmakefile b/input/GNUmakefile index 716a611a01..27d3b1bd33 100644 --- a/input/GNUmakefile +++ b/input/GNUmakefile @@ -4,7 +4,7 @@ depth = .. SUBDIRS=test bugs -examples=example-3 twinkle-pop praeludium-fuga-E twinkle star-spangled-banner +examples=example-3 praeludium-fuga-E twinkle star-spangled-banner flexamples=example-1 example-2 LOCALSTEPMAKE_TEMPLATES=mutopia diff --git a/input/test/c.ly b/input/test/c.ly new file mode 100644 index 0000000000..a2259fae93 --- /dev/null +++ b/input/test/c.ly @@ -0,0 +1,51 @@ +\version "1.0.12"; + +%{ +Would this be acceptable/good enough/convenient for entry? + + Convention/Standard Lily + + C# cis + Cb ces + Cm; Cmin c3-; c m; c min + Caug c5+; c aug; + Cdim c5-; c dim + Cmaj7 c7+; c maj + C7 c7 + Csus; Csus4 c4; c sus +%} + +scales = \notes\transpose c''\chords{ + + @1c m @c min @4c dim @c aug @c sus @c maj + @1c6 @4c7 @c9 @c11 @c13 + @1c @g @d @a @e @b @fis + @1c @f @bes @es @as @des @ges + } + +keys = \notes{ + s1 + s1 s1 s1 + s1 s1 + s1 + \key g; s1 + \key d; s1 + \key a; s1 + \key e; s1 + \key b; s1 + \key fis; s1 + \key c; s1 + \key f; s1 + \key bes; s1 + \key es; s1 + \key as; s1 + \key des; s1 + \key ges; s1 + } + +\score{ + < + \type ChordNames \scales + \type Staff < \scales \keys > + > +} diff --git a/input/test/chords.ly b/input/test/chords.ly index 31ef252e35..e3c0c4d182 100644 --- a/input/test/chords.ly +++ b/input/test/chords.ly @@ -1,3 +1,5 @@ +\version "1.0.12"; + %{ Would this be acceptable/good enough/convenient for entry? @@ -14,9 +16,9 @@ Would this be acceptable/good enough/convenient for entry? %} scales = \notes\transpose c''\chords{ - @c; @g; @d; @a; @e; @b; @fis; - @c; @f; @bes; @es; @as; @des; @ges; - @c6; @c7; @c9; @c11; @c13; + *c *g *d *a *e *b *fis + *c *f *bes *es *as *des *ges + *c6 *c7 *c9 *c11 *c13 } \score{ diff --git a/input/test/tup.ly b/input/test/tup.ly index 8f5b674979..f89d517603 100644 --- a/input/test/tup.ly +++ b/input/test/tup.ly @@ -1,3 +1,3 @@ \score{ - \notes \type Staff \times 2/3 { \times 2/3 { a8 b c} c } + \notes \type Voice \times 2/3 { \times 2/3 { a8 b c} c } } diff --git a/input/twinkle-pop.ly b/input/twinkle-pop.ly index 1e95a8d65f..0f3ef80c6f 100644 --- a/input/twinkle-pop.ly +++ b/input/twinkle-pop.ly @@ -1,9 +1,8 @@ \header{ -filename = "twinkle.ly"; +filename = "twinkle-pop.ly"; title = "Ah, vous dirais-je, maman "; description = "twinkle twinkle in pop-song-settings"; composer = "traditional"; - enteredby = "HWN, chords by Johan Vromans"; copyright = "public domain"; } @@ -14,16 +13,28 @@ Tested Features lyrics and chords \version "1.0.10"; -melodie = \notes\relative c { - \clef"violin"; +melodie = \notes\relative c'' { + \clef "violin"; \time 2/4 ; - c''4^"C" c | g' g | a^"F" a | g2^"C" | - f4^"F" f | e^"C" e | d^"G7" d | c2^"C" | - g'4^"G" g | f^"F" f | e^"C" e | d^"G7" d | - g^"G" g | f^"F" f | e^"C" e | d^"G7" d | - c4^"C" c | g' g | a^"F" a | g2^"C" | - f4^"F" f | e^"C" e | d^"G7" d | c2^"C" | + c4 c | g' g | a a | g2 | + f4 f | e e | d d | c2 | + g'4 g | f f | e e | d d | + g g | f f | e e | d d | + % copy 1-8 + c4 c | g' g | a a | g2 | + f4 f | e e | d d | c2 | +} + +acc = \chords { + % why don't \skip, s4 work? + @2c @c @f @c + @f @c @g7 @c + @g @f @c @g7 % urg, bug! + @g @f @c @g7 + % copy 1-8 + @2c @c @f @c + @f @c @g7 @c } text = \lyrics{ @@ -39,8 +50,11 @@ text = \lyrics{ } \score { - < \notes \type Staff \melodie - \lyrics \type Lyrics \text + < + \chords \type ChordNames \acc +% \notes \type Staff=chords \acc + \notes \type Staff=melody \melodie + \lyrics \type Lyrics \text > \paper { } } diff --git a/lib/simple-file-storage.cc b/lib/simple-file-storage.cc index 1fd7ea7fc9..d61123b9e1 100644 --- a/lib/simple-file-storage.cc +++ b/lib/simple-file-storage.cc @@ -65,12 +65,8 @@ Simple_file_storage::load_file (String s) Should check IO status This is of course a build it yourself version of mmap, so we should - have been using that... (see Mapped_file_storage) But we noticed - some problems with this (unexplained lexer crashes) - - [Some versions later] The crashes aren't caused by the mmap - code. But no reason to take it out, is there? mmap () - + have been using that..., but this is simple & portable + */ Simple_file_storage::Simple_file_storage (String s) diff --git a/lily/chord-name-engraver.cc b/lily/chord-name-engraver.cc index ba4fe386df..7bf7c05142 100644 --- a/lily/chord-name-engraver.cc +++ b/lily/chord-name-engraver.cc @@ -47,6 +47,20 @@ Chord_name_engraver::do_process_requests () if (!pitch_arr_.size ()) return; + /* + Banter style chord names (almost). + TODO: + - don't print inclusive scale (i.e. no "9" in c 9/11) + - handle c7 / cmaj7 + - use #,b iso -es -is on tonica + - switch on property, add american (?) chordNameStyle + + Scalar chordNameStyle = get_property ("chordNameStyle"); + if (chordNameStyle == "Banner") + chord = pitches_to_banner (pitch_arr_.size ()); + + */ + Scalar style = get_property ("textstyle"); Scalar alignment = get_property ("textalignment"); Text_def* text_p = new Text_def; @@ -57,21 +71,52 @@ Chord_name_engraver::do_process_requests () text_p->align_dir_= (Direction)(int)alignment; Musical_pitch tonic = pitch_arr_[0]; - text_p->text_str_ = tonic.str (); + + Array scale; + scale.push (Musical_pitch (0)); // c + scale.push (Musical_pitch (1)); // d + scale.push (Musical_pitch (2)); // e + scale.push (Musical_pitch (3)); // f + scale.push (Musical_pitch (4)); // g + scale.push (Musical_pitch (5)); // a + // 7 always means 7-... + scale.push (Musical_pitch (6, -1)); // b + + for (int i = 0; i < scale.size (); i++) + scale[i].transpose (tonic); + + //urg, should do translation in scheme. + char const *acc[] = {"\\textflat\\textflat", "\\textflat", "", "\\textsharp" , "\\textsharp\\textsharp"}; + String tonic_str = tonic.str (); + tonic_str = tonic_str.left_str (1).upper_str () + + acc[tonic.accidental_i_ + 2]; + + String add_str; + String sep_str; for (int i=1; i < pitch_arr_.size (); i++) { Musical_pitch p = pitch_arr_[i]; - int trap = (p.notename_i_ - tonic.notename_i_ + 8) % 8 + 1; - if (((trap != 3) && (trap != 5)) || (p.accidental_i_)) + int trap = p.notename_i_ - tonic.notename_i_ + + (p.octave_i_ - tonic.octave_i_) * 7 + 1; + int accidental = p.accidental_i_ - scale[(trap - 1) % 7].accidental_i_; + if ((trap == 3) && (accidental == -1)) + tonic_str += "m"; // hmm + else if (accidental || (!(trap % 2) || ((i + 1 == pitch_arr_.size ()) && (trap > 5)))) { - text_p->text_str_ += to_str ((p.notename_i_ - tonic.notename_i_ + 8) % 8 + 1); - if (p.accidental_i_) - text_p->text_str_ += p.accidental_i_ < 0 ? "-" : "+"; - if (i + 1 < pitch_arr_.size ()) - text_p->text_str_ += "/"; + add_str += sep_str; + if ((trap == 7) && (accidental == 1)) + add_str += "maj7"; + else + { + add_str += to_str (trap); + if (accidental) + add_str += accidental < 0 ? "-" : "+"; + } + sep_str = "/"; } } + text_p->text_str_ = tonic_str + "$^{" + add_str + "}$"; Text_item* item_p = new Text_item (text_p); item_p->dir_ = DOWN; item_p->fat_b_ = true; diff --git a/lily/includable-lexer.cc b/lily/includable-lexer.cc index 1adf85425d..45607f77ee 100644 --- a/lily/includable-lexer.cc +++ b/lily/includable-lexer.cc @@ -25,6 +25,7 @@ Includable_lexer::Includable_lexer () { yy_current_buffer = 0; + allow_includes_b_ = true; } /** set the new input to s, remember old file. @@ -32,6 +33,12 @@ Includable_lexer::Includable_lexer () void Includable_lexer::new_input (String s, Sources * global_sources) { + if (!allow_includes_b_) + { + LexerError ("include files are disallowed."); + return; + } + Source_file * sl = global_sources->get_file_l (s); if (!sl) { @@ -44,7 +51,7 @@ Includable_lexer::new_input (String s, Sources * global_sources) char_count_stack_.push (0); if (yy_current_buffer) state_stack_.push (yy_current_buffer); - *mlog << "[" << s< char_count_stack_; public: + bool allow_includes_b_; + Includable_lexer (); ~Includable_lexer (); diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh index e2f945b1c0..105b3ba493 100644 --- a/lily/include/lily-guile.hh +++ b/lily/include/lily-guile.hh @@ -16,6 +16,7 @@ #include SCM ly_symbol (String name); +SCM ly_set_scm (String name , SCM val); SCM ly_append (SCM a, SCM b); SCM ly_eval (SCM a); diff --git a/lily/include/main.hh b/lily/include/main.hh index 68b1b21363..17bd2480b4 100644 --- a/lily/include/main.hh +++ b/lily/include/main.hh @@ -18,8 +18,10 @@ void set_default_output (String s); String find_file (String); String get_version_str(); void call_constructors (); + extern Sources* source_global_l; extern bool no_paper_global_b; +extern bool safe_global_b; extern bool no_timestamps_global_b; extern bool find_quarts_global_b; extern int exit_status_i_; diff --git a/lily/include/musical-pitch.hh b/lily/include/musical-pitch.hh index a46471fd61..7a5fd5b5b1 100644 --- a/lily/include/musical-pitch.hh +++ b/lily/include/musical-pitch.hh @@ -21,18 +21,17 @@ */ struct Musical_pitch : public Input { - Musical_pitch (); + Musical_pitch (int notename=0, int accidental=0, int octave=0, bool cautionary=false); /// 0 is c, 6 is b int notename_i_; - /// 0 is central c - int octave_i_; /// 0 natural, 1 sharp, etc int accidental_i_; + /// 0 is central c + int octave_i_; /// Used for cautionary accidentals bool cautionary_b_; - void init () ; Musical_pitch to_relative_octave (Musical_pitch); void transpose (Musical_pitch); static int compare (Musical_pitch const&,Musical_pitch const&); diff --git a/lily/include/my-lily-lexer.hh b/lily/include/my-lily-lexer.hh index 423a771278..70dc4623c8 100644 --- a/lily/include/my-lily-lexer.hh +++ b/lily/include/my-lily-lexer.hh @@ -37,15 +37,20 @@ public: String main_input_str_; void * lexval_l; Scope * toplevel_scope_p_; + bool main_input_b_; Notename_table *note_tab_p_; Array scope_l_arr_; Keyword_table * keytable_p_; int errorlevel_i_; - - + Notename_table *chordmodifier_tab_p_; + Musical_pitch lookup_notename (String s); void start_main_input (); void set_notename_table(Notename_table*tab_p); + bool chordmodifier_b (String) const; + void set_chordmodifier_table (Notename_table*tab_p); + Musical_pitch lookup_chordmodifier (String s); + bool notename_b(String) const; Identifier*lookup_identifier (String s); Musical_pitch lookup_pitch (String s); diff --git a/lily/include/my-lily-parser.hh b/lily/include/my-lily-parser.hh index 7a414b4614..1c40332452 100644 --- a/lily/include/my-lily-parser.hh +++ b/lily/include/my-lily-parser.hh @@ -19,22 +19,15 @@ #include "array.hh" #include "input.hh" -class My_lily_parser { - char const* here_ch_C() const; - Array define_spot_array_; - String init_str_; - - void add_requests (Simultaneous_music*v); +class My_lily_parser +{ +public: + My_lily_parser (Sources * sources_l); + ~My_lily_parser(); - Simultaneous_music * get_note_element (Note_req * ,Duration *); - Simultaneous_music * get_chord (Musical_pitch, Array*, Array*, Duration); - Simultaneous_music* get_rest_element (String, Duration *); - Simultaneous_music* get_word_element (String, Duration*); - Melodic_req* get_melodic_req (Melodic_req* melodic, int quotes); - String notename_str (Melodic_req* melodic); - void set_last_duration (Duration const *); - void set_abbrev_beam (int type_i); - friend int yyparse (void*); + void do_init_file(); + void parse_file ( String init_str, String file_str); + void set_version_check (bool ignore); public: int abbrev_beam_type_i_; @@ -54,7 +47,6 @@ public: My_lily_lexer * lexer_p_; Moment plet_mom(); - void add_notename (String, Musical_pitch req_p); Input here_input() const; void remember_spot(); Input pop_spot(); @@ -69,12 +61,23 @@ public: void set_debug(); void set_yydebug (bool); bool ignore_version_b_; -public: - void do_init_file(); - void parse_file ( String init_str, String file_str); - My_lily_parser (Sources * sources_l); - ~My_lily_parser(); - void set_version_check (bool ignore); + +private: + char const* here_ch_C() const; + Array define_spot_array_; + String init_str_; + + void add_requests (Simultaneous_music*v); + + Simultaneous_music * get_note_element (Note_req * ,Duration *); + Simultaneous_music * get_chord (Musical_pitch, Array*, Array*, Duration); + Simultaneous_music* get_rest_element (String, Duration *); + Simultaneous_music* get_word_element (String, Duration*); + Melodic_req* get_melodic_req (Melodic_req* melodic, int quotes); + String notename_str (Melodic_req* melodic); + void set_last_duration (Duration const *); + void set_abbrev_beam (int type_i); + friend int yyparse (void*); }; #endif // MY_LILY_PARSER_HH diff --git a/lily/lexer.ll b/lily/lexer.ll index 514096c078..3d2a87f601 100644 --- a/lily/lexer.ll +++ b/lily/lexer.ll @@ -138,7 +138,13 @@ EXTENDER [_][_] \\maininput { - start_main_input (); + if (!main_input_b_) + { + start_main_input (); + main_input_b_ = true; + } + else + error ("\\maininput disallowed outside init files."); } \\include { @@ -283,6 +289,9 @@ EXTENDER [_][_] {ALPHAWORD} { return scan_bare_word (YYText ()); } + {NOTECOMMAND} { + return scan_escaped_word (YYText () + 1); + } {UNSIGNED} { yylval.i = String_convert::dec2_i (String (YYText ())); return UNSIGNED; @@ -407,13 +416,12 @@ My_lily_lexer::scan_escaped_word (String str) return id->token_code_i_; } if ((YYSTATE != notes) && (YYSTATE != chords)) { - if (notename_b (str)) - { - yylval.pitch = new Musical_pitch (lookup_pitch (str)); + if (notename_b (str)) { + yylval.pitch = new Musical_pitch (lookup_notename (str)); yylval.pitch->set_spot (Input (source_file_l (), here_ch_C ())); return NOTENAME_PITCH; - } + } } if (check_debug) print_declarations (true); @@ -432,10 +440,16 @@ My_lily_lexer::scan_bare_word (String str) if ((YYSTATE == notes) || (YYSTATE == chords)) { if (notename_b (str)) { DOUT << "(notename)\n"; - yylval.pitch = new Musical_pitch (lookup_pitch (str)); + yylval.pitch = new Musical_pitch (lookup_notename (str)); yylval.pitch->set_spot (Input (source_file_l (), here_ch_C ())); return NOTENAME_PITCH; + } else if (chordmodifier_b (str)) { + DOUT << "(chordmodifier)\n"; + yylval.pitch = new Musical_pitch (lookup_chordmodifier (str)); + yylval.pitch->set_spot (Input (source_file_l (), + here_ch_C ())); + return CHORDMODIFIER_PITCH; } } diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc index b729e90590..26e32488b8 100644 --- a/lily/lily-guile.cc +++ b/lily/lily-guile.cc @@ -14,6 +14,7 @@ #include "main.hh" #include "simple-file-storage.hh" #include "file-path.hh" +#include "debug.hh" /* @@ -41,18 +42,36 @@ ly_symbol (String name) return gh_car (scm_intern (name.ch_C(), name.length_i())); } +SCM +ly_set_scm (String name , SCM val) +{ + return scm_sysintern (name.ch_C(), val); + +} /** Read a file, and shove it down GUILE. GUILE also has file read functions, but you can't fiddle with the path of those. */ - void read_lily_scm_file (String fn) { String s = global_path.find (fn); + if (s == "") + { + String e = _f ("Can not find file `%s\'", fn); + e += " "; + e += _f ("(Load path is `%s\'", global_path.str ()); + error (e); + } + else + *mlog << '[' << s; + + Simple_file_storage f(s); gh_eval_str ((char *) f.ch_C()); + *mlog << ']' << flush; } + diff --git a/lily/lookup.cc b/lily/lookup.cc index 813d004943..c512fcfb7b 100644 --- a/lily/lookup.cc +++ b/lily/lookup.cc @@ -460,7 +460,7 @@ Lookup::plet (Real dy , Real dx, Direction dir) const a.lambda_ = gh_list(ly_symbol ("tuplet"), gh_double2scm (dx), gh_double2scm (dy), - gh_int2scm (dir)); + gh_int2scm (dir), SCM_UNDEFINED); return a; } diff --git a/lily/main.cc b/lily/main.cc index 1f593f5aed..2477c9870f 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -45,6 +45,7 @@ String default_outname_base_global = "lelie"; int default_count_global; File_path global_path; +bool safe_global_b = false; bool experimental_features_global_b = false; bool dependency_global_b = false; @@ -67,6 +68,7 @@ Long_option_init theopts[] = { {0, "find-fourths", 'Q'}, {0, "ignore-version", 'V'}, {1, "output-format", 'f'}, + {0, "safe", 's'}, {0,0,0} }; @@ -109,6 +111,8 @@ usage () cout << _ ( " -Q, --find-fourths show all intervals greater than a fourth\n" ); + cout << _ ( + " -s, --safe inhibit file output naming and exporting TeX macros\n"); cout << _ ( " -t, --test switch on experimental features\n" ); @@ -284,6 +288,9 @@ main_prog (int argc, char **argv) case 'V': version_ignore_global_b = true; break; + case 's': + safe_global_b = true; + break; case 'd': dependency_global_b = true; break; diff --git a/lily/music-output-def.cc b/lily/music-output-def.cc index adace25f0a..83d97ab59b 100644 --- a/lily/music-output-def.cc +++ b/lily/music-output-def.cc @@ -12,6 +12,7 @@ #include "global-translator.hh" #include "dictionary-iter.hh" #include "identifier.hh" +#include "main.hh" int Music_output_def::get_next_default_count () const @@ -94,8 +95,8 @@ Music_output_def::print () const String Music_output_def::get_default_output () const { - if (!scope_p_->elem_b ("output")) - return ""; + if (safe_global_b || !scope_p_->elem_b ("output")) + return ""; Identifier * id = (*scope_p_) ["output"]; String *p = id->access_content_String (false); diff --git a/lily/musical-pitch.cc b/lily/musical-pitch.cc index 9603e025d9..f3dde21fce 100644 --- a/lily/musical-pitch.cc +++ b/lily/musical-pitch.cc @@ -10,18 +10,12 @@ #include "debug.hh" #include "main.hh" -Musical_pitch::Musical_pitch () +Musical_pitch::Musical_pitch (int n, int a, int o, bool c) { - init (); -} - -void -Musical_pitch::init () -{ - notename_i_ = 0; - octave_i_ = 0; - accidental_i_ = 0; - cautionary_b_ = false; + notename_i_ = n; + accidental_i_ = a; + octave_i_ = o; + cautionary_b_ = c; } void diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc index 1e0b06c06a..6446083926 100644 --- a/lily/my-lily-lexer.cc +++ b/lily/my-lily-lexer.cc @@ -28,6 +28,7 @@ static Keyword_ent the_key_tab[]={ {"alternative", ALTERNATIVE}, {"bar", BAR}, {"cadenza", CADENZA}, + {"chordmodifiers", CHORDMODIFIERS}, {"chords", CHORDS}, {"clef", CLEF}, {"cm", CM_T}, @@ -81,6 +82,8 @@ My_lily_lexer::My_lily_lexer() scope_l_arr_.push (toplevel_scope_p_); errorlevel_i_ = 0; note_tab_p_ = new Notename_table; + chordmodifier_tab_p_ = new Notename_table; + main_input_b_ = false; } int @@ -106,7 +109,10 @@ My_lily_lexer::start_main_input () if (!monitor->silent_b ("InitLexer") && check_debug) set_debug (1); + new_input (main_input_str_, source_global_l); + if (safe_global_b) + allow_includes_b_ = false; print_declarations(true); } @@ -168,11 +174,17 @@ My_lily_lexer::LexerError (char const *s) } Musical_pitch -My_lily_lexer::lookup_pitch (String s) +My_lily_lexer::lookup_notename (String s) { return (*note_tab_p_)[s]; } +Musical_pitch +My_lily_lexer::lookup_chordmodifier (String s) +{ + return (*chordmodifier_tab_p_)[s]; +} + bool My_lily_lexer::notename_b (String s) const { @@ -180,16 +192,23 @@ My_lily_lexer::notename_b (String s) const } void -My_lily_lexer::add_notename (String s, Musical_pitch p) +My_lily_lexer::set_notename_table (Notename_table *p) { - (*note_tab_p_)[s] = p; + delete note_tab_p_; + note_tab_p_ = p; +} + +bool +My_lily_lexer::chordmodifier_b (String s) const +{ + return chordmodifier_tab_p_->elem_b (s); } void -My_lily_lexer::set_notename_table(Notename_table *p) +My_lily_lexer::set_chordmodifier_table (Notename_table *p) { - delete note_tab_p_; - note_tab_p_ = p; + delete chordmodifier_tab_p_; + chordmodifier_tab_p_ = p; } char diff --git a/lily/my-lily-parser.cc b/lily/my-lily-parser.cc index a411b3f9a1..75ff14f5c7 100644 --- a/lily/my-lily-parser.cc +++ b/lily/my-lily-parser.cc @@ -4,6 +4,7 @@ source file of the GNU LilyPond music typesetter (c) 1997--1998 Han-Wen Nienhuys + Jan Nieuwenhuizen */ #include "my-lily-parser.hh" @@ -171,25 +172,28 @@ My_lily_parser::get_chord (Musical_pitch tonic, Array* add_arr_p, for (int i = 0; i < add_arr_p->size (); i++) { Musical_pitch p = tonic; - p.transpose ((*add_arr_p)[i]); + Musical_pitch q = (*add_arr_p)[i]; + // duh, c7 should mean + if (q.notename_i_ == 6) + q.accidental_i_--; + p.transpose (q); (*add_arr_p)[i] = p; } add_arr_p->sort (Musical_pitch::compare); for (int i = 0; i < sub_arr_p->size (); i++) { Musical_pitch p = tonic; - p.transpose ((*sub_arr_p)[i]); + Musical_pitch q = (*add_arr_p)[i]; + // duh, c7 should mean + if (q.notename_i_ == 6) + q.accidental_i_--; + p.transpose (q); (*sub_arr_p)[i] = p; } sub_arr_p->sort (Musical_pitch::compare); - Musical_pitch third; - third.notename_i_ = 2; - - Musical_pitch mthird; - mthird.notename_i_ = 2; - mthird.accidental_i_ = -1; - + Musical_pitch third (2); + Musical_pitch mthird (2, -1); Musical_pitch missing; missing = tonic; missing.transpose (third); @@ -202,35 +206,57 @@ My_lily_parser::get_chord (Musical_pitch tonic, Array* add_arr_p, /* must have minimum at 5 (3 is added automatically as missing) */ - if (!add_arr_p->size () - || ((add_arr_p->size () == 1) && - ((add_arr_p->top ().notename_i_ != p.notename_i_) - || (add_arr_p->top () < p)))) + if (!add_arr_p->size ()) add_arr_p->push (p); + else if ((add_arr_p->top () < p) && (add_arr_p->top ().notename_i_ != p.notename_i_)) + add_arr_p->push (p); + add_arr_p->sort (Musical_pitch::compare); Array triads; triads.push (third); // c e triads.push (mthird); // d f triads.push (mthird); // e g triads.push (third); // f a + // 7 always seems means 7-... triads.push (third); // g b +// triads.push (mthird); // g bes triads.push (mthird); // a c triads.push (mthird); // b d + /* + if first addition is 4, assume sus4 and don't add third implicitely + */ + Musical_pitch sus (3); + sus.transpose (tonic); + if (add_arr_p->size ()) + if ((*add_arr_p)[0] == sus) + missing.transpose (mthird); + /* add missing triads */ for (int i = 0; i < add_arr_p->size (); i++) { Musical_pitch p = (*add_arr_p)[i]; - if ((p > missing) && (p.notename_i_ != missing.notename_i_)) - while ((p > missing) && (p.notename_i_ != missing.notename_i_)) + if (p > missing) + while (p > missing) { - add_arr_p->insert (missing, i++); - missing.transpose (triads[(missing.notename_i_ - tonic.notename_i_ + 8) % 8]); + if (p.notename_i_ != missing.notename_i_) + { + if ((missing.notename_i_ - tonic.notename_i_ + 7) % 7 == 6) + { + Musical_pitch special_seven = missing; + Musical_pitch lower (0, -1); + special_seven.transpose (lower); + add_arr_p->insert (special_seven, i++); + } + else + add_arr_p->insert (missing, i++); + } + missing.transpose (triads[(missing.notename_i_ - tonic.notename_i_ + 7) % 7]); } - else - i++; + else + i++; } /* @@ -410,13 +436,6 @@ My_lily_parser::here_input() const return Input (f_l, here_ch_C()); } -void -My_lily_parser::add_notename (String s, Musical_pitch p) -{ - lexer_p_->add_notename (s, p); - -} - Paper_def* My_lily_parser::default_paper_p () { diff --git a/lily/paper-def.cc b/lily/paper-def.cc index a98af9d389..93193f1508 100644 --- a/lily/paper-def.cc +++ b/lily/paper-def.cc @@ -102,7 +102,7 @@ Paper_def::duration_to_dist (Moment d,Real k) const /** - Get the measure wide constant for arithmetic. + Get the measure wide constant for arithmetic spacing. @see John S. Gourlay. ``Spacing a Line of Music,'' Technical Report @@ -122,13 +122,6 @@ Paper_def::arithmetic_spacing (Moment d ,Real k) const return (log_2 (d) + k)* get_var ("arithmetic_multiplier"); } -Real -Paper_def::geometric_spacing (Moment d) const -{ - Real dur_f = (d) ?pow (get_var ("geometric"), log_2 (d)) : 0; - return get_var ("basicspace") + get_var ("unitspace") * dur_f; -} - void Paper_def::set_lookup (int i, Lookup*l) { diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc index bfab233f07..b7074ad295 100644 --- a/lily/paper-outputter.cc +++ b/lily/paper-outputter.cc @@ -39,6 +39,12 @@ Paper_outputter::~Paper_outputter () void Paper_outputter::output_header () { + + if (safe_global_b) + { + ly_set_scm ("security-paranoia", SCM_BOOL_T); + gh_eval_str ("(set! security-paranoia #t)"); + } String s = String ("(eval (") + output_global_ch + "-scm 'all-definitions))"; gh_eval_str (s.ch_C()); diff --git a/lily/parser.yy b/lily/parser.yy index e035a19450..2cf38355e3 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -47,7 +47,7 @@ // mmm Mudela_version oldest_version ("1.0.7"); -Mudela_version version ("1.0.11"); +Mudela_version version ("1.0.12"); // needed for bison.simple's malloc() and free() @@ -104,11 +104,12 @@ Paper_def* current_paper = 0; Array *pitch_arr; Array * strvec; Array *intvec; + Atom * symbol; Box *box; - Simultaneous_music *chord; + Notename_table *chordmodifiertab; Duration *duration; + General_script_def * script; Identifier *id; - Translator* trans; Music *music; Music_list *music_list; Score *score; @@ -124,14 +125,14 @@ Paper_def* current_paper = 0; Paper_def *paper; Real real; Request * request; - General_script_def * script; Scalar *scalar; + Simultaneous_music *chord; String *string; - Atom * symbol; Symtable * symtable; Symtables* symtables; - Text_def * textdef; Tempo_req *tempo; + Text_def * textdef; + Translator* trans; char c; const char *consstr; int i; @@ -163,6 +164,7 @@ yylex (YYSTYPE *s, void * v_l) %token BAR %token BEAMPLET %token CADENZA +%token CHORDMODIFIERS %token CHORDS %token CLEF %token CM_T @@ -221,6 +223,7 @@ yylex (YYSTYPE *s, void * v_l) %type dots %token DIGIT %token NOTENAME_PITCH +%token CHORDMODIFIER_PITCH %token DURATION_IDENTIFIER %token IDENTIFIER %token NOTENAME_TABLE_IDENTIFIER @@ -292,8 +295,9 @@ yylex (YYSTYPE *s, void * v_l) %type symtable symtable_body %type translator_spec translator_spec_body %type tempo_request -%type notenames_body notenames_block -%expect 4 +%type notenames_body notenames_block chordmodifiers_block + +%expect 6 %left '-' '+' @@ -313,6 +317,9 @@ toplevel_expression: notenames_block { THIS->lexer_p_->set_notename_table ($1); } + | chordmodifiers_block { + THIS->lexer_p_->set_chordmodifier_table ($1); + } | mudela_header { delete header_global_p; header_global_p = $1; @@ -359,6 +366,11 @@ check_version: ; +chordmodifiers_block: + CHORDMODIFIERS '{' notenames_body '}' { $$ = $3; } + ; + + notenames_block: NOTENAMES '{' notenames_body '}' { $$ = $3; } ; @@ -425,6 +437,9 @@ block_identifier: $$ = new Score_identifier ($1, SCORE_IDENTIFIER); } + | chordmodifiers_block { + $$ = new Notename_table_identifier ($1, NOTENAME_TABLE_IDENTIFIER); + } | notenames_block { $$ = new Notename_table_identifier ($1, NOTENAME_TABLE_IDENTIFIER); } @@ -1436,7 +1451,7 @@ simple_element: $$ = THIS->get_word_element (*$1, $2); delete $1; } - | '@' chord ';' { + | '@' chord { if (!THIS->lexer_p_->chord_state_b ()) THIS->parser_error (_ ("have to be in Chord mode for chords")); $$ = $2; @@ -1445,10 +1460,8 @@ simple_element: chord: - NOTENAME_PITCH chord_additions chord_subtractions { - Duration d; - d.durlog_i_ = 0; - $$ = THIS->get_chord (*$1, $2, $3, d); + notemode_duration steno_musical_pitch chord_additions chord_subtractions { + $$ = THIS->get_chord (*$2, $3, $4, *$1); }; chord_additions: @@ -1459,24 +1472,33 @@ chord_additions: $1->push (*$2); $$ = $1; } + | chord_additions CHORDMODIFIER_PITCH { + /* + urg, this is kind of ugly. + all but "sus" chord modifiers can be + handled as chord_additions... + */ + $1->push (*$2); + $$ = $1; + } ; chord_note: UNSIGNED { $$ = new Musical_pitch; - $$->notename_i_ = ($1 - 1) % 8; + $$->notename_i_ = ($1 - 1) % 7; $$->octave_i_ = $1 > 7 ? 1 : 0; $$->accidental_i_ = 0; } | UNSIGNED '+' { $$ = new Musical_pitch; - $$->notename_i_ = ($1 - 1) % 8; + $$->notename_i_ = ($1 - 1) % 7; $$->octave_i_ = $1 > 7 ? 1 : 0; $$->accidental_i_ = 1; } | UNSIGNED '-' { $$ = new Musical_pitch; - $$->notename_i_ = ($1 - 1) % 8; + $$->notename_i_ = ($1 - 1) % 7; $$->octave_i_ = $1 > 7 ? 1 : 0; $$->accidental_i_ = -1; } diff --git a/lily/tuplet-spanner.cc b/lily/tuplet-spanner.cc index a879a6881c..96590d3140 100644 --- a/lily/tuplet-spanner.cc +++ b/lily/tuplet-spanner.cc @@ -23,6 +23,7 @@ Plet_spanner::Plet_spanner () { + beam_l_ =0; bracket_visibility_b_ = true; num_visibility_b_ = true; diff --git a/make/out/lelievijver.lsm b/make/out/lelievijver.lsm index 6c25d34376..9b15bddb16 100644 --- a/make/out/lelievijver.lsm +++ b/make/out/lelievijver.lsm @@ -1,15 +1,15 @@ Begin3 Titel: LilyPond -Versie: 1.1.10 -Inschrijf datum: 02DEC98 +Versie: 1.1.13 +Inschrijf datum: 08DEC98 Beschrijving: @FLAPTEKST@ Trefwoorden: muziek typezetten midi notatie Auteur: hanwen@stack.nl (Han-Wen Nienhuys) janneke@gnu.org (Jan Nieuwenhuizen) Onderhouden door: hanwen@cs.ruu.nl (Han-Wen Nienhuys) Voornaamste plek: sunsite.unc.edu /pub/Linux/apps - 770k lilypond-1.1.10.tar.gz + 770k lilypond-1.1.13.tar.gz Oorspronkelijke plek: ftp.cs.uu.nl /pub/GNU/LilyPond/development/ - 770k lilypond-1.1.10.tar.gz + 770k lilypond-1.1.13.tar.gz Copi-eer voorwaarden: GPL End diff --git a/make/out/lilypond.lsm b/make/out/lilypond.lsm index e017975ab1..40370913f7 100644 --- a/make/out/lilypond.lsm +++ b/make/out/lilypond.lsm @@ -1,7 +1,7 @@ Begin3 Title: LilyPond -Version: 1.1.10 -Entered-date: 02DEC98 +Version: 1.1.13 +Entered-date: 08DEC98 Description: LilyPond is the GNU Project music typesetter. This program can print beautiful sheet music from a music definition file. It can also play @@ -14,8 +14,8 @@ Author: hanwen@cs.ruu.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 - 770k lilypond-1.1.10.tar.gz + 770k lilypond-1.1.13.tar.gz Original-site: ftp.cs.uu.nl /pub/GNU/LilyPond/development/ - 770k lilypond-1.1.10.tar.gz + 770k lilypond-1.1.13.tar.gz Copying-policy: GPL End diff --git a/make/out/lilypond.spec b/make/out/lilypond.spec index 4cb9a39f6e..fa465fd0f9 100644 --- a/make/out/lilypond.spec +++ b/make/out/lilypond.spec @@ -1,9 +1,9 @@ Name: lilypond -Version: 1.1.10 +Version: 1.1.13 Release: 1 Copyright: GPL Group: Applications/Publishing -Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.1.10.tar.gz +Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.1.13.tar.gz Summary: A program for printing sheet music. URL: http://www.cs.uu.nl/~hanwen/lilypond Packager: Han-Wen Nienhuys diff --git a/make/toplevel.make.in b/make/toplevel.make.in index ae6073e89c..90b98e9ecb 100644 --- a/make/toplevel.make.in +++ b/make/toplevel.make.in @@ -10,7 +10,7 @@ depth = . # SUBDIRS = scripts buildscripts flower lib lily mf mi2mu po debian \ Documentation init input tex make mutopia test intl stepmake\ - ps + ps scm # SCRIPTS = configure aclocal.m4 diff --git a/mf/GNUmakefile b/mf/GNUmakefile index 984dc63710..3925ccc051 100644 --- a/mf/GNUmakefile +++ b/mf/GNUmakefile @@ -6,7 +6,7 @@ STEPMAKE_TEMPLATES=metafont metapost install install-out EXTRA_DIST_FILES += TODO README feta.mp mfplain.ini -FET_FILES = $(wildcard feta[0-9]*.mf) +FET_FILES = $(wildcard feta[0-9]*.mf) feta-din10.mf LYTABLES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.ly)) LOG_FILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.log)) @@ -30,7 +30,7 @@ INSTALLATION_OUT_FILES1=$(AFM_FILES) INSTALLATION_OUT_DIR2=$(datadir)/ly INSTALLATION_OUT_FILES2=$(LYTABLES) - +export MFINPUTS:=.:$(MFINPUTS) include $(depth)/make/stepmake.make default: $(ALL_GEN_FILES) diff --git a/mutopia/D.Zipoli/GNUmakefile b/mutopia/D.Zipoli/GNUmakefile new file mode 100644 index 0000000000..2d7fc58cf0 --- /dev/null +++ b/mutopia/D.Zipoli/GNUmakefile @@ -0,0 +1,10 @@ +# + +depth = ../.. + +examples= +LOCALSTEPMAKE_TEMPLATES=mutopia + +include $(depth)/make/stepmake.make + + diff --git a/mutopia/D.Zipoli/verso_2.ly b/mutopia/D.Zipoli/verso_2.ly new file mode 100644 index 0000000000..5144576d2e --- /dev/null +++ b/mutopia/D.Zipoli/verso_2.ly @@ -0,0 +1,104 @@ +\header{ +filename="verso_2.ly"; +enteredby = "Peter Chubb"; +arranger = "Peter Chubb"; +composer = "Domenico Zipoli"; +date = "c1700"; +title = "Verso II"; +} + +%{ + This is an organ piece that I've arranged for Recorder trio. + The third part can be played either on a second treble + recorder, or on a tenor. + + Copright 1998 Peter Chubb. + This work may be used and modified freely + under the Gnu Public Licence. +%} + +\version "1.0.10"; + +$voice_one = \notes \relative c' { + a'2 bes4. [c16 bes] | a4 d ~ d c ~ | c b ~ [b8 a] a4 ~| + [a8 gis16 fis16] gis4 a4^"'" e'4 | f2 ~ [f8 g16 f] e4 ~| [e8 f16 e] [d8 c] d2 | + c2 bes4 ~ [bes8 c16 bes] | a4~[a8 bes16 a] g4~ [g8 a16 g] f4 ~ [ f8 g16 f] e4 a4~| + [a8 g16 fis] g4 ~ g f | e2 ~ e4 g4 ~ | g [fis8 e] fis2 \bar "|."; +} + +$voice_two = \notes \relative c' { + [d8 e f d ] g4 c, | f d e2 | f4 ~ [f8 g16 f] e4 a| + d,4. d8 c4 a'4 | r4 a4 bes4 ~ [bes8 c16 bes] | a2 ~ [a8 bes16 a] g4 ~| + [ g8 a16 g ] f4 ~ [f8 g16 f] e4 | f2 ~ f4 e4 ~| e4 d4~ d4 cis4 | + d2 cis4 d4~ | d4 [cis8 b] cis2 | d1 \bar "|."; +} + +$voice_three = \notes \relative c' + { + r1 | r2 [a8 b c a] | d4 g, c4. [d16 c] | + b4. b8 [a b c a ] | [d, e f d ] g4 c,4 | f2 bes4 ~ [bes8 c16 bes]| + a4 ~ [a8 bes16 a] g4 c, | [f8 g a f ] [c d e cis] | [d e f d] a2 | + bes4. [c16 bes] a4 d | a1 | d1 \bar"|."; +} + +global=\notes { + \time 2/2; + \keysignature c; + \property Staff.timeSignatureStyle = "C" +} + + +recorder= { +% For three recorders. +% + \type StaffGroup + < + \type Staff = descant { + \property Staff.Instrument = "Descant" + \clef "G^8"; + \notes \transpose bes' {\global \$voice_one } + } + + \type Staff = treble { + \property Staff.Instrument = "Treble" + \clef "G"; + \notes \transpose bes' {\global \$voice_two } + } + + \type Staff = lower { + \property Staff.Instrument = "Tenor or Treble II" + \clef "G"; + \notes \transpose bes'' {\global \$voice_three } + } + > +} + +% +% For keyboard (Organ) +% Not quite the same as the original. +% TODO: add inner part; +% Try to make parts cross staves as apropriate. +% +organ={ + \type GrandStaff + < + \type Staff = treble { + \clef "G"; + \global + \type Staff < + { \voiceone \$voice_one } + { \voicetwo \$voice_two } + > + } + \type Staff = bass { + \clef "F"; \global \$voice_three + } + > +} + +\score{ + \recorder + + \paper{} +} + diff --git a/mutopia/F.Schubert/AnSylvia.ly b/mutopia/F.Schubert/AnSylvia.ly new file mode 100644 index 0000000000..e8e7bd3574 --- /dev/null +++ b/mutopia/F.Schubert/AnSylvia.ly @@ -0,0 +1,404 @@ +\header { +filename = "AnSylvia.ly"; +enteredby = "Peter Chubb"; +composer = "Franz Schubert"; +poet = "Original text by William Shakespeare\\\\" + + "German text by Eduard von Bauernfeld"; +opus = "D. 891"; +date = "1826"; +title = "An Sylvia"; +} + + +\version "1.0.10"; + +\include "paper16.ly"; +\include "paper13.ly"; + +pianoRH=\notes \relative c'' { + \clef "G"; +%1 + <[b,8-.(\pp d-. g-.> <)b-. d-. g-.]> + <[b8-. d-. g-.(> <)b-. d-. g-.]> + | +%2 + <[c d g_"{\it simile}" \< > + <[c d fis> < \! c d fis > +%3 + | + <[d f gis \> > < \! d f gis ]> + <[c e a> + | +%4 + <[d a' b> + <[d g a> | + \bar "|:"; +%5 + <[b_. d g( \pp > <)b_. d g]> + <[b_. d g(> <)b_. d g]> + | +%6 + <[c d g> + <[c d fis> < a c dis fis> + | +%7 + <[g c e g> + <[g c e g> + | +%8 + <[g c e> + <[g b d> + | +%9 + <[fis a d> + <[g b d> + | +%10 + <[ g a c d \> > <\! fis a c d ]> + <[g b d> + | +%11 + <[g a c d> + <[g b d> <[b d g> + | +%12 + <[ d fis b> + <[ d fis b> + | +%13 + <[e fis b> < e fis ais> + <[e fis ais> + | +%14 + <[cis g' a!> + <[cis g' a> < e g a> + | +%15 + <[e g a> + <[d fis a> + | +%16 + <[d fis a> + <[d fis a \< > < \! d fis a ]> + | +%17 + <[d a' c \> > < \! d a' c ]> + <[d a' c> + | +%18 + <[d g a c \> > + <[d fis a c> <\! d fis a c \pp > + | +%19 + <[d g b> + <[d g b> + | +%20 + <[e g c> + <[e a c> < e b' c]> + | +%21 + <[e c'> + <[e a c> + | +%22 + <[d a' c> + <[d a' d> + | +%23 + <[b d b'> + <[b d g \< > < \! b d fis ]> + | +%24 + <[b d e \> > < \! gis b e ]> + <[a c e> + | +%25 + <[d a' c> + <[d a'> > < \! c d fis \p ]> + | +%26 + <[b d g> + <[b d g> + | +%27 + <[c d g > + <[c d fis \< > < \! c d fis > + | +%28 + <[d f gis \> > < \! d f gis > + <[c e a> +%29 + <[d a' b> + <[d g a> < d fis! a> + \bar ":|"; +%30 + r2 + \bar "|."; +} + +pianoLH=\notes \relative c { + \clef "F"; + g4-. d-. r [g8.( g16] | )a4-. d,-. r [a'8.( a16] | +%3 + )b4-. [d,8.( d16] )c'4-. [d,8. d16] | +%4 + d'4-. d,-. d'-. [d,8.( d16 ] + \bar "|:"; +%5 + )g4-. d_. r4 [g8.( g16] | +%6 + )a4-. d,-. r4 [a'8.( a16] | +%7 + )c4-. c,-. r [e8.( e16] | +%8 + )g4-. g,-. r4 [b'8.( b16] | +%9 + )d4-. c-. b-. g-. | +%10 + d2(-> )g4 r4 \clef "G"; | +%11 + d'''2->( )b4 r4 \clef "F"; | +%12 + b,,4-. fis-. r [b8.( b16] | +%13 + )cis4-. fis,4-. r4 [d'8.( d16] | +%14 + )e4-. g,4-. r [cis8.( cis16] | +%15 + )d4-. d,4-. r4 [d'8.( d16] | +%16 + )fis4-. d-. a-. d-. | +%17 + fis,4.( a8 )d4 r4 \clef "G"; | +%18 + e''2->( )d4 r4 \clef "F"; | +%19 + g,,,4-. b-. r [g8.( g16 ] | +%20 + )c4-. e-. r [gis,8.( gis16] | +%21 + )a4-. c-. r [g!8.( g16 ] | +%22 + )fis4-. d'-. r [fis,,8.( fis16] | +%23 + )g4-. g'-. r [b,8.( b16] | +%24 + )c4-. c'-. r [c,8.( c16] | +%25 + )d4-. d'-. r [d,8.( d16] | +%26 + )g4-. d-. r [g8.( g16] | +%27 + )a4-. d,-. r [a'8.( a16] | +%28 + )b4 [d,8.( d16] )c'4-. [d,8. d16] | +%29 + d'4-. d,-. d'-. [d,8.( d16 ] + \bar ":|"; +%30 + )g2 r2 \bar "|."; + +} + +tune=\notes \relative c'' { + % Put dynamics over the stave. + \property Voice.dynamicdir = "1" + + r1 | r1 |r1 | r1 | + \bar "|:"; +%5 + b2. g4 | +%6 + g( )fis \type Staff < {\voiceone r2}{\voicetwo r4 a4}> | +%7 + g2. e4 | +%8 + e4( )d r4 \< g | +%9 + fis a g \! b | +%10 + d2 b4 r4 | +%11 + r1 | +%12 + d2. b4 | +%13 + b4( )ais r [cis8()b] | +%14 + a!2. e4 | +%15 + g4()fis r4 \< d4 | +%16 + a' fis c' \! a | +%17 + e'4.( \> )c8 \! a4 r | +%18 + r1 | +%19 + d2. \type Staff < {\voiceone b8 ~ g8} {\voicetwo [b8 g8]} > | +%20 + \property Voice.slurdash = 2 + fis4( )e \property Voice.slurdash = "" + \type Staff < {\voiceone r2}{\voicetwo r4 e4} > | +%21 + c'2. [b16( a g )fis] | +%22 + e4( )d \type Staff <{\voiceone r2} {\voicetwo r4 d4}> | +%23 + d2 d'2 | +%24 + e2 e,2 | +%25 + fis2. \> [g8( )a] | +%26 + \! g2 r2 | +%27 + r1 | r1 | r1 + \bar ":|"; + r1 \bar "|."; +} + +fourbars=\lyrics { _1 | _1 | _1 | _1 | } +verseOne=\lyrics { + Who2. is4 | Syl- via, _2 | + What2. is4 | she, _ _ That | + all our swains com- | + mend2 her?4 _ | + _1 | + Ho-4 - - ly, | + fair,2 _4 and | + wise2. is4 | + she;2 _4 The | + heav'ns4 such grace did | + lend2 her4 _ | _1 | + That2. a-4 | + do- red _2 | + She2. might4 | + be,2 _ | + That2 a- | + do- red | + she2. might4 | be.2 _ | +} + +verseTwo=\lyrics { + Is2. she4 | kind,2 _4 as | + she2. is4 |fair?2 _4 For | + beau- ty lives with | kind-2 ness4 _ | _1 | + To2. her4 |eyes2 _4 doth | Love 2. re-4 | + pair,2 _4 To | help him of his | blind-2 ness;4 _ | + _1 | + And2*3/2 be-8 ing | help'd4 - _ _ | in-2. hab-8 its | + there,2 _4 And | + be-2 ing | help'd in- | ha-2 -4 bits4 | there.2 _2 | +} + +verseThree=\lyrics { + Then2. to4 | Syl-4 via _2 | + let2. us4 | sing,2 _4 That | + Syl- via is ex- | cel4 - ing; _ | _1 | + She2. ex-4 | cels2 _4 each | mor - - tal | + thing,2 _4 Up- | on the dull earth | dwell-2 ing4 + _ | _1 | + To2. her4 | gar- lands _2 | let2. us4 | + bring,2 _ | To her | gar- lands | let2. us4 | + bring.2 _ | +} + + +%% +%% German Words -- syllabification may be incorrect (entered by +%% someone who knows no German!) +origVerseOne=\lyrics { + Was2. ist4 | Sil-4 via, _2 | + sag-2. et4 | an,2 _4 + Da{\ss}4 | + sie die wie- te | Flur2 preist?4 _ | _1| + Sch\"on2. und4 | zart2 _4 seh'- | ich2. sie4 | + nah'n,2 _4 Auf4 | + Him- melsg- gunst " und" | Spur2 weist,4 _ | _1 + Da{\ss}2. ihr4 | al- les _2 | + un-2. ter4 | tan.2 _ | + Da{\ss}2 ihr | al- les | un-2. ter4 | tan2 _ | +} + +origVerseTwo=\lyrics { + Ist2. sie4 | sch\"on2 _4 und4 | gut2. da-4 | zu?2 _4 + Reiz4| labt wie mil- de | Kind-2 heit;4 _ | _1 | + Ihr-2. em4 | Aug'-2 _4 eilt | A-2. mor4 | + zu,2 _4 + Dort4 | heilt er sein- e | Blind-2 heit,4 _ | _1 | + Und2. ver-4 | weilt2 _4 in4 | s\"u{\ss}-2. er4 + Ruh'.2 _ | + Und2 ver-2 | weilt in | s\"u{\ss}-2. er4| Ruh'.2 _ | +} + +origVerseThree=\lyrics { + Dar4 - - um | Sil- via, _2 | t\"on',2. o4 | + Sang,2 _4 + Der4 | hold- en Sil- via | Ehr-2 en;4 _4 | _1 | + Je2. den4 | Reiz2 _4 be- |siegt2. sie4 | lang,2 _4 + Den | Er- de kann ge- | w\"ah-2 ren;4 _ | _1 | + Kr\"an-2. ze4 | ihr2 _4 und4 | Sai-2. ten4 + |klang!2 _ + Kr\"an-2 ze | ihr und | Sai-2. ten-4 |klang!2 _ | +} + +global=\notes { + \key G; + \time 2/2; + \property Staff.timeSignatureStyle = "C" +} + +Piano=\type GrandStaff = piano { + \property GrandStaff.instrument="Piano" + < + \type Staff=RH {\global \pianoRH } + \type Staff=LH {\global \pianoLH } + > +} + + +EnglishWords= \lyrics< + {\fourbars \verseOne \fourbars} + {\fourbars \verseTwo \fourbars} + {\fourbars \verseThree \fourbars} +> + +GermanWords = \lyrics< + {\fourbars \origVerseOne \fourbars} + {\fourbars \origVerseTwo \fourbars} + {\fourbars \origVerseThree \fourbars} + +> + +Vocals= < + \type Staff = vocal < + \notes \transpose c {\clef "F"; \global\tune} +% {\type Lyrics = vocal \EnglishWords} + {\type Lyrics = vocal \GermanWords} + > +> + + +\score { + < + % \transpose aes for basses (Key Eflat). + % (bes to c'') + % \transpose d' for original (in A.) + % Untransposed range: d' to e'' + \notes \transpose d' < + \Vocals + \Piano + > + > + \paper { + % \paper_thirteen; + \paper_sixteen; + linewidth = 18.0\cm; + textheight = 26.0\cm; + gourlay_maxmeasures=15.0; + \translator { \HaraKiriStaffContext } + } +} + diff --git a/mutopia/F.Schubert/GNUmakefile b/mutopia/F.Schubert/GNUmakefile new file mode 100644 index 0000000000..d1038f0a04 --- /dev/null +++ b/mutopia/F.Schubert/GNUmakefile @@ -0,0 +1,10 @@ +# + +depth = ../.. + +examples=standchen +LOCALSTEPMAKE_TEMPLATES=mutopia + +include $(depth)/make/stepmake.make + + diff --git a/mutopia/standchen-16.ly b/mutopia/F.Schubert/standchen-16.ly similarity index 100% rename from mutopia/standchen-16.ly rename to mutopia/F.Schubert/standchen-16.ly diff --git a/mutopia/standchen-20.ly b/mutopia/F.Schubert/standchen-20.ly similarity index 100% rename from mutopia/standchen-20.ly rename to mutopia/F.Schubert/standchen-20.ly diff --git a/mutopia/standchen.ly b/mutopia/F.Schubert/standchen.ly similarity index 100% rename from mutopia/standchen.ly rename to mutopia/F.Schubert/standchen.ly diff --git a/mutopia/GNUmakefile b/mutopia/GNUmakefile index 5ae86949b1..6e12e84c64 100644 --- a/mutopia/GNUmakefile +++ b/mutopia/GNUmakefile @@ -2,9 +2,9 @@ depth = .. -SUBDIRS = J.S.Bach Coriolan W.A.Mozart +SUBDIRS = J.S.Bach Coriolan W.A.Mozart F.Schubert D.Zipoli Hymns -examples=standchen gallina +examples= gallina LOCALSTEPMAKE_TEMPLATES=mutopia include $(depth)/make/stepmake.make diff --git a/mutopia/Hymns/GNUmakefile b/mutopia/Hymns/GNUmakefile new file mode 100644 index 0000000000..2d7fc58cf0 --- /dev/null +++ b/mutopia/Hymns/GNUmakefile @@ -0,0 +1,10 @@ +# + +depth = ../.. + +examples= +LOCALSTEPMAKE_TEMPLATES=mutopia + +include $(depth)/make/stepmake.make + + diff --git a/mutopia/Hymns/diademata.ly b/mutopia/Hymns/diademata.ly new file mode 100644 index 0000000000..d05370f110 --- /dev/null +++ b/mutopia/Hymns/diademata.ly @@ -0,0 +1,90 @@ +\header { +filename = "diademata.ly"; +enteredby = "Peter Chubb"; +composer = "Sir G. J. Elvey"; +date = "1868"; +title = "Diademata"; +metre = "6 6. 8 6. D"; +} +\version "1.0.10"; + +sop=\notes \transpose c''{ + ees2 | ees4 ees4 g2 g2 | c'1. \bar "||"; + c'2 | bes2 ees aes g | f1. \bar "||"; + f2 | g bes c' bes | a g4 ~ f bes2 + ees'2 | d' ees' c' c' | bes1. \bar "||"; + bes2 | bes g f ees | c'1. \bar "||"; + c'2 | c' a g f | d'1. \bar "||"; + d'2 | ees'2. d'4 c'2 bes | aes f g + bes2 | aes g f f | ees\breve \bar "||"; + +} + +alt=\notes \transpose c''{ + bes,2 bes,4 bes,4 ees2 ees2 | ees1. \bar "||"; + ees2 | ees ees d ees | d1. \bar "||"; + d2 | ees f ees g | ees c f + ees2 | f g c f | d1. \bar "||"; + d2 | ees ees d ees | ees1. \bar "||"; + e2 | f f ees ees | d1. \bar "||"; + f2 | ees ees ees ees | ees d ees + ees | ees ees ees d | ees\breve \bar "||"; +} + + +ten=\notes \transpose c' { + g2 g4 g4 g2 g2 | aes1. \bar "||"; + aes2 | bes c' aes bes | bes1. \bar "||"; + bes2 | bes bes g g | c' a bes + a2 | bes bes bes a | bes1. \bar "||"; + bes2 | bes bes aes bes | c'1. \bar "||"; + bes2 | a c' bes c' | bes1. \bar "||"; + bes2 | bes bes aes bes | c' bes bes + bes c' bes bes2. aes4 | g\breve \bar "||"; +} + +bass=\notes \transpose c' { + ees2 ees4 ees4 c2 c2 | aes,1. \bar "||"; + aes2 | g aes f ees | bes,1. \bar "||"; + bes,2 | ees d c ees | f ees d + c2 bes, ees f f | bes,1. \bar "||"; + aes2 | g ees f g | aes1. \bar "||"; + g2 | f f g a | bes1. \bar "||"; + aes2 | g g aes g | f bes ees + g,2 | aes, ees bes, bes, | ees\breve \bar "||"; +} + +global = \notes{ + \time 4/2; + \property Staff.timeSignatureStyle="none" + \key ees; +} + +$upper_staff = \type Staff = upper { + \global + \clef "treble"; + \type Staff < + { \voiceone \sop } + { \voicetwo \alt } + > +} + +$lower_staff = \type Staff = lower { + \global + \clef "bass"; + \type Staff < + { \voiceone \ten } + { \voicetwo \bass } + > +} + +\score{ + \type ChoirStaff\notes < + \$upper_staff + \$lower_staff + > + \paper { + linewidth= 140.0\mm; + gourlay_maxmeasures = 6.0; + } +} diff --git a/mutopia/Hymns/laudatedom.ly b/mutopia/Hymns/laudatedom.ly new file mode 100644 index 0000000000..0d0e4a5a5b --- /dev/null +++ b/mutopia/Hymns/laudatedom.ly @@ -0,0 +1,76 @@ +\header { +title = "Laudate Dominum"; +composer = "Parry"; +metre = "10 10 . 11 11"; +} + +\version "1.0.10"; + +sop = \notes \transpose c''{ + f4 | d' bes c' | f2 \bar "||"; + bes4 | g f ees | d2 \bar "||"; + f4 | d' c' f | bes2 \bar "||"; + a4 | c' bes g | f2 \bar "||"; + f4 | bes bes bes | bes [a8 ~ g8] \bar "||"; + [a8~bes8] | c'4 bes c' | f2 \bar "||"; + a4 | d' d' d' | [bes8 ~ a8] g4 \bar "||"; + ees'4 | d' bes c' | bes2 \bar "||"; +} + +alto = \notes \transpose c'' { + f4 | f f g | f2 \bar "||"; + f4 | bes, d c | bes,2 \bar "||"; + f4 | bes a f | f ~ g \bar "||"; + f4 | fis g e | f2 \bar "||"; + c4 | bes, ees f | g ees \bar "||"; + f4 | g f g | f2 \bar "||"; + f4 | fis g a | g g \bar "||"; + g | f4. g8 a4 | bes2 \bar "||"; +} + +tenor = \notes \transpose c' { + f4 | bes d' [c'8 ~ bes] | a2 \bar "||"; + f4 | g g a | bes2 \bar "||"; + d'4 | e' f' c' | d' ~ c' \bar "||"; + c'4 | ees' d' bes | a2 \bar "||"; + a4 | bes bes aes | g bes \bar "||"; + bes | ees' d' [c'8 ~ bes8] | a2 \bar "||"; + c'4 | c' bes a | [d'8 ~ c'8] bes4 \bar "||"; + bes4 | bes d' ees' | d'2 \bar "||"; +} + +bass = \notes \transpose c'{ + f4 | bes d ees | f2 \bar "||"; + d4 | ees c f | bes,2 \bar "||"; + bes4 | g a a, | d ~ e \bar "||"; + f | a, bes, c | f2 \bar "||"; + ees4 | d c d | ees ees \bar "||"; + d | c d ees | f2 \bar "||"; + ees4| d e fis | g g \bar "||"; + c4 | f f f | bes,2 \bar "||"; +} + +global = \notes { + \time 3/4; + \partial 4; + \key bes; +} + +\score { + < + \type Staff=top { + \global \clef "G"; + \type Staff < + \notes{\voiceone \sop } + \notes{\voicetwo \alto } + > + } + \type Staff=bottom { + \global \clef "F"; + \type Staff < + \notes{\voiceone \tenor} + \notes{\voicetwo \bass } + > + } + > +} diff --git a/mutopia/Hymns/maccabaeus.ly b/mutopia/Hymns/maccabaeus.ly new file mode 100644 index 0000000000..607e0cf461 --- /dev/null +++ b/mutopia/Hymns/maccabaeus.ly @@ -0,0 +1,109 @@ +\header { +filename = "maccabaeus.ly"; +enteredby = "Peter Chubb"; +composer = "G. F. Handel"; +date = "1680"; +title = "Maccabaeus"; +metre = "10 11. 11 11. and refrain"; +} + +\version "1.0.10"; + +sop=\notes \relative c'' { + b2 gis4. a8 |b2 e,2 | + [fis8 gis] [a b] a4 gis | + fis1 \bar "||"; + [gis8 a] [b cis] b4 b | + e2 b | + a4 [gis8 fis] fis4. e8 | + e1 \bar "||"; + [gis8 fis] [gis a] gis4 gis | + fis2 e | + a4 gis fis e | dis1 \bar "||"; + [e8 dis] [e fis] e4 e | cis'2 ais | + b4 [cis8 b] ais4. b8 | b1 \bar "||"; + + b2^"{\it Refrain}" gis4. a8 | b2 e, | + [fis8 gis] [a b] a4 gis | fis1 \bar "||"; + [gis8 a] [b cis] b4 b | e2 b | + a4 [gis8 fis] fis4. e8 | e1 \bar "|."; +} + +alt=\notes \relative c'{ + e2 e4. dis8 | e2 b | + [dis8 e] [fis gis] fis4 e | dis1 | + e4 e e dis | e2 e | + dis4 e e4. b8 | b1 | + [e8 dis] [e fis] e4 e | + dis2 cis | + bis4 cis cis cis | bis1 | + [cis8 bis] [cis dis] cis4 e4| + e2 e2 | + dis4 gis fis fis | fis1 | + gis2 e4. dis8 | e2 b2 | + [dis8 e] [fis gis] fis4 e | dis1 | + e4 e e dis | e2 e | dis4 e dis4. b8 | b1 | +} + +ten=\notes \relative c' { + gis2 b4. a8 | gis2 b | + b4 b b b | b1 | + b4 [b8 a] b4 a | b2 gis | + a4 b b4. gis8 | gis1 | + b4 b b b | a2 gis | fis4 gis a gis | gis1 | + gis4 gis cis cis | cis2 cis | + b4 gis cis cis | dis1 | + e2 b4. a8 | gis2 b2 | + b4 b b b | b1 | + b4 [b8 a] b4 a | b2 gis | + a4 [b8 cis] b4. gis8 | gis1| +} + +bass=\notes \relative c { + e2 gis4. fis8 | e2 gis | + b4 b dis, e | b1 \bar "||"; + [e8 fis] [gis a] gis4 fis | gis2 gis | + fis4 e b4. e8 | e1 \bar "||"; + e4 e e e | b2 cis | + dis4 e fis cis | + gis1 \bar "||"; + cis4 cis cis b' | ais2 fis | + gis4 e fis fis | b1 \bar "||"; + e,2 e4. fis8 | gis2 gis,2 | + b4 b dis e | b1 \bar "||"; + [e8 fis] [gis a] gis4 fis | gis2 gis | + fis4 [gis8 a] b4. e,8 | e1 \bar "|."; +} + +global = \notes { + \time 2/2; + \property Staff.timeSignatureStyle = "C" + \key E; +} + +$upper_staff = \type Staff = upper { + \global + \clef "treble"; + \type Staff < + {\voiceone \sop } + {\voicetwo \alt } + > +} + +$lower_staff = \type Staff = lower { + \global + \clef "bass"; + \type Staff < + {\voiceone \ten } + {\voicetwo \bass } + > +} + +\score { + < + \$upper_staff + \$lower_staff + > + \paper { + } +} diff --git a/mutopia/Hymns/ode.ly b/mutopia/Hymns/ode.ly new file mode 100644 index 0000000000..9f6dd47129 --- /dev/null +++ b/mutopia/Hymns/ode.ly @@ -0,0 +1,74 @@ +\header { +filename = "ode.ly"; +enteredby = "Peter Chubb"; +composer = " Beethoven"; +date = "1800"; +title = "Ode to Joy"; +metre = "8 7 8 7 D"; +} + +\version "1.0.10"; + +sop=\notes \relative c'' { + b4 b c d | d c b a | g g a b | b4. a8 a2 \bar "||"; + b4 b c d | d c b a | g g a b | a4. g8 g2 \bar "||"; + a4 a b g | a [b8 ~ c] b4 g | a [b8 ~ c] b4 a | g a d,2 \bar "||"; + b'4 b c d | d c b a | g g a b | a4. g8 g2 \bar "||"; +} + +alto=\notes \relative c'' { + g4 g a g | g4. a8 g4 fis | d d fis g| g4. fis8 fis2 \bar "||"; + g4 g a g | g4. a8 g4 fis | d d fis g| g4 fis d2 \bar "||"; + d4 d d d | d d d d | d d fis fis | e cis d2 \bar "||"; + d4 g a a b [g8~a] g4 e | e d fis g |g fis g2 \bar "||"; +} + +tenor=\notes \relative c'{ + d4 d c b | e4. d8 d4 d | b b d d | d4. d8 d2 \bar "||"; + d4 d c b | e4. d8 d4 d | b b d d | d4 d b2 \bar "||"; + fis4 fis g e | fis [g8 ~ a8] g4 e | fis fis fis b | b a g ~ fis \bar "||"; + g4 d' f, f | g4. d'8 d4 c | g g c c | d d b2 \bar "||"; +} + +bass= \notes \relative c' { + g4 g g g | e4. fis8 g4 d | b b a g | d'4. d8 d2 \bar "||"; + g4 g g g | e4. fis8 g4 d | b b a g | d' d g,2 \bar "||"; + d'4 d d d | d d d d | d d dis dis | e a, d2 \bar "||"; + g4 g f f | e4. fis8 g4 c, | c b a g | d' d g,2 \bar "||"; +} + + +global=\notes{ + \time 4/4; + \property Staff.timeSignatureStyle="C" + \key G; +} + +$upper_staff = \type Staff = upper \notes { + \global + \clef "G"; + \type Staff < + {\voiceone \sop} + {\voicetwo \alto} + > + \bar "|."; +} + +$lower_staff = \type Staff = lower \notes { + \global + \clef "F"; + \type Staff < + {\voiceone \tenor} + {\voicetwo \bass } + > + \bar "|."; +} + +\score{ + < + \$upper_staff + \$lower_staff + > + \paper { + } +} diff --git a/mutopia/Hymns/passion.ly b/mutopia/Hymns/passion.ly new file mode 100644 index 0000000000..a4754360a3 --- /dev/null +++ b/mutopia/Hymns/passion.ly @@ -0,0 +1,85 @@ +\header { +filename = "passion.ly"; +title = "Passion Chorale"; +composer = "J. S. Bach"; +enteredby = "Peter Chubb"; +} + +\version "1.0.10"; + +sop=\notes \transpose c'' { + \repeat 2 { + \partial 2; + e2 | a g f e | d1 e2 ^"{\kern1em\Huge ,}" b | c' b4([c'8 + )d'] c'2 b4( )a4 | + a1. } + c'2 | b4( )a4 g2 a b | c'1 c'2 ^"{\kern1em\Huge ,}" g2 | + a g a4( )g f2 | e1. ^"{\kern3em\Huge ,}" + c'2 | b4( )c'4 d'2 c' b | a1 b2 ^"{\kern1em\Huge ,}" + e2 | f e d g4( )f4 | e1. \bar "||"; +} + +alt=\notes \transpose c'' { + \repeat 2 { + \partial 2; + c2 | c4( )d4 e2 a,4( )b,4 c2 | c2( )b, c + e | e f e d4( )c4 | + c1. } + e2 | fis e f f | g( )f e + e2 e4( )d cis( )d e2 e4( + )d | d2( )cis1 + a2 | g g g4( )a b( )g | g2( )fis g + c2 | d c d e4( )d | d2( c )b, \bar "||"; +} + + +ten=\notes{ + \repeat 2 { + \partial 2; + a2 | a4( )b c'2 d' g | a( )g g b | + a a a gis | + e1. } + a2 | fis b c' d' | c'4( bes2 )aes4 g2 + c'4( )bes |a2 bes a a | a1. + d'2 | d' d'4( [e'8 )f'8] e'2 d' | e'2( )d' d' + g2 | g g g4( )a bes2 | b2( a )gis \bar "||"; +} + +bass=\notes{ + \repeat 2 { + \partial 2; + a4( )g | f2 e d c | fis,( )g, c + gis,2 | a, d e e | + a,1. } + a2 | dis e ees d | e( )f c + c | f e4( )d cis2 d | a,1. + fis2 | g4( )a b2 e4( )fis g2 | cis2( )d2 g, + c2 | b, c bes,4( )a, g,2 | gis,2( a, )e \bar "||"; +} + +global=\notes{ + \key c; + \time 4/2; + \property Staff.timeSignatureStyle="none" +} + +\score{ + < + \type Staff = "top" { + \clef "treble"; + \global + \type Staff <{\voiceone \sop}{\voicetwo \alt} > + } + \type Staff = "bottom" { + \clef "bass"; + \global + \type Staff < {\voiceone \ten}{\voicetwo \bass} > + } + > + + \paper { + linewidth= 140.\mm; + + gourlay_maxmeasures = 6.; + } +} diff --git a/mutopia/Hymns/stille.ly b/mutopia/Hymns/stille.ly new file mode 100644 index 0000000000..336c30bf38 --- /dev/null +++ b/mutopia/Hymns/stille.ly @@ -0,0 +1,187 @@ +\header { +title = "Stille Nacht"; +subtitle = "(Silent Night)"; +filename = "stille.ly"; +enteredby = "Peter Chubb"; +composer = "Franz X. Gruber"; +poet = "Joseph Mohr"; +} + + +\version "1.0.7"; + +global=\notes { + \time 6/4; + \key Bes; +} + +sop=\notes \relative f' { +%1 + f4. ( ) g8 f4 d2. | + f4. ( ) g8 f4 d2 r4 | + c'2 c4 a2 r4 | + bes2 bes4 f2. | +%5 + g2 g4 bes4.( )a8 g4 | + f4.()g8 f4 d2 r4 | + g2 g4 bes4.( )a8 g4 | + f4.()g8 f4 d2 r4 | +%9 + c'2 c4 es4.()c8 a4 | + bes2.~ ( r4 | + bes4 ( )f d f4.( )es8 c4 | + bes2. ~ bes2 r4 \bar "|."; +} + +alt=\notes\relative c' { +%1 + d4. es8 d4 bes2. | + d4. es8 d4 bes2 r4 | + es2 es4 ges2 r4 | + f2 es4 d2. | +%5 + es2 es4 es4. f8 es4 | + d4. es8 d4 bes2 r4 | + es2 es4 es4. f8 es4 | + d4. es8 d4 c( )bes r4 | +%9 + es4( )f g a4. a8 ges4| + f2.~ e!2-- r4 | + d2 bes4 d4. c8 c4 | + bes2. ~ bes2 r4 \bar "|."; +} + +ten=\notes\relative c' { + bes2 bes4 f2. | + bes2 a4 f2 r4 | + a2 a4 c2 r4 | + bes2 a4 f2 ( ) bes4 | +%5 + bes2 bes4 g4. a8 bes4 | + bes4. bes8 bes4 f2 r4 | + bes2 bes4 g4. a8 bes4 | + bes4. bes8 bes4 f2 r4 | +%9 + g2 bes4 c4. c8 c4 | + bes2. ~ g2-- r4 | + bes2 g4 a4. bes8 a4 | + bes2. ~ bes2 r4 \bar "|."; +} + +bass=\notes\relative c { +%1 + bes2 bes4 bes2. | + bes2 bes4 bes2 r4 | + f'2 f4 es2 r4 | + d2 c4 bes2. | +%5 + es2 es4 es2 es4 | + bes4. bes8 bes4 bes2 r4 | + es2 es4 es4. es8 es4 | + bes4. bes8 bes4 bes2 r4 | +%9 + c4 d es f4. f8 es4 | + d2. ~ c2-- r4 | + f2 f4 f4. g8 a4 | + bes2. ~ bes2 r4 \bar "|."; +} + +chords=\lyrics{ + "B\\textflat"1 ""2 + "B\\textflat maj7"1 ""2 + "F7"2. "E\\textflat dim"2. | + "B\\textflat /D"2 "Cm7"4 "B\\textflat"2. | + "E\\textflat"1 ""2 | + "B\\textflat"1 ""2 | + "E\\textflat"1 ""2 | + "B\\textflat"1 ""2 | + "Cm "4 "Gm7sus4/D "4 "Cm/E\\textflat "4 "F7"2 "E\\textflat dim"4 | + "B\\textflat /D"2. "C9"2 ""4 | + "B\\textflat /F"2. "F7"2. | + "B\\textflat"2 ""2 ""2 +} + +v1 = \lyrics { + Stil-2 le4 Nacht,2. hei-4. li-8 ge4 Nacht,2. + Al-2 les4 schl\"aft,2. ein-2 sam4 wacht2. + Nur2 das4 trau-2 te,4 hoch-4. heil8 ige4 Paar,2. + Hold-2 er4 Knabe2 im4 lock-4. i-8 gen4 Haar2. + Schlaf2 in4 himm-4. li-8 scher4 Ruh'!2 - - + Schlaf2 in4 himm-4. li-8 scher4 Ruh'!2 - - +} +v2 = \lyrics { + Stil-2 le4 Nacht,2. hei-4. li-8 ge4 Nacht,2. + Hir-2 ten4 erst2. kund2 ge-4 macht2. + Durch2 der4 En-2 gel4 Ha-4. lle-8 lu4 ja2. + T\"ont2 es4 laut2 von4 fern2 und4 nah:2. + "``Christ,"2 der4 Ret-4. ter,8 ist4 "da!''"2 - - + "``Christ,"2 der4 Ret-4. ter,8 ist4 "da!''"2 - - +} + +v3 = \lyrics { + Stil-2 le4 Nacht,2. hei-4. li-8 ge4 Nacht,2. + Go-2 ttes4 Sohn,2. o-2 wie4 lacht2. + Lieb'2 aus4 dei-2 nem4 g\"ott-4. li-8 chen4 Mund,2. + Da2 uns4 schlägt2 die4 ret-2 tende4 Stund'.2. + Christ,2 in4 Dei-4. ner8 Ge-4 burt!2 - - + Christ,2 in4 Dei-4. ner8 Ge-4 burt!2 - - +} + +v1e = \lyrics { + Sil-2 ent4 night,2. Ho-2 ly4 night,2. + All2 is4 calm,2. all2 is4 bright,2. + 'Round2 yon4 Vir-2 gin4 Mo-4. ther8 and4 Child2. + Ho-2 ly4 In-4. fant8 so4 ten-4. der8 and4 mild,2. + Sleep2 in4 hea-4. ven-8 ly4 peace,2 - - + Sleep2 in4 hea-4. ven-8 ly4 peace.2 - - +} +v2e = \lyrics { + Si-2 lent4 night,2. Ho-2 ly4 night,2. + Shep-2 herds4 quake2. at2 the4 sight,2. + Glo-2 ies4 stream2 from4 hea-4. ven8 a-4 far,2. + Hea-2 v'nly4 hosts2 sing4 "``A-"4. lle-8 lu-4 ia;2. + Christ2 the4 Sa-4. viour8 is4 born,2. + Christ2 the4 Sa-4. viour8 is4 "born.''"2. +} + +v3e = \lyrics { + Si-2 lent4 night,2. Ho-2 ly4 night,2. + Son2 of4 God,2. love's2 pure4 light2. + Ra-2 diant4 beams4. from8 Thy4 ho-4. ly8 face,2. + With2 the4 dawn2 of4 sa-4. ving8 grace2. + Je-2 sus,4 Lord,4. at8 Thy4 birth,2. + Je-2 sus,4 Lord,4. at8 Thy4 birth.2. +} + + +upper= \notes { + \type Staff = upper { + \clef "treble"; \global + \type Staff < + { \voiceone \sop } + { \voicetwo \alt } + > + } +} + +lower = \notes { + \type Staff = lower { + \clef "bass"; \global + \type Staff < + { \voicethree \ten } + { \voicefour \bass } + > + } +} + +\score { + \type ChoirStaff + < + { \type Lyrics = top \chords } + \upper + { \type Lyrics = upper \v1 } + { \type Lyrics = upper \v2 } + { \type Lyrics = upper \v3 } + \lower + > +} diff --git a/scm/GNUmakefile b/scm/GNUmakefile new file mode 100644 index 0000000000..419ac4c97f --- /dev/null +++ b/scm/GNUmakefile @@ -0,0 +1,14 @@ +# scm/Makefile + +depth = .. + +SCM_FILES = $(wildcard *.scm) +EXTRA_DIST_FILES = $(SCM_FILES) + +INSTALLATION_DIR=$(datadir)/scm/ +INSTALLATION_FILES=$(SCM_FILES) + +STEPMAKE_TEMPLATES=install + +include $(depth)/make/stepmake.make + diff --git a/scripts/mudela-book.py b/scripts/mudela-book.py index 577f96cb58..98fb69f81e 100644 --- a/scripts/mudela-book.py +++ b/scripts/mudela-book.py @@ -68,7 +68,7 @@ twocolumn_re = re.compile('\\\\twocolumn') onecolumn_re = re.compile('\\\\onecolumn') preMudelaExample_re = re.compile('\\\\def\\\\preMudelaExample') postMudelaExample_re = re.compile('\\\\def\\\\postMudelaExample') -boundingBox_re = re.compile('%%BoundingBox: ([0-9]*) ([0-9]*) ([0-9]*) ([0-9]*)') +boundingBox_re = re.compile('%%BoundingBox: ([0-9]+) ([0-9]+) ([0-9]+) ([0-9]+)') def file_exist_b(name): try: @@ -201,6 +201,7 @@ class Mudela_output: # 'tex' or 'eps' self.graphic_type = 'tex' self.code_type = 'unknown' + self.code_type_override = None def write (self, line): # match only if there is nothing but whitespace before \begin HACK if re.search('^\s*\\\\begin{mudela}', line): @@ -221,9 +222,9 @@ class Mudela_output: else: optlist = [] if 'fragment' in optlist: - print "warning: obsolete option: fragment" - if 'floating' in optlist: - print "warning: obsolete option: floating, change to eps" + self.code_type_override = 'fly' + if 'nonfragment' in optlist: + self.code_type_override = 'ly' if 'eps' in optlist: self.graphic_type = 'eps' for pt in fontsize_pt2i.keys(): @@ -248,14 +249,13 @@ class Mudela_output: def close (self): if self.code_type == 'unknown': self.code_type = 'fly' - if self.code_type == 'ly': - self.write_red_tape() - for l in self.__lines: - self.file.write(l) - else: - self.write_red_tape() - for l in self.__lines: - self.file.write(l) + if self.code_type_override: + self.code_type = self.code_type_override + print "override:", self.code_type_override + self.write_red_tape() + for l in self.__lines: + self.file.write(l) + if self.code_type == 'fly': self.file.write('}}') self.file.close() @@ -329,6 +329,7 @@ class Tex_output: else: file.write(line) file.close() + class Tex_input: def __init__ (self, filename): for fn in [filename, filename+'.tex', filename+'.doc']: @@ -393,7 +394,7 @@ class Tex_input: else: opts = ', '+opts (start, rest) = string.split(line, r_mud.group(), 1) - retlines.append(start+'\n') + retlines.append(start)#+'\n') v = string.split(defined_mudela_cmd[r_mud.groups()[0]], '\n') for l in v[1:-1]: l = re.sub(r'\\fontoptions', opts, l) diff --git a/stepmake/configure b/stepmake/configure index e69de29bb2..34691c9722 100755 --- a/stepmake/configure +++ b/stepmake/configure @@ -0,0 +1,1807 @@ +#! /bin/sh + +ac_help="$ac_help + --with-gtkmm-prefix=PREFIX + Prefix where GTK-- is installed (optional)" +# Check whether --with-gtkmm-prefix or --without-gtkmm-prefix was given. +if test "${with_gtkmm_prefix+set}" = set; then + withval="$with_gtkmm_prefix" + gtkmm_config_prefix="$withval" +else + gtkmm_config_prefix="" +fi + +ac_help="$ac_help + --with-gtkmm-exec-prefix=PREFIX + Exec prefix where GTK-- is installed (optional)" +# Check whether --with-gtkmm-exec-prefix or --without-gtkmm-exec-prefix was given. +if test "${with_gtkmm_exec_prefix+set}" = set; then + withval="$with_gtkmm_exec_prefix" + gtkmm_config_exec_prefix="$withval" +else + gtkmm_config_exec_prefix="" +fi + +ac_help="$ac_help + --disable-gtkmmtest Do not try to compile and run a test GTK-- program" +# Check whether --enable-gtkmmtest or --disable-gtkmmtest was given. +if test "${enable_gtkmmtest+set}" = set; then + enableval="$enable_gtkmmtest" + : +else + enable_gtkmmtest=yes +fi + + + 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 + + + + +# Configure paths for GTK--DRAW +# Derek Quinn Wyatt 98-08-21 (adapted from Jan Nieuwenhuizen's code) + + + +# Guess values for system-dependent variables and create Makefiles. +# Generated automatically using autoconf version 2.12 +# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. +# +# This configure script is free software; the Free Software Foundation +# gives unlimited permission to copy, distribute and modify it. + +# Defaults: +ac_help= +ac_default_prefix=/usr/local +# Any additions from configure.in: +ac_help="$ac_help + enable-config=FILE put configure settings in config-FILE.make" +ac_help="$ac_help + 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" + +# Initialize some variables set by options. +# The variables have the same names as the options, with +# dashes changed to underlines. +build=NONE +cache_file=./config.cache +exec_prefix=NONE +host=NONE +no_create= +nonopt=NONE +no_recursion= +prefix=NONE +program_prefix=NONE +program_suffix=NONE +program_transform_name=s,x,x, +silent= +site= +srcdir= +target=NONE +verbose= +x_includes=NONE +x_libraries=NONE +bindir='${exec_prefix}/bin' +sbindir='${exec_prefix}/sbin' +libexecdir='${exec_prefix}/libexec' +datadir='${prefix}/share' +sysconfdir='${prefix}/etc' +sharedstatedir='${prefix}/com' +localstatedir='${prefix}/var' +libdir='${exec_prefix}/lib' +includedir='${prefix}/include' +oldincludedir='/usr/include' +infodir='${prefix}/info' +mandir='${prefix}/man' + +# Initialize some other variables. +subdirs= +MFLAGS= MAKEFLAGS= +# Maximum number of lines to put in a shell here document. +ac_max_here_lines=12 + +ac_prev= +for ac_option +do + + # If the previous option needs an argument, assign it. + if test -n "$ac_prev"; then + eval "$ac_prev=\$ac_option" + ac_prev= + continue + fi + + case "$ac_option" in + -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;; + *) ac_optarg= ;; + esac + + # Accept the important Cygnus configure options, so we can diagnose typos. + + case "$ac_option" in + + -bindir | --bindir | --bindi | --bind | --bin | --bi) + ac_prev=bindir ;; + -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) + bindir="$ac_optarg" ;; + + -build | --build | --buil | --bui | --bu) + ac_prev=build ;; + -build=* | --build=* | --buil=* | --bui=* | --bu=*) + build="$ac_optarg" ;; + + -cache-file | --cache-file | --cache-fil | --cache-fi \ + | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) + ac_prev=cache_file ;; + -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ + | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) + cache_file="$ac_optarg" ;; + + -datadir | --datadir | --datadi | --datad | --data | --dat | --da) + ac_prev=datadir ;; + -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ + | --da=*) + datadir="$ac_optarg" ;; + + -disable-* | --disable-*) + ac_feature=`echo $ac_option|sed -e 's/-*disable-//'` + # Reject names that are not valid shell variable names. + if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then + { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } + fi + ac_feature=`echo $ac_feature| sed 's/-/_/g'` + eval "enable_${ac_feature}=no" ;; + + -enable-* | --enable-*) + ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'` + # Reject names that are not valid shell variable names. + if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then + { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } + fi + ac_feature=`echo $ac_feature| sed 's/-/_/g'` + case "$ac_option" in + *=*) ;; + *) ac_optarg=yes ;; + esac + eval "enable_${ac_feature}='$ac_optarg'" ;; + + -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ + | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ + | --exec | --exe | --ex) + ac_prev=exec_prefix ;; + -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ + | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ + | --exec=* | --exe=* | --ex=*) + exec_prefix="$ac_optarg" ;; + + -gas | --gas | --ga | --g) + # Obsolete; use --with-gas. + with_gas=yes ;; + + -help | --help | --hel | --he) + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. + cat << EOF +Usage: configure [options] [host] +Options: [defaults in brackets after descriptions] +Configuration: + --cache-file=FILE cache test results in FILE + --help print this message + --no-create do not create output files + --quiet, --silent do not print \`checking...' messages + --version print the version of autoconf that created configure +Directory and file names: + --prefix=PREFIX install architecture-independent files in PREFIX + [$ac_default_prefix] + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX + [same as prefix] + --bindir=DIR user executables in DIR [EPREFIX/bin] + --sbindir=DIR system admin executables in DIR [EPREFIX/sbin] + --libexecdir=DIR program executables in DIR [EPREFIX/libexec] + --datadir=DIR read-only architecture-independent data in DIR + [PREFIX/share] + --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data in DIR + [PREFIX/com] + --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var] + --libdir=DIR object code libraries in DIR [EPREFIX/lib] + --includedir=DIR C header files in DIR [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include] + --infodir=DIR info documentation in DIR [PREFIX/info] + --mandir=DIR man documentation in DIR [PREFIX/man] + --srcdir=DIR find the sources in DIR [configure dir or ..] + --program-prefix=PREFIX prepend PREFIX to installed program names + --program-suffix=SUFFIX append SUFFIX to installed program names + --program-transform-name=PROGRAM + run sed PROGRAM on installed program names +EOF + cat << EOF +Host type: + --build=BUILD configure for building on BUILD [BUILD=HOST] + --host=HOST configure for HOST [guessed] + --target=TARGET configure for TARGET [TARGET=HOST] +Features and packages: + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --x-includes=DIR X include files are in DIR + --x-libraries=DIR X library files are in DIR +EOF + if test -n "$ac_help"; then + echo "--enable and --with options recognized:$ac_help" + fi + exit 0 ;; + + -host | --host | --hos | --ho) + ac_prev=host ;; + -host=* | --host=* | --hos=* | --ho=*) + host="$ac_optarg" ;; + + -includedir | --includedir | --includedi | --included | --include \ + | --includ | --inclu | --incl | --inc) + ac_prev=includedir ;; + -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ + | --includ=* | --inclu=* | --incl=* | --inc=*) + includedir="$ac_optarg" ;; + + -infodir | --infodir | --infodi | --infod | --info | --inf) + ac_prev=infodir ;; + -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) + infodir="$ac_optarg" ;; + + -libdir | --libdir | --libdi | --libd) + ac_prev=libdir ;; + -libdir=* | --libdir=* | --libdi=* | --libd=*) + libdir="$ac_optarg" ;; + + -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ + | --libexe | --libex | --libe) + ac_prev=libexecdir ;; + -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ + | --libexe=* | --libex=* | --libe=*) + libexecdir="$ac_optarg" ;; + + -localstatedir | --localstatedir | --localstatedi | --localstated \ + | --localstate | --localstat | --localsta | --localst \ + | --locals | --local | --loca | --loc | --lo) + ac_prev=localstatedir ;; + -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ + | --localstate=* | --localstat=* | --localsta=* | --localst=* \ + | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) + localstatedir="$ac_optarg" ;; + + -mandir | --mandir | --mandi | --mand | --man | --ma | --m) + ac_prev=mandir ;; + -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) + mandir="$ac_optarg" ;; + + -nfp | --nfp | --nf) + # Obsolete; use --without-fp. + with_fp=no ;; + + -no-create | --no-create | --no-creat | --no-crea | --no-cre \ + | --no-cr | --no-c) + no_create=yes ;; + + -no-recursion | --no-recursion | --no-recursio | --no-recursi \ + | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) + no_recursion=yes ;; + + -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ + | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ + | --oldin | --oldi | --old | --ol | --o) + ac_prev=oldincludedir ;; + -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ + | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ + | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) + oldincludedir="$ac_optarg" ;; + + -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) + ac_prev=prefix ;; + -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) + prefix="$ac_optarg" ;; + + -program-prefix | --program-prefix | --program-prefi | --program-pref \ + | --program-pre | --program-pr | --program-p) + ac_prev=program_prefix ;; + -program-prefix=* | --program-prefix=* | --program-prefi=* \ + | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) + program_prefix="$ac_optarg" ;; + + -program-suffix | --program-suffix | --program-suffi | --program-suff \ + | --program-suf | --program-su | --program-s) + ac_prev=program_suffix ;; + -program-suffix=* | --program-suffix=* | --program-suffi=* \ + | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) + program_suffix="$ac_optarg" ;; + + -program-transform-name | --program-transform-name \ + | --program-transform-nam | --program-transform-na \ + | --program-transform-n | --program-transform- \ + | --program-transform | --program-transfor \ + | --program-transfo | --program-transf \ + | --program-trans | --program-tran \ + | --progr-tra | --program-tr | --program-t) + ac_prev=program_transform_name ;; + -program-transform-name=* | --program-transform-name=* \ + | --program-transform-nam=* | --program-transform-na=* \ + | --program-transform-n=* | --program-transform-=* \ + | --program-transform=* | --program-transfor=* \ + | --program-transfo=* | --program-transf=* \ + | --program-trans=* | --program-tran=* \ + | --progr-tra=* | --program-tr=* | --program-t=*) + program_transform_name="$ac_optarg" ;; + + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + silent=yes ;; + + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) + ac_prev=sbindir ;; + -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ + | --sbi=* | --sb=*) + sbindir="$ac_optarg" ;; + + -sharedstatedir | --sharedstatedir | --sharedstatedi \ + | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ + | --sharedst | --shareds | --shared | --share | --shar \ + | --sha | --sh) + ac_prev=sharedstatedir ;; + -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ + | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ + | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ + | --sha=* | --sh=*) + sharedstatedir="$ac_optarg" ;; + + -site | --site | --sit) + ac_prev=site ;; + -site=* | --site=* | --sit=*) + site="$ac_optarg" ;; + + -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) + ac_prev=srcdir ;; + -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) + srcdir="$ac_optarg" ;; + + -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ + | --syscon | --sysco | --sysc | --sys | --sy) + ac_prev=sysconfdir ;; + -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ + | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) + sysconfdir="$ac_optarg" ;; + + -target | --target | --targe | --targ | --tar | --ta | --t) + ac_prev=target ;; + -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) + target="$ac_optarg" ;; + + -v | -verbose | --verbose | --verbos | --verbo | --verb) + verbose=yes ;; + + -version | --version | --versio | --versi | --vers) + echo "configure generated by autoconf version 2.12" + exit 0 ;; + + -with-* | --with-*) + ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'` + # Reject names that are not valid shell variable names. + if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then + { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } + fi + ac_package=`echo $ac_package| sed 's/-/_/g'` + case "$ac_option" in + *=*) ;; + *) ac_optarg=yes ;; + esac + eval "with_${ac_package}='$ac_optarg'" ;; + + -without-* | --without-*) + ac_package=`echo $ac_option|sed -e 's/-*without-//'` + # Reject names that are not valid shell variable names. + if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then + { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } + fi + ac_package=`echo $ac_package| sed 's/-/_/g'` + eval "with_${ac_package}=no" ;; + + --x) + # Obsolete; use --with-x. + with_x=yes ;; + + -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ + | --x-incl | --x-inc | --x-in | --x-i) + ac_prev=x_includes ;; + -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ + | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) + x_includes="$ac_optarg" ;; + + -x-libraries | --x-libraries | --x-librarie | --x-librari \ + | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) + ac_prev=x_libraries ;; + -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ + | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) + x_libraries="$ac_optarg" ;; + + -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; } + ;; + + *) + if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then + echo "configure: warning: $ac_option: invalid host type" 1>&2 + fi + if test "x$nonopt" != xNONE; then + { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } + fi + nonopt="$ac_option" + ;; + + esac +done + +if test -n "$ac_prev"; then + { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; } +fi + +trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 + +# File descriptor usage: +# 0 standard input +# 1 file creation +# 2 errors and warnings +# 3 some systems may open it to /dev/tty +# 4 used on the Kubota Titan +# 6 checking for... messages and results +# 5 compiler messages saved in config.log +if test "$silent" = yes; then + exec 6>/dev/null +else + exec 6>&1 +fi +exec 5>./config.log + +echo "\ +This file contains any messages produced by compilers while +running configure, to aid debugging if configure makes a mistake. +" 1>&5 + +# Strip out --no-create and --no-recursion so they do not pile up. +# Also quote any args containing shell metacharacters. +ac_configure_args= +for ac_arg +do + case "$ac_arg" in + -no-create | --no-create | --no-creat | --no-crea | --no-cre \ + | --no-cr | --no-c) ;; + -no-recursion | --no-recursion | --no-recursio | --no-recursi \ + | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; + *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*) + ac_configure_args="$ac_configure_args '$ac_arg'" ;; + *) ac_configure_args="$ac_configure_args $ac_arg" ;; + esac +done + +# NLS nuisances. +# Only set these to C if already set. These must not be set unconditionally +# because not all systems understand e.g. LANG=C (notably SCO). +# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! +# Non-C LC_CTYPE values break the ctype check. +if test "${LANG+set}" = set; then LANG=C; export LANG; fi +if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi +if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi +if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi + +# confdefs.h avoids OS command line length limits that DEFS can exceed. +rm -rf conftest* confdefs.h +# AIX cpp loses on an empty file, so make sure it contains at least a newline. +echo > confdefs.h + +# A filename unique to this package, relative to the directory that +# configure is in, which we can look for to find out if srcdir is correct. +ac_unique_file=make/stepmake.lsm.in + +# Find the source files, if location was not specified. +if test -z "$srcdir"; then + ac_srcdir_defaulted=yes + # Try the directory containing this script, then its parent. + ac_prog=$0 + ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'` + test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. + srcdir=$ac_confdir + if test ! -r $srcdir/$ac_unique_file; then + srcdir=.. + fi +else + ac_srcdir_defaulted=no +fi +if test ! -r $srcdir/$ac_unique_file; then + if test "$ac_srcdir_defaulted" = yes; then + { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; } + else + { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; } + fi +fi +srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` + +# Prefer explicitly selected file to automatically selected ones. +if test -z "$CONFIG_SITE"; then + if test "x$prefix" != xNONE; then + CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" + else + CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" + fi +fi +for ac_site_file in $CONFIG_SITE; do + if test -r "$ac_site_file"; then + echo "loading site script $ac_site_file" + . "$ac_site_file" + fi +done + +if test -r "$cache_file"; then + echo "loading cache $cache_file" + . $cache_file +else + echo "creating cache $cache_file" + > $cache_file +fi + +ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross + +if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then + # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. + if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then + ac_n= ac_c=' +' ac_t=' ' + else + ac_n=-n ac_c= ac_t= + fi +else + ac_n= ac_c='\c' ac_t= +fi + + + + +# Bootstrap StepMake configure + + + . $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:] + PACKAGE=`echo $PACKAGE_NAME | tr '[a-z]' '[A-Z]'` + package=`echo $PACKAGE_NAME | tr '[A-Z]' '[a-z]'` + + # 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!"` + + if test "x$PACKAGE" = "xSTEPMAKE"; then + echo Stepmake package! + (cd stepmake; rm -f stepmake; ln -s ../stepmake .) + (cd stepmake; rm -f bin; ln -s ../bin .) + ac_aux_dir= +for ac_dir in bin $srcdir/bin; do + if test -f $ac_dir/install-sh; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f $ac_dir/install.sh; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + fi +done +if test -z "$ac_aux_dir"; then + { echo "configure: error: can not find install-sh or install.sh in bin $srcdir/bin" 1>&2; exit 1; } +fi +ac_config_guess=$ac_aux_dir/config.guess +ac_config_sub=$ac_aux_dir/config.sub +ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. + + stepmake=stepmake + else + echo Package: $PACKAGE + # Check for installed stepmake + if test -d $stepmake; then + echo Using installed stepmake: $stepmake + else + stepmake='$(depth)'/stepmake + echo Using local stepmake: $datadir/stepmake not found + fi + ac_aux_dir= +for ac_dir in \ + $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/\ + $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\ + ; do + if test -f $ac_dir/install-sh; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f $ac_dir/install.sh; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + fi +done +if test -z "$ac_aux_dir"; then + { echo "configure: error: can not find install-sh or install.sh in \ + $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/\ + $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\ + " 1>&2; exit 1; } +fi +ac_config_guess=$ac_aux_dir/config.guess +ac_config_sub=$ac_aux_dir/config.sub +ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. + + fi + + + + + + cat >> confdefs.h <> confdefs.h </dev/null` + if test "x$STATE_VECTOR" != "x"; then + STATE_VECTOR="\$(depth)/$STATE_VECTOR" + fi + + + CONFIGSUFFIX= + # Check whether --enable-config or --disable-config was given. +if test "${enable_config+set}" = set; then + enableval="$enable_config" + CONFIGSUFFIX=$enableval +fi + + + if test "$CONFIGSUFFIX" != "" ; then + CONFIGFILE=config-$CONFIGSUFFIX + else + CONFIGFILE=config + fi + + + +# Make sure we can run config.sub. +if $ac_config_sub sun4 >/dev/null 2>&1; then : +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:749: checking host system type" >&5 + +host_alias=$host +case "$host_alias" in +NONE) + case $nonopt in + NONE) + if host_alias=`$ac_config_guess`; then : + else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } + fi ;; + *) host_alias=$nonopt ;; + esac ;; +esac + +host=`$ac_config_sub $host_alias` +host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +echo "$ac_t""$host" 1>&6 + + for ac_prog in make +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:774: 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 + if test -n "$MAKE"; then + ac_cv_prog_MAKE="$MAKE" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_MAKE="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +MAKE="$ac_cv_prog_MAKE" +if test -n "$MAKE"; then + echo "$ac_t""$MAKE" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$MAKE" && break +done +test -n "$MAKE" || MAKE="error" + + for ac_prog in find +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:808: 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 + if test -n "$FIND"; then + ac_cv_prog_FIND="$FIND" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_FIND="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +FIND="$ac_cv_prog_FIND" +if test -n "$FIND"; then + echo "$ac_t""$FIND" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$FIND" && break +done +test -n "$FIND" || FIND="error" + + + + + for ac_prog in tar +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:845: 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 + if test -n "$TAR"; then + ac_cv_prog_TAR="$TAR" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_TAR="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +TAR="$ac_cv_prog_TAR" +if test -n "$TAR"; then + echo "$ac_t""$TAR" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$TAR" && break +done +test -n "$TAR" || TAR="error" + + for ac_prog in bash +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:879: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_BASH'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$BASH"; then + ac_cv_prog_BASH="$BASH" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_BASH="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +BASH="$ac_cv_prog_BASH" +if test -n "$BASH"; then + echo "$ac_t""$BASH" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$BASH" && break +done +test -n "$BASH" || BASH="/bin/sh" + + + # 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:912: 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 + case "$PYTHON" in + /*) + ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_PYTHON="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_PYTHON" && ac_cv_path_PYTHON="-echo no python" + ;; +esac +fi +PYTHON="$ac_cv_path_PYTHON" +if test -n "$PYTHON"; then + echo "$ac_t""$PYTHON" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + + + + + result="`echo \"$MAKE\" | grep echo`" + if test "x$MAKE" = "xerror" -o "x$result" != "x"; then + + echo "configure: warning: can\'t find GNU make. You should install GNU make" 1>&2 + warn_b=yes + + fi + + if test $MAKE != "error" ; then + $MAKE -v| grep GNU > /dev/null + if test "$?" = 1 + then + + echo "configure: warning: Please install *GNU* make" 1>&2 + warn_b=yes + + fi + fi + + + result="`echo \"$PYTHON\" | grep echo`" + if test "x$PYTHON" = "xerror" -o "x$result" != "x"; then + + echo "configure: warning: can\'t find python. You should install Python" 1>&2 + warn_b=yes + + fi + + + if test "x$OSTYPE" = "xcygwin32" || test "x$OSTYPE" = "xWindows_NT"; then + LN=cp # hard link does not work under cygnus-nt + LN_S=cp # symbolic link does not work for native nt + ZIP="zip -r -9" # + DOTEXE=.exe + DIRSEP='\\' + PATHSEP=';' + INSTALL="\$(SHELL) \$(stepdir)/../bin/install-dot-exe.sh -c" + else + DIRSEP='/' + PATHSEP=':' + LN=ln + LN_S='ln -s' + ZIP="zip -r -9" + INSTALL="\$(SHELL) \$(stepdir)/../bin/install-sh -c" + fi + + + + + + cat >> confdefs.h <> confdefs.h <> confdefs.h <&6 +echo "configure:1062: checking language" >&5 + case "$language" in + En* | en* | Am* | am* | US* | us*) + lang=English;; + NL | nl | Du* | du* | Ned* | ned*) + lang=Dutch;; + "") + lang=English;; + *) + lang=unknown;; + esac + echo "$ac_t""$lang" 1>&6 + + if test "$lang" = "unknown" ; then + + echo "configure: warning: $language not supported; available are: $ALL_LINGUAS" 1>&2 + warn_b=yes + + fi + + +# AC_STEPMAKE_GETTEXT +# AC_STEPMAKE_MAN +# AC_STEPMAKE_MSGFMT +# AC_STEPMAKE_TEXMF +# AC_STEPMAKE_TEXMF_DIRS + + if test "x$YODL" = "x"; then + for ac_prog in striproff +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:1095: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_STRIPROFF'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$STRIPROFF"; then + ac_cv_prog_STRIPROFF="$STRIPROFF" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_STRIPROFF="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +STRIPROFF="$ac_cv_prog_STRIPROFF" +if test -n "$STRIPROFF"; then + echo "$ac_t""$STRIPROFF" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$STRIPROFF" && break +done +test -n "$STRIPROFF" || STRIPROFF="-echo no striproff" + + for ac_prog in yodl +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:1129: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_YODL'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$YODL"; then + ac_cv_prog_YODL="$YODL" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_YODL="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +YODL="$ac_cv_prog_YODL" +if test -n "$YODL"; then + echo "$ac_t""$YODL" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$YODL" && break +done +test -n "$YODL" || YODL="-echo no yodl" + + for ac_prog in yodl2html +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:1163: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_YODL2HTML'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$YODL2HTML"; then + ac_cv_prog_YODL2HTML="$YODL2HTML" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_YODL2HTML="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +YODL2HTML="$ac_cv_prog_YODL2HTML" +if test -n "$YODL2HTML"; then + echo "$ac_t""$YODL2HTML" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$YODL2HTML" && break +done +test -n "$YODL2HTML" || YODL2HTML="-echo no yodl" + + for ac_prog in yodl2latex +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:1197: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_YODL2LATEX'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$YODL2LATEX"; then + ac_cv_prog_YODL2LATEX="$YODL2LATEX" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_YODL2LATEX="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +YODL2LATEX="$ac_cv_prog_YODL2LATEX" +if test -n "$YODL2LATEX"; then + echo "$ac_t""$YODL2LATEX" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$YODL2LATEX" && break +done + + for ac_prog in yodl2man +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:1230: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_YODL2MAN'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$YODL2MAN"; then + ac_cv_prog_YODL2MAN="$YODL2MAN" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_YODL2MAN="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +YODL2MAN="$ac_cv_prog_YODL2MAN" +if test -n "$YODL2MAN"; then + echo "$ac_t""$YODL2MAN" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$YODL2MAN" && break +done +test -n "$YODL2MAN" || YODL2MAN="-echo no yodl" + + for ac_prog in yodl2msless +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:1264: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_YODL2MSLESS'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$YODL2MSLESS"; then + ac_cv_prog_YODL2MSLESS="$YODL2MSLESS" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_YODL2MSLESS="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +YODL2MSLESS="$ac_cv_prog_YODL2MSLESS" +if test -n "$YODL2MSLESS"; then + echo "$ac_t""$YODL2MSLESS" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$YODL2MSLESS" && break +done +test -n "$YODL2MSLESS" || YODL2MSLESS="-echo no yodl" + + for ac_prog in yodl2texinfo +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:1298: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_YODL2TEXINFO'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$YODL2TEXINFO"; then + ac_cv_prog_YODL2TEXINFO="$YODL2TEXINFO" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_YODL2TEXINFO="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +YODL2TEXINFO="$ac_cv_prog_YODL2TEXINFO" +if test -n "$YODL2TEXINFO"; then + echo "$ac_t""$YODL2TEXINFO" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$YODL2TEXINFO" && break +done +test -n "$YODL2TEXINFO" || YODL2TEXINFO="-echo no yodl" + + for ac_prog in yodl2txt +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:1332: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_YODL2TXT'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$YODL2TXT"; then + ac_cv_prog_YODL2TXT="$YODL2TXT" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_YODL2TXT="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +YODL2TXT="$ac_cv_prog_YODL2TXT" +if test -n "$YODL2TXT"; then + echo "$ac_t""$YODL2TXT" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$YODL2TXT" && break +done +test -n "$YODL2TXT" || YODL2TXT="-echo no yodl" + + YODL2LESS_DIR='$(bindir)/' + else + + + + + + + + + + export STRIPROFF YODL YODL2HTML YODL2LATEX YODL2MAN YODL2MSLESS YODL2TEXINFO YODL2TXT + fi + if test "x$YODL" = "-echo no yodl"; then + + echo "configure: warning: Did not find YODL (Yodl is Yet Oneother Document Language, see http://www.cs.uu.nl/~hanwen/yodl)" 1>&2 + warn_b=yes + + fi + + +# AM_PATH_GTK(1.0.0,,AC_MSG_ERROR([please install proper version of gtk])) +# AM_PATH_GTK__(0.9.4,,AC_MSG_ERROR([please install proper version of gtk--])) + +for ac_prog in makeinfo +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:1390: 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 + if test -n "$MAKEINFO"; then + ac_cv_prog_MAKEINFO="$MAKEINFO" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_MAKEINFO="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +MAKEINFO="$ac_cv_prog_MAKEINFO" +if test -n "$MAKEINFO"; then + echo "$ac_t""$MAKEINFO" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$MAKEINFO" && break +done +test -n "$MAKEINFO" || MAKEINFO="error" + +# AC_CHECK_SEARCH_RESULT($YODL2TEXINFO, yodl, +# You should install Yodl 1.30.pre6 or better) + + + trap '' 1 2 15 +cat > confcache <<\EOF +# This file is a shell script that caches the results of configure +# tests run on this system so they can be shared between configure +# scripts and configure runs. It is not useful on other systems. +# If it contains results you don't want to keep, you may remove or edit it. +# +# By default, configure uses ./config.cache as the cache file, +# creating it if it does not exist already. You can give configure +# the --cache-file=FILE option to use a different cache file; that is +# what configure does when it calls configure scripts in +# subdirectories, so they share the cache. +# Giving --cache-file=/dev/null disables caching, for debugging configure. +# config.status only pays attention to the cache file if you give it the +# --recheck option to rerun configure. +# +EOF +# The following way of writing the cache mishandles newlines in values, +# but we know of no workaround that is simple, portable, and efficient. +# So, don't put newlines in cache variables' values. +# Ultrix sh set writes to stderr and can't be redirected directly, +# and sets the high bit in the cache file unless we assign to the vars. +(set) 2>&1 | + case `(ac_space=' '; set) 2>&1` in + *ac_space=\ *) + # `set' does not quote correctly, so add quotes (double-quote substitution + # turns \\\\ into \\, and sed turns \\ into \). + sed -n \ + -e "s/'/'\\\\''/g" \ + -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" + ;; + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. + sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' + ;; + esac >> confcache +if cmp -s $cache_file confcache; then + : +else + if test -w $cache_file; then + echo "updating cache $cache_file" + cat confcache > $cache_file + else + echo "not updating unwritable cache $cache_file" + fi +fi +rm -f confcache + +trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 + +test "x$prefix" = xNONE && prefix=$ac_default_prefix +# Let make expand exec_prefix. +test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' + +# Any assignment to VPATH causes Sun make to only execute +# the first set of double-colon rules, so remove it if not needed. +# If there is a colon in the path, we need to keep it. +if test "x$srcdir" = x.; then + ac_vpsub='/^[ ]*VPATH[ ]*=[^:]*$/d' +fi + +trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 + +DEFS=-DHAVE_CONFIG_H + +# Without the "./", some shells look in PATH for config.status. +: ${CONFIG_STATUS=./config.status} + +echo creating $CONFIG_STATUS +rm -f $CONFIG_STATUS +cat > $CONFIG_STATUS </dev/null | sed 1q`: +# +# $0 $ac_configure_args +# +# Compiler output produced by configure, useful for debugging +# configure, is in ./config.log if it exists. + +ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]" +for ac_option +do + case "\$ac_option" in + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) + echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" + exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; + -version | --version | --versio | --versi | --vers | --ver | --ve | --v) + echo "$CONFIG_STATUS generated by autoconf version 2.12" + exit 0 ;; + -help | --help | --hel | --he | --h) + echo "\$ac_cs_usage"; exit 0 ;; + *) echo "\$ac_cs_usage"; exit 1 ;; + esac +done + +ac_given_srcdir=$srcdir + +trap 'rm -fr `echo "$CONFIGFILE.make:config.make.in $CONFIGFILE.hh:config.hh.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 +EOF +cat >> $CONFIG_STATUS < conftest.subs <<\\CEOF +$ac_vpsub +$extrasub +s%@CFLAGS@%$CFLAGS%g +s%@CPPFLAGS@%$CPPFLAGS%g +s%@CXXFLAGS@%$CXXFLAGS%g +s%@DEFS@%$DEFS%g +s%@LDFLAGS@%$LDFLAGS%g +s%@LIBS@%$LIBS%g +s%@exec_prefix@%$exec_prefix%g +s%@prefix@%$prefix%g +s%@program_transform_name@%$program_transform_name%g +s%@bindir@%$bindir%g +s%@sbindir@%$sbindir%g +s%@libexecdir@%$libexecdir%g +s%@datadir@%$datadir%g +s%@sysconfdir@%$sysconfdir%g +s%@sharedstatedir@%$sharedstatedir%g +s%@localstatedir@%$localstatedir%g +s%@libdir@%$libdir%g +s%@includedir@%$includedir%g +s%@oldincludedir@%$oldincludedir%g +s%@infodir@%$infodir%g +s%@mandir@%$mandir%g +s%@stepmake@%$stepmake%g +s%@package@%$package%g +s%@PACKAGE@%$PACKAGE%g +s%@PACKAGE_NAME@%$PACKAGE_NAME%g +s%@package_depth@%$package_depth%g +s%@AUTOGENERATE@%$AUTOGENERATE%g +s%@absolute_builddir@%$absolute_builddir%g +s%@STATE_VECTOR@%$STATE_VECTOR%g +s%@CONFIGSUFFIX@%$CONFIGSUFFIX%g +s%@host@%$host%g +s%@host_alias@%$host_alias%g +s%@host_cpu@%$host_cpu%g +s%@host_vendor@%$host_vendor%g +s%@host_os@%$host_os%g +s%@MAKE@%$MAKE%g +s%@FIND@%$FIND%g +s%@TAR@%$TAR%g +s%@BASH@%$BASH%g +s%@PYTHON@%$PYTHON%g +s%@DOTEXE@%$DOTEXE%g +s%@ZIP@%$ZIP%g +s%@LN@%$LN%g +s%@LN_S@%$LN_S%g +s%@INSTALL@%$INSTALL%g +s%@PATHSEP@%$PATHSEP%g +s%@DIRSEP@%$DIRSEP%g +s%@DIR_DATADIR@%$DIR_DATADIR%g +s%@STRIPROFF@%$STRIPROFF%g +s%@YODL@%$YODL%g +s%@YODL2HTML@%$YODL2HTML%g +s%@YODL2LATEX@%$YODL2LATEX%g +s%@YODL2MAN@%$YODL2MAN%g +s%@YODL2MSLESS@%$YODL2MSLESS%g +s%@YODL2TEXINFO@%$YODL2TEXINFO%g +s%@YODL2TXT@%$YODL2TXT%g +s%@YODL2LESS_DIR@%$YODL2LESS_DIR%g +s%@MAKEINFO@%$MAKEINFO%g + +CEOF +EOF + +cat >> $CONFIG_STATUS <<\EOF + +# Split the substitutions into bite-sized pieces for seds with +# small command number limits, like on Digital OSF/1 and HP-UX. +ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script. +ac_file=1 # Number of current file. +ac_beg=1 # First line for current file. +ac_end=$ac_max_sed_cmds # Line after last line for current file. +ac_more_lines=: +ac_sed_cmds="" +while $ac_more_lines; do + if test $ac_beg -gt 1; then + sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file + else + sed "${ac_end}q" conftest.subs > conftest.s$ac_file + fi + if test ! -s conftest.s$ac_file; then + ac_more_lines=false + rm -f conftest.s$ac_file + else + if test -z "$ac_sed_cmds"; then + ac_sed_cmds="sed -f conftest.s$ac_file" + else + ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file" + fi + ac_file=`expr $ac_file + 1` + ac_beg=$ac_end + ac_end=`expr $ac_end + $ac_max_sed_cmds` + fi +done +if test -z "$ac_sed_cmds"; then + ac_sed_cmds=cat +fi +EOF + +cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF +for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then + # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". + case "$ac_file" in + *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` + ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; + *) ac_file_in="${ac_file}.in" ;; + esac + + # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories. + + # Remove last slash and all that follows it. Not all systems have dirname. + ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` + if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then + # The file is in a subdirectory. + test ! -d "$ac_dir" && mkdir "$ac_dir" + ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`" + # A "../" for each directory in $ac_dir_suffix. + ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'` + else + ac_dir_suffix= ac_dots= + fi + + case "$ac_given_srcdir" in + .) srcdir=. + if test -z "$ac_dots"; then top_srcdir=. + else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; + /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; + *) # Relative path. + srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" + top_srcdir="$ac_dots$ac_given_srcdir" ;; + esac + + + echo creating "$ac_file" + rm -f "$ac_file" + configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure." + case "$ac_file" in + *Makefile*) ac_comsub="1i\\ +# $configure_input" ;; + *) ac_comsub= ;; + esac + + ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` + sed -e "$ac_comsub +s%@configure_input@%$configure_input%g +s%@srcdir@%$srcdir%g +s%@top_srcdir@%$top_srcdir%g +" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file +fi; done +rm -f conftest.s* + +# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where +# NAME is the cpp macro being defined and VALUE is the value it is being given. +# +# ac_d sets the value in "#define NAME VALUE" lines. +ac_dA='s%^\([ ]*\)#\([ ]*define[ ][ ]*\)' +ac_dB='\([ ][ ]*\)[^ ]*%\1#\2' +ac_dC='\3' +ac_dD='%g' +# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE". +ac_uA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' +ac_uB='\([ ]\)%\1#\2define\3' +ac_uC=' ' +ac_uD='\4%g' +# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE". +ac_eA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' +ac_eB='$%\1#\2define\3' +ac_eC=' ' +ac_eD='%g' + +if test "${CONFIG_HEADERS+set}" != set; then +EOF +cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF +fi +for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then + # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". + case "$ac_file" in + *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` + ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; + *) ac_file_in="${ac_file}.in" ;; + esac + + echo creating $ac_file + + rm -f conftest.frag conftest.in conftest.out + ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` + cat $ac_file_inputs > conftest.in + +EOF + +# Transform confdefs.h into a sed script conftest.vals that substitutes +# the proper values into config.h.in to produce config.h. And first: +# Protect against being on the right side of a sed subst in config.status. +# Protect against being in an unquoted here document in config.status. +rm -f conftest.vals +cat > conftest.hdr <<\EOF +s/[\\&%]/\\&/g +s%[\\$`]%\\&%g +s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp +s%ac_d%ac_u%gp +s%ac_u%ac_e%gp +EOF +sed -n -f conftest.hdr confdefs.h > conftest.vals +rm -f conftest.hdr + +# This sed command replaces #undef with comments. This is necessary, for +# example, in the case of _POSIX_SOURCE, which is predefined and required +# on some systems where configure will not decide to define it. +cat >> conftest.vals <<\EOF +s%^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */% +EOF + +# Break up conftest.vals because some shells have a limit on +# the size of here documents, and old seds have small limits too. + +rm -f conftest.tail +while : +do + ac_lines=`grep -c . conftest.vals` + # grep -c gives empty output for an empty file on some AIX systems. + if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi + # Write a limited-size here document to conftest.frag. + echo ' cat > conftest.frag <> $CONFIG_STATUS + sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS + echo 'CEOF + sed -f conftest.frag conftest.in > conftest.out + rm -f conftest.in + mv conftest.out conftest.in +' >> $CONFIG_STATUS + sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail + rm -f conftest.vals + mv conftest.tail conftest.vals +done +rm -f conftest.vals + +cat >> $CONFIG_STATUS <<\EOF + rm -f conftest.frag conftest.h + echo "/* $ac_file. Generated automatically by configure. */" > conftest.h + cat conftest.in >> conftest.h + rm -f conftest.in + if cmp -s $ac_file conftest.h 2>/dev/null; then + echo "$ac_file is unchanged" + rm -f conftest.h + else + # Remove last slash and all that follows it. Not all systems have dirname. + ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` + if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then + # The file is in a subdirectory. + test ! -d "$ac_dir" && mkdir "$ac_dir" + fi + rm -f $ac_file + mv conftest.h $ac_file + fi +fi; done + +EOF +cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF + +exit 0 +EOF +chmod +x $CONFIG_STATUS +rm -fr confdefs* $ac_clean_files +test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 + + + rm -f GNUmakefile + cp make/toplevel.make.in ./GNUmakefile + chmod 444 GNUmakefile + -- 2.39.2