From 4ae3a70d0266a2d296e2d749bfc3d7730ee17cc3 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 12 Nov 2004 00:02:12 +0000 Subject: [PATCH] * stepmake/aclocal.m4: Barf if kpathsea/kpathsea.h is not found. (backportme) * Documentation/topdocs/INSTALL.texi (ec-fonts-mtraced): Add version requirement. (backportme) * configure.in: Be explicit about old versions of ec-fonts-mtraced. (backportme) --- ChangeLog | 9 +++++++++ Documentation/topdocs/INSTALL.texi | 2 +- configure.in | 8 +++++++- lily/music.cc | 2 +- stepmake/aclocal.m4 | 12 ++++++------ 5 files changed, 24 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index f385d555c1..0b22a6dd02 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,14 @@ 2004-11-11 Jan Nieuwenhuizen + * stepmake/aclocal.m4: Barf if kpathsea/kpathsea.h is not + found. (backportme) + + * Documentation/topdocs/INSTALL.texi (ec-fonts-mtraced): Add + version requirement. (backportme) + + * configure.in: Be explicit about old versions of + ec-fonts-mtraced. (backportme) + * lily/context-selector.cc (set_tweaks): New function. * lily/grob-selector.cc (set_tweaks): (Re)set hash table. Fixes web with -DTWEAK. diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi index 3efc398862..2a59fbe588 100644 --- a/Documentation/topdocs/INSTALL.texi +++ b/Documentation/topdocs/INSTALL.texi @@ -119,7 +119,7 @@ GNU LilyPond does use a lot of resources. For operation you need the following software: @itemize @bullet -@item @uref{http://lilypond.org/download/fonts,ec-fonts-mftraced} +@item @uref{http://lilypond.org/download/fonts,ec-fonts-mftraced} (version 1.0.5 or newer). @item @uref{http://www.gnu.org/software/guile/guile.html,GUILE} (version 1.6.0 or newer). @item @uref{http://www.python.org,Python} (version 2.1 or newer). @item @TeX{}. diff --git a/configure.in b/configure.in index 0f6f4aadce..e2aa933081 100644 --- a/configure.in +++ b/configure.in @@ -69,7 +69,13 @@ if test -n "$ecb10"; then AC_MSG_RESULT([$ecb10]) else AC_MSG_RESULT(no) - STEPMAKE_ADD_ENTRY(REQUIRED, 'package ec-fonts-mftraced') + STEPMAKE_ADD_ENTRY(REQUIRED, 'package ec-fonts-mftraced >= 1.0.5') + AC_MSG_CHECKING([for old version of ec-fonts-mftraced]) + ecrm10=`kpsewhich ecrm10.pfa 2>/dev/null` + if test -n "$ecrm10"; then + AC_MSG_RESULT([$ecrm10]) + AC_MSG_WARN([old version of ec-fonts-mftraced found, install 1.0.5 or newer]) + fi fi diff --git a/lily/music.cc b/lily/music.cc index 8d658ba353..ad1a5fb6c1 100644 --- a/lily/music.cc +++ b/lily/music.cc @@ -217,7 +217,7 @@ Music::internal_set_property (SCM s, SCM v) if (!type_check_assignment (s, v, ly_symbol2scm ("music-type?"))) abort (); - mutable_property_alist_ = scm_assq_set_x (mutable_property_alist_, s, v); + mutable_property_alist_ = scm_assq_set_x (mutable_property_alist_, s, v); } void diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4 index bf7f7f5b88..bc0979e179 100644 --- a/stepmake/aclocal.m4 +++ b/stepmake/aclocal.m4 @@ -756,17 +756,17 @@ AC_DEFUN(STEPMAKE_KPATHSEA, [ [kpathsea_b=$with_kpathsea]) if test "$kpathsea_b" != "no"; then - AC_CHECK_HEADERS([kpathsea/kpathsea.h]) + AC_CHECK_HEADERS([kpathsea/kpathsea.h],,kpathsea_b=no) AC_CHECK_LIB(kpathsea, kpse_find_file) AC_CHECK_FUNCS(kpse_find_file,,kpathsea_b=no) if test "$kpathsea_b" = "no"; then warn='kpathsea (libkpathsea-dev, kpathsea-devel or tetex-devel package). - Else, please specify the location of your kpathsea using - --with-kpathsea-include and --with-kpathsea-lib options. You should - install kpathsea; see INSTALL.txt. Rerun ./configure - --without-kpathsea only if kpathsea is not available for your - platform.' + Else, please specify the directories where kpathsea/kpathsea.h and + libkpathsea.a are installed using --with-kpathsea-include and + --with-kpathsea-lib options. You should install kpathsea; see + INSTALL.txt. Rerun ./configure --without-kpathsea only if kpathsea + is not available for your platform.' STEPMAKE_ADD_ENTRY(REQUIRED, $warn) fi fi -- 2.39.2