From 51935ebb46050694a2fa643003097a103975475e Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Tue, 16 Sep 2003 20:10:44 +0000 Subject: [PATCH] release commit --- input/test/engraver-contexts.ly | 4 +- input/test/engraver-one-by-one.ly | 3 +- lily/font-metric.cc | 6 +++ stepmake/autogen.sh | 62 +++++++++++++++++++++++++++++++ 4 files changed, 70 insertions(+), 5 deletions(-) create mode 100755 stepmake/autogen.sh diff --git a/input/test/engraver-contexts.ly b/input/test/engraver-contexts.ly index 052eb3dd5b..eeb622595f 100644 --- a/input/test/engraver-contexts.ly +++ b/input/test/engraver-contexts.ly @@ -1,5 +1,3 @@ -#(ly:set-option 'old-relative) - \version "1.9.6" \header { @@ -15,7 +13,7 @@ context. " } -\include "engraver-example.ly" +\include "engraver-example.lyinc" \score { \context Staff << \topVoice \\ \botVoice >> diff --git a/input/test/engraver-one-by-one.ly b/input/test/engraver-one-by-one.ly index 9c3dcc587e..be5a7b1e39 100644 --- a/input/test/engraver-one-by-one.ly +++ b/input/test/engraver-one-by-one.ly @@ -1,4 +1,3 @@ -#(ly:set-option 'old-relative) \version "1.9.6" \header { @@ -24,7 +23,7 @@ Staff context. } \paper { raggedright = ##t } -\include "engraver-example.ly" +\include "engraver-example.lyinc" % diff --git a/lily/font-metric.cc b/lily/font-metric.cc index 39a08d5537..a8f81640a6 100644 --- a/lily/font-metric.cc +++ b/lily/font-metric.cc @@ -155,10 +155,16 @@ LY_DEFINE(ly_find_glyph_by_name, "ly:find-glyph-by-name", 2 , 0, 0, Molecule m = fm->find_by_name (ly_scm2string (name)); +#if 0 + /* + should add to calling interface. + */ if (m.get_expr () != SCM_EOL) return m.smobbed_copy (); else return SCM_BOOL_F; +#endif + return m.smobbed_copy (); } LY_DEFINE(ly_get_glyph, "ly:get-glyph", 2 , 0, 0, diff --git a/stepmake/autogen.sh b/stepmake/autogen.sh new file mode 100755 index 0000000000..05b2eae55c --- /dev/null +++ b/stepmake/autogen.sh @@ -0,0 +1,62 @@ +#!/bin/sh +# Run this to generate configure and initial GNUmakefiles + +srcdir=`dirname $0` + + +if [ ! -f aclocal.m4 -o stepmake/aclocal.m4 -nt aclocal.m4 ]; then + echo "stepmake/aclocal.m4 is newer. Copying file." + cp -f stepmake/aclocal.m4 aclocal.m4 +fi + +if [ ! -f autogen.sh -o stepmake/autogen.sh -nt autogen.sh ]; then + echo "stepmake/autogen.sh is newer. Copying file." + cp -f stepmake/autogen.sh autogen.sh + exec ./autogen.sh +fi + +# Be paranoid: check for autoconf >= 2.50 +# Some setups have both autoconf 2.13 and 2.5x available through +# a wrapper script: /usr/bin/autoconf. +# This wrapper may incorrectly autoselect autoconf 2.50, but it +# advertises itself as autoconf 2.13. +# If you have such a setup, invoke this script as: +# autoconf=autoconf2.50 ./autogen.sh +for i in autoconf2.50 autoconf-2.50 autoconf false; do + version=`$i --version 2>/dev/null | head -1 | awk '{print $NF}' | awk -F. '{print $1 * 100 + $2}'` + if test "0$version" -ge 250; then + autoconf=$i + break + fi +done + +if test -z "$autoconf"; then + echo "ERROR: Please install autoconf 2.50 or newer" + exit 1 +fi + +if test -z "$*"; then + echo "WARNING: I am going to run \`configure' with no arguments." + echo "If you wish to pass any to it, please specify them on the" + echo \`$0\'" command line." + echo +fi + +for coin in `find $srcdir -name configure.in -print` +do + dr=`dirname $coin` + echo processing $dr + ( + cd $dr + echo "Running autoconf ..." + $autoconf + ) +done + +#conf_flags="--enable-maintainer-mode --enable-compile-warnings" #--enable-iso-c +if test -z "$NOCONFIGURE"; then + echo Running $srcdir/configure $conf_flags "$@" ... + $srcdir/configure $conf_flags "$@" +else + echo Skipping configure process. +fi -- 2.39.2