* cygwin/README.in: Update dependencies.

* stepmake/aclocal.m4 (STEPMAKE_PANGO, STEPMAKE_PANGO_FT2):
Bugfix: do not pollute CPPFLAGS, LIBS.

* cygwin/mknetrel (extras): Cross compile fixes.

diff --git a/ChangeLog b/ChangeLog
index 0da093db45e5697df89e8460d595b4aad9dbe81e..4d818691d59519957e1446487917d30c174e9db8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2005-02-26  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * cygwin/README.in: Update dependencies.
+
+       * stepmake/aclocal.m4 (STEPMAKE_PANGO, STEPMAKE_PANGO_FT2):
+       Bugfix: do not pollute CPPFLAGS, LIBS.
+
+       * cygwin/mknetrel (extras): Cross compile fixes.
+
        * ttftool/util.c: 
        * ttftool/ttfps.c: 
        * ttftool/ps.c: #include libc-extension.hh

diff --git a/config.make.in b/config.make.in
index c7e331d163cbb4dd631feaace3f12850a5b6758b..61d3d45d6c23ce80ec94f376dc360cb3b11e3a1d 100644 (file)
--- a/config.make.in
+++ b/config.make.in
@@ -7,8 +7,8 @@ MISSING_REQUIRED = @REQUIRED@
 
 package-depth = @package_depth@
 
-USER_CFLAGS = @CFLAGS@ @CPPFLAGS@ @GUILE_CFLAGS@ @PANGO_FT2_CFLAGS@ @FREETYPE2_CFLAGS@
-USER_CXXFLAGS = @CXXFLAGS@ @CPPFLAGS@ @GUILE_CFLAGS@ @PANGO_FT2_CFLAGS@ @FREETYPE2_CFLAGS@
+USER_CFLAGS = @CPPFLAGS@ @CFLAGS@ @GUILE_CFLAGS@ @PANGO_FT2_CFLAGS@ @FREETYPE2_CFLAGS@
+USER_CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ @GUILE_CFLAGS@ @PANGO_FT2_CFLAGS@ @FREETYPE2_CFLAGS@
 USER_LDFLAGS = @LDFLAGS@ @GUILE_LDFLAGS@
 EXTRA_LIBES = @EXTRA_LIBES@ @LIBS@ @PANGO_FT2_LIBS@ @FREETYPE2_LIBS@
 

diff --git a/cygwin/README.in b/cygwin/README.in
index 28dc8e41c21af78809e5fb50f905247d3b0b4994..352bdbc5ac412d62fb2de40074ecfda90a82a9fb 100644 (file)
--- a/cygwin/README.in
+++ b/cygwin/README.in
@@ -26,21 +26,26 @@ Suggested:
   gv
 
 Build requirements:
-  cygwin-1.5.11 or newer
   binutils-20040725-2 or newer
-  gcc-2.95.3-5 or newer
   bison-1.35 or newer
-  guile-devel-1.6.5-1 or newer
+  cygwin-1.5.11 or newer
   fileutils
   flex-2.5.4 or newer
+  gcc-2.95.3-5 or newer
+  glib2-devel
+  guile-devel-1.6.5-1 or newer
+  libfontconfig-devel
+  libfreetype2-devel
   libguile12-1.6.5-1 or newer
   libkpathsea3-2.0.2-15 or newer
+  pango-devel
   python
   sed
   sh-utils
   tetex-devel-2.0.2-15 or newer
   texinfo-4.7 or newer
 
+  
 Website/documentation build requirements (lilypond-doc package):
   tetex-bin
   tetex-tiny or tetex-base

diff --git a/cygwin/changelog b/cygwin/changelog
index 94234c1d71d2b57206b96addee19de1d46ded24e..ed95ab0164ee0556ed3bacf905de8ac3178911d3 100644 (file)
--- a/cygwin/changelog
+++ b/cygwin/changelog
@@ -1,3 +1,10 @@
+lilypond (2.5.12-1) unstable; urgency=low
+
+  * New upstream release.
+  * Several build fixes.
+
+ -- Jan Nieuwenhuizen <janneke@gnu.org>  Sat, 26 Feb 2005 10:02:43 +0100
+
 lilypond (2.3.22-1) unstable; urgency=low
 
   * New upstream release.

diff --git a/cygwin/mknetrel b/cygwin/mknetrel
index c2889a92cdb9a12d94b59988b0c7eedc315bca26..50e0adfbaaac6589a721e19eaa6ac3380f08c6e8 100644 (file)
--- a/cygwin/mknetrel
+++ b/cygwin/mknetrel
@@ -98,6 +98,10 @@ exit 0
 EOF
        chmod 755 i686-cygwin-guile-config
        PATH=$(pwd):$PATH
+       export PKG_CONFIG_PATH=$cygwin_root/usr/lib/pkgconfig
+       export PKG_CONFIG="pkg-config \
+--define-variable prefix=$cygwin_root \
+--define-variable includedir=$cygwin_root/usr/include" \
     fi
 }
 

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index 958b3a6e9adbd84380ff9f24c482424dbdc7a97d..4ac3545c4f39437c2c00b215ff952f590b056d20 100644 (file)
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -1117,12 +1117,15 @@ AC_DEFUN(STEPMAKE_PANGO, [
        AC_DEFINE(HAVE_PANGO16)
        PANGO_CFLAGS="$PANGO_CFLAGS $GTK2_CFLAGS"
        PANGO_LIBS="$PANGO_LIBS $GTK2_LIBS"
-       CPPFLAGS="$PANGO_CFLAGS $CPPFLAGS"
-       LIBS="$PANGO_LIBS $LIBS"
+       # Do not pollute user-CPPFLAGS with configure-CPPFLAGS
+        save_CPPFLAGS="$CPPFLAGS"
+        save_LIBS="$LIBS"
        AC_CHECK_HEADERS([pango/pangofc-fontmap.h])
        AC_CHECK_FUNCS([pango_fc_font_map_add_decoder_find_func])
        AC_SUBST(PANGO_CFLAGS)
        AC_SUBST(PANGO_LIBS)
+       CPPFLAGS="$save_CPPFLAGS"
+       LIBS="$save_LIBS"
 fi
 ])
 
@@ -1133,11 +1136,16 @@ AC_DEFUN(STEPMAKE_PANGO_FT2, [
        AC_DEFINE(HAVE_PANGO_FT2)
        PANGO_FT2_CFLAGS="$PANGO_FT2_CFLAGS $GTK2_CFLAGS"
        PANGO_FT2_LIBS="$PANGO_FT2_LIBS $GTK2_LIBS"
-       CPPFLAGS="$PANGO_FT2_CFLAGS $CPPFLAGS"
+       # Do not pollute user-CPPFLAGS with configure-CPPFLAGS
+        save_CPPFLAGS="$CPPFLAGS"
+        save_LIBS="$LIBS"
+       CPPFLAGS="$CPPFLAGS $PANGO_FT2_CFLAGS"
        LIBS="$PANGO_FT2_LIBS $LIBS"
        AC_CHECK_HEADERS([pango/pangoft2.h])
        AC_CHECK_FUNCS([pango_ft2_font_map_create_context])
        AC_SUBST(PANGO_FT2_CFLAGS)
        AC_SUBST(PANGO_FT2_LIBS)
+       CPPFLAGS="$save_CPPFLAGS"
+       LIBS="$save_LIBS"
 fi
 ])