From 510c23222011923988684f6a9d2d77a3f9564eba Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 25 Apr 2005 11:15:30 +0000 Subject: [PATCH] * 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. --- ChangeLog | 8 ++++++++ cygwin/mknetrel | 14 ++++++++++++-- scm/lily.scm | 2 +- stepmake/aclocal.m4 | 6 +++--- 4 files changed, 24 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 08ed534cf7..220b2971fc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2005-04-25 Jan Nieuwenhuizen + * 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. diff --git a/cygwin/mknetrel b/cygwin/mknetrel index 41587c5b9e..919d1f446a 100644 --- a/cygwin/mknetrel +++ b/cygwin/mknetrel @@ -86,6 +86,12 @@ preconfig () { 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 @@ postconfig () { # 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 } diff --git a/scm/lily.scm b/scm/lily.scm index acc61e59fd..30e9951d3f 100644 --- a/scm/lily.scm +++ b/scm/lily.scm @@ -226,7 +226,7 @@ The syntax is the same as `define*-public'." "paper.scm" "backend-library.scm" - "x11-color.scm" + ;; "x11-color.scm" ;; must be after everything has been defined "safe-lily.scm")) diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4 index bdebdfcaee..fbd6dbc19e 100644 --- a/stepmake/aclocal.m4 +++ b/stepmake/aclocal.m4 @@ -11,7 +11,7 @@ AC_DEFUN(STEPMAKE_GET_EXECUTABLE, [ ## 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_DEFUN(STEPMAKE_KPATHSEA, [ AC_TRY_LINK([#include ], [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 -- 2.39.5