From: Han-Wen Nienhuys Date: Thu, 26 Nov 1998 12:04:07 +0000 (+0100) Subject: release: 1.1.9 X-Git-Tag: release/1.1.9 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=8a4b84458c8fc5e8e1e2288a92da01cd5eda1b2f;p=lilypond.git release: 1.1.9 --- diff --git a/Documentation/tex/refman.yo b/Documentation/tex/refman.yo index 7a2e4ec17a..574362f31b 100644 --- a/Documentation/tex/refman.yo +++ b/Documentation/tex/refman.yo @@ -15,6 +15,12 @@ TODO: the explanation of how lyrics mode parses words seems ridiculous. Is there a simple way to explain this, or is the behavior too complicated for a reasonable explanation? + \relative and \tranpose and \times make it necessary to specify + an explicit \type staff, or bizarre things happen. + catalan.ly + accordion symbols + extender* (see extender.ly) + \repeat & \alternative -> probably should have an example ) @@ -40,7 +46,7 @@ latexlayoutcmds( whentexinfo(notableofcontents()) -article(Mudela 1.0.7 / LilyPond 1.0.15 Reference Manual) +article(Mudela 1.0.7 / LilyPond 1.1.8 Reference Manual) (Adrian Mariano, Han-Wen Nienhuys and Jan Nieuwenhuizen) (nop()PIPETHROUGH(date "+%B %d, %Y")()()nop()) @@ -113,6 +119,11 @@ file(init.)var(ext) and process this file. The file file(init.)var(ext) must contain the code(\maininput) keyword or LilyPond will not read the user specified file. +When LilyPond processes file(filename.ly) it will produce file(filename.tex) as +output. If file(filename.ly) contains a second code(\paper) keyword, then +LilyPond will produce file(filename-1.tex) as well. Subsequent code(\paper) +keywords will produces sequentially numbered file names. Several files can be +specified; they will each be processed independently. sect(Syntax) @@ -213,16 +224,16 @@ will only be able to refer to identifiers whose names begin with a letter and are entirely alphanumeric. It is also impossible to refer to an identifier whose name is the same as the name of a keyword. The following words are keywords: -verb(absdynamic header musicalpitch remove times -accepts in name score translator -bar include notenames script transpose -cadenza key notes shape type -clef keysignature paper skip version -cm lyrics partial spandynamic -consists maininput penalty symboltables -duration mark property table -font midi pt tempo -grouping mm relative time) +verb(absdynamic grouping mm relative symboltables +accepts header musicalpitch remove table +alternative in name repeat tempo +bar include notenames scm time +cadenza key notes scmfile times +clef keysignature paper score translator +cm lyrics partial script transpose +consists maininput penalty shape type +duration mark property skip version +font midi pt spandynamic) The right hand side of an identifier assignment is parsed completely when the assignment is made. It therefore must have any context @@ -332,6 +343,11 @@ Leise DOEXPAND(Fl\)DOEXPAND("u\)ss{}teren meine Sapfe % 4 words _ _ _ _ % 4 words, each one a space )) +It is possible to create words that break the rules by prefixing them with the +dollar sign code($). Regardless of the context, a word beginning with code($) +extends until the next white space character. Such words can contain numbers +(even in Note mode), or other forbidden characters. The dollar sign can be +used to create and access identifiers that could not otherwise be used. COMMENT( These modes are of a lexical nature. Normal and Note mode largely @@ -454,6 +470,10 @@ code([) and code(]). mudela(fragment,verbatim,center)( [a'8 a'] [a'16 a' a' a'] ) +If you want to put beams over chords, you will find that the obvious +construction does not work. You must do the following: +mudela(fragment,verbatim,center)(<[a'8 c''> b' ) +The bracket characters must appear immediately adjacent to a note. In order to create triplets, you must use a length multiplier after the brackets. An open bracket code([) followed by a fraction @@ -529,13 +549,13 @@ mudela()( c''-\open c''-\flageolet c''-\reverseturn c''-\trill c''-\prall c''-\mordent c''-\prallprall c''-\prallmordent - c''-\upprall c''-\downprall } + c''-\upprall c''-\downprall c''-\thumb} \type Lyrics \lyrics{ accent marcato staccatissimo fermata stopped staccato tenuto upbow downbow lheel rheel ltoe rtoe turn open flageolet reverseturn trill prall - mordent prallprall prallmordent uprall downprall }> + mordent prallprall prallmordent uprall downprall thumb}> \paper{linewidth = 5.875\in; indent = 0.0; } @@ -576,6 +596,13 @@ code(\rc). A decrescendo mark is started with code(\decr) and terminated with code(\rced). There are also shorthands for these marks. A crescendo can be started with code(\<) and a decrescendo can be started with code(\>). Either one can be terminated with code(\!). +Note that code(\!) must go before the last note of the dynamic mark whereas +code(\rc) and code(\rced) go after the last note. Because these marks are +bound to notes, if you want to get several marks during one note, you must use +spacer notes. +mudela(fragment,verbatim,center)( +c'' \< \! c'' d'' \decr e'' \rced +< f''1 {s4 \< \! s4 \> \! s2 } >) Tremolo marks can be printed by a note by adding code(:)[var(length)] after the note. The length must be at least 8. A var(length) value @@ -868,6 +895,9 @@ dit(code(\accepts) var(string)code(;)) This keyword can appear only within a code(\translator) block. It specifies what contexts are allowed with the context that is being defined. See Section ref(translators). +dit(code(\alternative) code({) var(music1) var(music2) ... code(})) +Specifies alternative endings. Must come after a code(\repeat) keyword. + dit(code(\bar) var(bartype)code(;)) Prints a special bar symbol, or at measure boundaries, replaces the regular bar symbol with a special symbol. The argument var(bartype) is a string which specifies the @@ -906,6 +936,7 @@ mudela(center)( mudela(center)( \score{ \notes{\cadenza 1; \clef alto; c'4_"\kern -10mm alto" + \clef scarlatti; c'4_"\kern -4mm scarlatti" \clef mezzosoprano; c'4^"\kern -10mm mezzosoprano" \clef soprano; c'4_"\kern -10mm soprano" \clef treble; c'4^"\kern -6mm treble" @@ -943,8 +974,9 @@ Specifies information about the music. A header should appear at the top of the file describing the file's contents. If a file has multiple code(\score) blocks, then a header should appear in each score block describing its contents. Tools like code(ly2dvi) can -use this information for generating titles. Some possible key values -are: title, opus, description, composer, enteredby, and copyright. +use this information for generating titles. Key values that are used +by ly2dvi are: title, subtitle, composer, opus, poet, instrument, +metre, arranger, and piece. dit(code(\in)) Specify a dimension in inches. @@ -1041,6 +1073,16 @@ dit(code(\remove) var(string)code(;)) Can appear only in a code(\translator) block. Specifies that a performer or engraver named var(string) should be removed. See Section ref(translators). +dit(code(\repeat) var(count) code({) var(music) code(})) +Repeats the specified +music var(count) times. Alternative endings can be specified by adding a +code(\alternative) keyword after the code(\repeat). + +dit(code(\scm) var(scheme)code(;)) Embeds specified Scheme code. + +dit(code(\scmfile) var(filename)code(;)) Reads Scheme code from the specified +file. + dit(code(\score) var(statementlist)) Create a Score context. This is the top level notation context. COMMENT(this still needs work) @@ -1256,6 +1298,10 @@ direction, set to code(\up) to force slurs up, set to code(\down) to force slurs down. The shorthands code(\slurup), code(\slurdown), and code(\slurboth) are available. +dit(code(tieYDirection)) Set to code(\free) for free choice of tie +direction, set to code(\up) to force ties up, set to code(\down) to +force ties down. + dit(code(slurdash)) Set to 0 for normal slurs, 1 for dotted slurs, and a larger value for dashed slurs. Identifiers code(\slurnormal) and code(\slurdotted) are predefined to set the first two settings. @@ -1786,9 +1832,6 @@ dit(code(Local_key_engraver)) dit(code(Lyric_engraver)) Engraves lyrics. Normally in code(LyricVoice). dit(code(Multi_measure_rest_engraver)) Engraves multi-measure rests that are produced with code(R). Normally in code(Voice). -dit(code(Note_heads_engraver)) Engraves note heads. Normally in code(Voice). -Removing this gives a fatal error. -COMMENT(Perhaps should be Note_head_engraver) dit(code(Piano_bar_engraver)) dit(code(Pitch_squash_engraver)) Treat all pitches as middle C. Used in code(RhythmicStaff). Note that the notes move, but the locations of @@ -1799,6 +1842,8 @@ dit(code(Plet_swallow_engraver)) Swallows tuplet requests without any output. In code(LyricVoice). COMMENT( Should this be named Plet_req_swallow_translator? ) dit(code(Priority_horizontal_align_engraver)) +dit(code(Repeat_engraver)) Handles repeats? In code(Staff) and + code(RhythmicStaff). dit(code(Rest_collision_engraver)) Handles collisions of rests. In code(Staff). dit(code(Rest_engraver)) Engraves rests. Normally in code(Voice). dit(code(Rhythmic_column_engraver)) @@ -1824,6 +1869,7 @@ code(Staff) and code(RhythmicStaff). dit(code(Timing_engraver)) Responsible for synchronizing timing information from staffs. Normally in code(Score). In order to create polyrhythmic music, this engraver should be removed from code(Score) and placed in code(Staff). +dit(code(Tuplet_engraver)) Engraves tuplet brackets? In code(Staff). dit(code(Vertical_align_engraver)) ) diff --git a/NEWS b/NEWS index 335084b958..379b1dd0fb 100644 --- a/NEWS +++ b/NEWS @@ -1,55 +1,39 @@ ---- ../lilypond-1.1.8.jcn2/NEWS Tue Nov 24 20:37:55 1998 -++ b/NEWS Thu Nov 26 01:10:29 1998 -@@ -1,3 +1,6 @@ +pl 9 + - fixed \relative + +pl8.tca1 + - changes to mudela-book. Junked fragment and floating options, + added eps option. Options should not stay as long that you get + comfortable with them. ;) + - Also possible to define your own commands with + a syntax like \mudela{c d e} + - updated mudela-book-doc.doc + pl 8.jcn3 - website: gnuisation of footers - pl 8.jcn2 - - input/test/vertical-text.ly: urg ydim of text chords - - bf: one set of |: :| volta per staff--- ../lilypond-1.1.8.hwn2/NEWS Wed Nov 25 14:00:43 1998 -++ b/NEWS Wed Nov 25 22:52:54 1998 -@@ -1,3 +1,6 @@ -pl 8.hwn3 - - coriolan corno 1 - - pl 8.hwn2 - - more output revamping. - --- ../lilypond-1.1.8.hwn1/NEWS Sun Nov 22 20:43:39 1998 -++ b/NEWS Wed Nov 25 14:00:43 1998 -@@ -1,4 +1,8 @@ -pl 8.hwn2 - - more output revamping. +pl 8.jcn2 + - input/test/vertical-text.ly: urg ydim of text chords + - bf: one set of |: :| volta per staff + - bf: init/table* braces + more braces + - try at score-volta-bracket - pl 8.hwn1 - - Scheme output stuff - - tutorial fixes. - - pl 8--- ../lilypond-1.1.8/NEWS Sat Nov 21 12:21:29 1998 -++ b/NEWS Mon Nov 23 21:47:36 1998 -@@ -1,3 +1,8 @@ pl 8.jcn1 - bf: lyric-engraver: handle multiple requests (don't overwrite) - bf: guile-config - music-list-iterator - pl 8 - - pl7.jcn3--- ../lilypond-1.1.8/NEWS Sun Nov 22 20:16:26 1998 -++ b/NEWS Sun Nov 22 20:43:39 1998 -@@ -1,3 +1,6 @@ +pl 8.hwn3 + - coriolan corno 1 + +pl 8.hwn2 + - more output revamping. + pl 8.hwn1 + - Scheme output stuff - tutorial fixes. - pl 8 - - pl7.jcn3pl8.tca1 - - changes to mudela-book. Junked fragment and floating options, - added eps option. Options should not stay as long that you get - comfortable with them. ;) - - Also possible to define your own commands with - a syntax like \mudela{c d e} - - updated mudela-book-doc.doc -************** +***************** pl 8 pl7.jcn3 diff --git a/TODO b/TODO index ab8d77667f..587a96c2e5 100644 --- a/TODO +++ b/TODO @@ -9,6 +9,19 @@ grep for TODO and ugh/ugr/urg BUGS: * gallina barlines. + * fix height of / collisions with lyrics (chords), + see input/test/vertical-text.ly + + * repeat/volta: + - one volta spanner per score + - repeat bars span staffs + - placement alternative number + - dimensions of volta bracket + + * 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,8 +57,6 @@ ii Summary of minor spelling irregularities: * fix SkipBars -> skipBars - * repeat bars: need distance after ":|" and before "|:" - * \shape 1st dim skipped? * fix marks/barnumbers/marginal notes @@ -96,8 +107,6 @@ STUFF * revise documentation - * abbrev -> tremolo - * junking \skip req in lyrics * Language: @@ -228,6 +237,7 @@ ydirection and hshift preset * rename - plet -> tuplet - measure -> bar + - abbrev -> tremolo - abbreviation-beam -> (measured/unmeasured) tremolo - partial -> anacrouse @@ -419,7 +429,7 @@ PROJECTS * add to MIDI output: - tempo change - ornaments (and trills?) - - repeat + - repeat/volta - slurs - accents - dynamics @@ -532,8 +542,6 @@ INPUTLANGUAGE * relative mode for pitch entering - * bracket: volta 1,2 - * configure pitch_byte * rest name configurable @@ -598,8 +606,6 @@ SMALLISH PROJECTS * revise calcideal - * volta - IDEAS * Output data structures of Mudela in XML/SGML. diff --git a/VERSION b/VERSION index 22341bb7ed..9dfb847483 100644 --- a/VERSION +++ b/VERSION @@ -1,8 +1,8 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=1 -PATCH_LEVEL=8 -MY_PATCH_LEVEL=jcn3 +PATCH_LEVEL=9 +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 5d06ba8320..e69de29bb2 100755 --- a/configure +++ b/configure @@ -1,3615 +0,0 @@ -#! /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_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/engraver.ly b/init/engraver.ly index 81f5312937..078a6211ac 100644 --- a/init/engraver.ly +++ b/init/engraver.ly @@ -15,16 +15,16 @@ StaffContext=\translator { %} % \type "Hara_kiri_line_group_engraver"; + \consists "Repeat_engraver"; \consists "Bar_engraver"; \consists "Clef_engraver"; \consists "Key_engraver"; \consists "Local_key_engraver"; \consists "Time_signature_engraver"; - \consists "Repeat_engraver"; \consists "Staff_symbol_engraver"; \consists "Collision_engraver"; \consists "Rest_collision_engraver"; - \consists "Tuplet_engraver"; + %{ Uncomment to get bar numbers on single staff systems: @@ -77,8 +77,9 @@ RhythmicStaffContext=\translator{ \consists "Pitch_squash_engraver"; \consists "Separating_line_group_engraver"; \name RhythmicStaff; - \consists "Bar_engraver"; + \consists "Repeat_engraver"; + \consists "Bar_engraver"; \consists "Time_signature_engraver"; \consists "Staff_symbol_engraver"; \accepts "Voice"; @@ -101,6 +102,7 @@ VoiceContext = \translator { \consists "Font_size_engraver"; \consists "Slur_engraver"; \consists "Ties_engraver"; + \consists "Tuplet_engraver"; \consists "Note_heads_engraver" ; \consists "Skip_req_swallow_translator"; }; @@ -206,9 +208,9 @@ HaraKiriStaffContext = \translator { barColumnPriority = "0"; marginBreakPriority = "-4"; + \consists "Repeat_engraver"; \consists "Bar_engraver"; \consists "Clef_engraver"; - \consists "Repeat_engraver"; \consists "Key_engraver"; \consists "Time_signature_engraver"; \consists "Local_key_engraver"; @@ -243,6 +245,7 @@ OrchestralScoreContext= \translator { defaultClef = treble; \consists "Timing_engraver"; + \consists "Bar_column_engraver"; \consists "Bar_number_engraver"; \consists "Mark_engraver"; diff --git a/init/table16.ly b/init/table16.ly index 5c311e61c8..a7c974e8f2 100644 --- a/init/table16.ly +++ b/init/table16.ly @@ -58,7 +58,7 @@ table_sixteen= % dims ignored for this table "param" = \table { - "brace" "pianobrace" 1 0.0\pt 0.0\pt 32.0\pt 80.0\pt + "brace" "pianobrace" 1 0.0\pt 0.0\pt 32.0\pt 112.0\pt "bracket" "staffbracket" 1 0.0\pt 4.0\pt 16.0\pt 128.0\pt "extender" "extender" 1 0.0\pt 0.0\pt 1.0\pt 160.0\pt "time_signature" "generalmeter" 2 0.0\pt 10.0\pt -8.0\pt 8.0\pt diff --git a/init/table20.ly b/init/table20.ly index 4ad5292791..ab27995a36 100644 --- a/init/table20.ly +++ b/init/table20.ly @@ -65,7 +65,7 @@ table_twenty = "bracket" "staffbracket" 1 0.0\pt 0.0\pt 20.0\pt 160.0\pt "extender" "extender" 1 0.0\pt 0.0\pt 1.0\pt 160.0\pt "rule" "rulesym" 2 - "brace" "pianobrace" 1 0.0\pt 0.0\pt 40.0\pt 100.0\pt + "brace" "pianobrace" 1 0.0\pt 0.0\pt 40.0\pt 140.0\pt "time_signature" "generalmeter" 2 0.0\pt 10.0\pt -5.0\pt 5.0\pt "stem" "stem" 2 "fill" "hbox{}" 0 diff --git a/input/test/vertical-text.ly b/input/test/vertical-text.ly index 4d1d3d59e1..340815621c 100644 --- a/input/test/vertical-text.ly +++ b/input/test/vertical-text.ly @@ -1,8 +1,14 @@ \score{ < - \type Staff = o \notes\relative c,,, { \stemdown [c8 c c c] } - \type Lyrics \lyrics{ BLA bla } - \type Staff = t \notes\relative c''''' { \stemup [c8 c c c] } + \type Staff = o \notes\relative c,,, { + \stemdown [c8 c c c] c4 c4 \break [c8 c c c] c4 c4 + } + \type Lyrics \lyrics{ + BLA bla _2 < { BLA bla } { BLA bla } > _2 + } + \type Staff = t \notes\relative c''''' { + \stemup [c8 c c c] c4 c [c8 c c c] c4 c + } > \paper{ castingalgorithm = \Wordwrap; diff --git a/lily/include/music-list.hh b/lily/include/music-list.hh index a87cb8d4dd..7e5e310adc 100644 --- a/lily/include/music-list.hh +++ b/lily/include/music-list.hh @@ -36,7 +36,7 @@ public: Music_sequence (Music_list *l_p); VIRTUAL_COPY_CONS(Music); - + Musical_pitch do_relative_octave (Musical_pitch p, bool b); virtual void transpose (Musical_pitch ); virtual void compress (Moment); void add_music (Music *music_p); diff --git a/lily/include/music-wrapper.hh b/lily/include/music-wrapper.hh index 46008d2f5c..14c99c6726 100644 --- a/lily/include/music-wrapper.hh +++ b/lily/include/music-wrapper.hh @@ -31,6 +31,8 @@ public: Music_wrapper (Music_wrapper const&); virtual Moment duration () const; virtual ~Music_wrapper (); + virtual Musical_pitch to_relative_octave (Musical_pitch); + }; diff --git a/lily/include/repeated-music.hh b/lily/include/repeated-music.hh index 1a4641ff5a..1528f5810b 100644 --- a/lily/include/repeated-music.hh +++ b/lily/include/repeated-music.hh @@ -31,7 +31,7 @@ public: virtual void do_print () const; virtual void transpose (Musical_pitch p); virtual Moment duration () const; - + virtual Musical_pitch to_relative_octave (Musical_pitch p); VIRTUAL_COPY_CONS(Music); }; diff --git a/lily/lookup.cc b/lily/lookup.cc index 43afcd75a2..12265840d6 100644 --- a/lily/lookup.cc +++ b/lily/lookup.cc @@ -520,6 +520,9 @@ Lookup::volta (Real w, bool last_b) const gh_int2scm (last_b), SCM_UNDEFINED); a.str_ = "volta"; + Real interline_f = paper_l_->interline_f (); + a.dim_[Y_AXIS] = Interval (-interline_f / 2, interline_f / 2); + a.dim_[X_AXIS] = Interval (0, w); return a; } diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc index e1be97be83..bac629b385 100644 --- a/lily/lyric-engraver.cc +++ b/lily/lyric-engraver.cc @@ -58,6 +58,7 @@ Lyric_engraver::do_process_requests() // urg // item_p->translate (Offset (0, (i - 1) * item_p->height ().length_i ())); // if (i && ((Text_def*)text_p_arr_[i - 1]->tdef_p_)->text_str_.length_i ()) + // urg, when/how can one get the heigt of this thing? item_p->translate (Offset (0, - i * 12 PT)); text_p_arr_.push (item_p); announce_element (Score_element_info (item_p, request_l)); diff --git a/lily/music-list.cc b/lily/music-list.cc index 42d9b801e8..d6fe224a9c 100644 --- a/lily/music-list.cc +++ b/lily/music-list.cc @@ -59,15 +59,20 @@ Sequential_music::duration () const Musical_pitch Sequential_music::to_relative_octave (Musical_pitch p) { - return music_p_list_p_->do_relative_octave (p, false); + return do_relative_octave (p, false); } Musical_pitch Simultaneous_music::to_relative_octave (Musical_pitch p) { - return music_p_list_p_->do_relative_octave (p, true); + return do_relative_octave (p, true); } +Musical_pitch +Music_sequence::do_relative_octave (Musical_pitch p, bool b) +{ + return music_p_list_p_->do_relative_octave (p, b); +} Musical_pitch Music_list::do_relative_octave (Musical_pitch last, bool ret_first) diff --git a/lily/music-wrapper.cc b/lily/music-wrapper.cc index c91a81df3d..81ee249605 100644 --- a/lily/music-wrapper.cc +++ b/lily/music-wrapper.cc @@ -49,3 +49,10 @@ Music_wrapper::duration () const { return element_p_->duration (); } + + +Musical_pitch +Music_wrapper::to_relative_octave (Musical_pitch p) +{ + return element_p_->to_relative_octave (p); +} diff --git a/lily/repeat-engraver.cc b/lily/repeat-engraver.cc index f2f2c19e97..3558b8d05a 100644 --- a/lily/repeat-engraver.cc +++ b/lily/repeat-engraver.cc @@ -29,10 +29,24 @@ Repeat_engraver::do_try_music (Music* m) { if (Repeated_music* r = dynamic_cast (m)) { - repeated_music_arr_.push (r); - stop_mom_arr_.push (now_moment () + r->repeat_p_->duration () - + r->alternative_p_->music_p_list_p_->top ()->duration ()); + Moment stop_mom = now_moment () + r->repeat_p_->duration () + + r->alternative_p_->music_p_list_p_->top ()->duration (); Moment alt_mom = now_moment () + r->repeat_p_->duration (); + /* + TODO: + figure out what we don't want. + + we don't want to print more than one set of + |: :| and volta brackets on one staff. + + counting nested repeats, it seems safest to forbid + two pieces of alternative music to start at the same time. + */ + for (int i = 0; i < alternative_start_mom_arr_.size (); i++) + if (alternative_start_mom_arr_[i] == alt_mom) + return false; + repeated_music_arr_.push (r); + stop_mom_arr_.push (stop_mom); for (PCursor i (r->alternative_p_->music_p_list_p_->top ()); i.ok (); i++) { alternative_music_arr_.push (i.ptr ()); diff --git a/lily/repeated-music.cc b/lily/repeated-music.cc index e0692aca8a..a3751c38cb 100644 --- a/lily/repeated-music.cc +++ b/lily/repeated-music.cc @@ -62,3 +62,23 @@ Repeated_music::duration () const return m; } + +Musical_pitch +Repeated_music::to_relative_octave (Musical_pitch p) +{ + p = repeat_p_->to_relative_octave (p); + + p = alternative_p_->do_relative_octave (p, false); + return p; + + /* ugh. Should + \relative c'' \repeat 2 { c4 } { < ... > } + + and + + \relative c'' \repeat 2 { c4 } + { { ...} } + + behave differently? + */ +} diff --git a/lily/text-def.cc b/lily/text-def.cc index bbdac9dee9..ecff7e8479 100644 --- a/lily/text-def.cc +++ b/lily/text-def.cc @@ -66,7 +66,9 @@ Text_def::get_atom (Paper_def *p, Direction) const a.translate_axis (-(align_dir_ + 1)* guess_width_f (a) / 2, X_AXIS); // urg 1/1 is too much; see input/test/vertical-text.ly - a.translate_axis (a.dim_.y ().length () * 9 / 10, Y_AXIS); +// a.translate_axis (a.dim_.y ().length () * 9 / 10, Y_AXIS); + // fine for one lyric, urg for lyric chord + a.translate_axis (a.dim_.y ().length () * 2 / 5, Y_AXIS); return a; } diff --git a/lily/text-item.cc b/lily/text-item.cc index eb4383f324..b625254867 100644 --- a/lily/text-item.cc +++ b/lily/text-item.cc @@ -75,6 +75,8 @@ Text_item::brew_molecule_p () const if (dir_<0) // should do something better anyway. mol_p->translate_axis (mol_p->extent ().y ().left , Y_AXIS); mol_p->translate_axis (coordinate_offset_f_, Y_AXIS); + // fine for one lyric, urg for lyric chord + mol_p->translate_axis (a.dim_.y ().length (), Y_AXIS); return mol_p; } diff --git a/make/lilypond.spec.in b/make/lilypond.spec.in index bb7ccd6edb..3c0213304a 100644 --- a/make/lilypond.spec.in +++ b/make/lilypond.spec.in @@ -25,7 +25,9 @@ make htmldoc || true %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/tmp/lilypond-rpm-doc -tar -C $RPM_BUILD_ROOT/tmp/lilypond-rpm-doc -xzf out/htmldoc.tar.gz +mkdir htmldocs +tar -C htmldocs -xzf out/htmldoc.tar.gz +#tar -C $RPM_BUILD_ROOT/tmp/lilypond-rpm-doc -xzf out/htmldoc.tar.gz strip lily/out/lilypond mi2mu/out/mi2mu make prefix="$RPM_BUILD_ROOT/usr" install @@ -36,7 +38,7 @@ cp buildscripts/out/lilypond-login $RPM_BUILD_ROOT/etc/profile.d/lilypond.csh %files -%doc /tmp/lilypond-rpm-doc +%doc htmldocs/ # hairy to hook it in (possibly non-existing) emacs %doc mudela-mode.el diff --git a/make/out/lelievijver.lsm b/make/out/lelievijver.lsm index 189b87152a..f4171887cb 100644 --- a/make/out/lelievijver.lsm +++ b/make/out/lelievijver.lsm @@ -1,15 +1,15 @@ Begin3 Titel: LilyPond -Versie: 1.1.8 -Inschrijf datum: 20NOV98 +Versie: 1.1.9 +Inschrijf datum: 26NOV98 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.8.tar.gz + 770k lilypond-1.1.9.tar.gz Oorspronkelijke plek: ftp.cs.uu.nl /pub/GNU/LilyPond/development/ - 770k lilypond-1.1.8.tar.gz + 770k lilypond-1.1.9.tar.gz Copi-eer voorwaarden: GPL End diff --git a/make/out/lilypond.lsm b/make/out/lilypond.lsm index 561e535c6a..c0adcbd091 100644 --- a/make/out/lilypond.lsm +++ b/make/out/lilypond.lsm @@ -1,7 +1,7 @@ Begin3 Title: LilyPond -Version: 1.1.8 -Entered-date: 20NOV98 +Version: 1.1.9 +Entered-date: 26NOV98 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.8.tar.gz + 770k lilypond-1.1.9.tar.gz Original-site: ftp.cs.uu.nl /pub/GNU/LilyPond/development/ - 770k lilypond-1.1.8.tar.gz + 770k lilypond-1.1.9.tar.gz Copying-policy: GPL End diff --git a/make/out/lilypond.spec b/make/out/lilypond.spec index de3bac4d87..869f459693 100644 --- a/make/out/lilypond.spec +++ b/make/out/lilypond.spec @@ -1,9 +1,9 @@ Name: lilypond -Version: 1.1.8 +Version: 1.1.9 Release: 1 Copyright: GPL Group: Applications/Publishing -Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.1.8.tar.gz +Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.1.9.tar.gz Summary: A program for printing sheet music. URL: http://www.cs.uu.nl/~hanwen/lilypond Packager: Han-Wen Nienhuys @@ -31,7 +31,9 @@ make htmldoc || true %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/tmp/lilypond-rpm-doc -tar -C $RPM_BUILD_ROOT/tmp/lilypond-rpm-doc -xzf out/htmldoc.tar.gz +mkdir htmldocs +tar -C htmldocs -xzf out/htmldoc.tar.gz +#tar -C $RPM_BUILD_ROOT/tmp/lilypond-rpm-doc -xzf out/htmldoc.tar.gz strip lily/out/lilypond mi2mu/out/mi2mu make prefix="$RPM_BUILD_ROOT/usr" install @@ -42,7 +44,7 @@ cp buildscripts/out/lilypond-login $RPM_BUILD_ROOT/etc/profile.d/lilypond.csh %files -%doc /tmp/lilypond-rpm-doc +%doc htmldocs/ # hairy to hook it in (possibly non-existing) emacs %doc mudela-mode.el diff --git a/mf/feta-beugel.mf b/mf/feta-beugel.mf index 7acd135471..7f8558f69b 100644 --- a/mf/feta-beugel.mf +++ b/mf/feta-beugel.mf @@ -39,6 +39,6 @@ endchar; enddef; -for h := 2 staffsize# step 1 pt# until (6 * staffsize#): +for h := 2 staffsize# step 1 pt# until (7 * staffsize#): draw_brace(h, interline# ); endfor diff --git a/tex/fetdefs.tex b/tex/fetdefs.tex index 20b12df5e0..ee03b11bcf 100644 --- a/tex/fetdefs.tex +++ b/tex/fetdefs.tex @@ -12,7 +12,7 @@ \font\bracefontsixteen = feta-braces16 \font\fingerfontsixteen = feta-nummer4 \font\markfontsixteen = feta-nummer10 - \font\fetanummerjsixteen = feta-nummer6 + \font\fetanummerjsixteen = feta-nummer5 \def\currentsize{sixteen} }