* 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.

diff --git a/ChangeLog b/ChangeLog
index 08ed534cf731b73af68654736ae7fed927d87595..220b2971fc603b5ca11a96b888c3f54a7dd4b47d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2005-04-25  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * 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 41587c5b9e1c6f2436c7cd2a58ac3884342790a9..919d1f446a3b99c44f7db0c5556e867af48a344a 100644 (file)
--- 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 acc61e59fd254c13025dcf5e5fb654c42a3d75e1..30e9951d3f220a19375d743463a7db46b9412d69 100644 (file)
--- 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 bdebdfcaee8b879e14633bba411cfe2004c5ba49..fbd6dbc19ec0aaa0662f50218c1ed08cc0f800a7 100644 (file)
--- 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 <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