CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Jan Nieuwenhuizen <[EMAIL PROTECTED]> 05/04/25 11:15:31
Modified files:
stepmake : aclocal.m4
scm : lily.scm
cygwin : mknetrel
. : ChangeLog
Log message:
* scm/lily.scm (ly:load): Remove x11-color.
* stepmake/aclocal.m4 (STEPMAKE_GET_EXECUTABLE): Bugfix: do not
quote executable, fixes getting version from program --with
--options.
(STEPMAKE_KPATHSEA): Bugfix for Cygwin cross building: use
$ac_exeect.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/stepmake/aclocal.m4.diff?tr1=1.140&tr2=1.141&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/lily.scm.diff?tr1=1.326&tr2=1.327&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/cygwin/mknetrel.diff?tr1=1.39&tr2=1.40&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3497&tr2=1.3498&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3497 lilypond/ChangeLog:1.3498
--- lilypond/ChangeLog:1.3497 Mon Apr 25 07:28:04 2005
+++ lilypond/ChangeLog Mon Apr 25 11:15:30 2005
@@ -1,5 +1,13 @@
2005-04-25 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
+ * scm/lily.scm (ly:load): Remove x11-color.
+
+ * stepmake/aclocal.m4 (STEPMAKE_GET_EXECUTABLE): Bugfix: do not
+ quote executable, fixes getting version from program --with
+ --options.
+ (STEPMAKE_KPATHSEA): Bugfix for Cygwin cross building: use
+ $ac_exeect.
+
* Documentation/user/GNUmakefile: Only build music-glossary with
rendered lilypond snippets during web.
Index: lilypond/cygwin/mknetrel
diff -u lilypond/cygwin/mknetrel:1.39 lilypond/cygwin/mknetrel:1.40
--- lilypond/cygwin/mknetrel:1.39 Sat Mar 5 20:20:12 2005
+++ lilypond/cygwin/mknetrel Mon Apr 25 11:15:30 2005
@@ -86,6 +86,12 @@
patchsrc
rm -f config.cache
+ cd $src
+ if [ ! -x ./configure ]; then
+ ./autogen.sh --noconfigure
+ fi
+
+ cd $build
# for cross-compiling LilyPond, fake a guile-config
if ! iscygwin; then
cd $build || exit 1
@@ -111,13 +117,17 @@
# cross-compiling: configure for build-host
if ! iscygwin; then
rm -f config.cache
- export HOST_CC=gcc
- export HOST_CXX=g++
+ export HOST_CC=${HOST_CC:-gcc}
+ export HOST_CXX=${HOST_CXX:-g++}
+ export HOST_PKG_CONFIG=${HOST_PKG_CONFIG:-pkg-config}
+ export HOST_PKG_CONFIG_PATH=${HOST_PKG_CONFIG_PATH:-}
(PATH="$old_path" \
PATH="$HOME/usr/pkg/guile/bin:$PATH" \
CFLAGS="-O2 -g" \
CC=$HOST_CC \
CXX=$HOST_CXX \
+ PKG_CONFIG=$HOST_PKG_CONFIG \
+ PKG_CONFIG_PATH=$HOST_PKG_CONFIG_PATH \
$src/configure --prefix=/usr --enable-config=for-build)
fi
}
Index: lilypond/scm/lily.scm
diff -u lilypond/scm/lily.scm:1.326 lilypond/scm/lily.scm:1.327
--- lilypond/scm/lily.scm:1.326 Sun Apr 24 21:41:12 2005
+++ lilypond/scm/lily.scm Mon Apr 25 11:15:30 2005
@@ -226,7 +226,7 @@
"paper.scm"
"backend-library.scm"
- "x11-color.scm"
+ ;; "x11-color.scm"
;; must be after everything has been defined
"safe-lily.scm"))
Index: lilypond/stepmake/aclocal.m4
diff -u lilypond/stepmake/aclocal.m4:1.140 lilypond/stepmake/aclocal.m4:1.141
--- lilypond/stepmake/aclocal.m4:1.140 Wed Apr 20 08:16:45 2005
+++ lilypond/stepmake/aclocal.m4 Mon Apr 25 11:15:30 2005
@@ -11,7 +11,7 @@
## command -v doesn't work in zsh
## command -v "$1" 2>&1
## this test should work in ash, bash, pdksh (ksh), zsh
- type -p "$1" 2>/dev/null | tail -n 1 | awk '{print $NF}'
+ type -p $1 2>/dev/null | tail -n 1 | awk '{print $NF}'
])
@@ -797,12 +797,12 @@
AC_TRY_LINK([#include <kpathsea/kpathsea.h>],
[kpse_var_expand ("\$TEXMF");],
[have_libkpathsea_so=maybe;
- shared_size=`wc -c conftest`;
+ shared_size=`wc -c conftest$ac_exeext`;
shared_size=`echo $shared_size | sed -e 's/ .*//g'`],
[have_libkpathsea_so=no])
if test "$have_libkpathsea_so" = "maybe"; then
- if test $shared_size -lt 40000 ; then
+ if test "$shared_size" -lt 40000 ; then
have_libkpathsea_so=yes
else
have_libkpathsea_so=no
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
