Here's a patch to update the following requirements:
* New running requirements:
- guile 1.8.2
- ghostscript 8.60
* New compiling requirements:
- GCC 4.0
This is based on Graham's recommendation here:
http://n2.nabble.com/CG-chapter-3-first-draft-td4418540.html#a4420899
Okay to push?
- Mark
From 4c65920c3a6d32c9538e81407d68ea9f87c45a95 Mon Sep 17 00:00:00 2001
From: Mark Polesky <markpole...@yahoo.com>
Date: Wed, 20 Jan 2010 19:04:12 -0800
Subject: [PATCH] Update program requirements.
* New running requirements:
- guile 1.8.2
- ghostscript 8.60
* New compiling requirements:
- GCC 4.0
---
Documentation/contributor/basic-compile.itexi | 16 ++++++----------
configure.in | 14 ++++++--------
2 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/Documentation/contributor/basic-compile.itexi b/Documentation/contributor/basic-compile.itexi
index 17b4f31..f4f2240 100644
--- a/Documentation/contributor/basic-compile.itexi
+++ b/Documentation/contributor/basic-compile.itexi
@@ -97,8 +97,8 @@ install guile-devel or guile-dev or libguile-dev too.
@item @uref{ftp://ftp.gnu.org/gnu/texinfo/,Texinfo} (version 4.11 or newer).
-...@item @uref{http://gcc.gnu.org/, The GNU c++ compiler} (version 3.4 or
-newer. 4.x is strongly recommended).
+...@item @uref{http://gcc.gnu.org/, The GNU Compiler Collection}
+(version 4.0 or newer).
@item @uref{http://www.python.org,Python} (version 2.4 or newer)
@@ -129,11 +129,10 @@ Running LilyPond requires proper installation of the following software
@item @uref{http://fontconfig.org/,FontConfig} (version 2.2 or newer).
@item @uref{http://www.pango.org/,Pango} (version 1.12 or newer).
@item @uref{http://www.gnu.org/software/guile/guile.html,GUILE}
-(version 1.8.2 or newer), or patch 1.8.1 with
-...@uref{http://lilypond.org/vc/gub.darcs/patches/guile-1.8-rational.patch}.
+(version 1.8.2 or newer)
@item @uref{http://www.python.org,Python} (version 2.4 or newer).
-...@item @uref{http://www.ghostscript.com,Ghostscript} (version 8.15 or
-newer. 8.60 recommended)
+...@item @uref{http://www.ghostscript.com,Ghostscript} (version 8.60 or
+newer).
@item Dejaview. (This is normally installed by default)
@end itemize
@@ -153,10 +152,7 @@ additional tools and packages:
@item ImageMagick
@item International fonts (see input/regression/utf-8.ly for hints
about which font packages are necessary for your platform)
-...@item Ghostscript 8.60 or newer, or 8.50 with the patch from
-...@uref{http://bugs.ghostscript.com/show_bug.cgi?id=688154}
-and the patch from
-...@uref{http://bugs.ghostscript.com/show_bug.cgi?id=688017}.
+...@item Ghostscript 8.60 or newer
@item @uref{http://www.nongnu.org/texi2html/,Texi2HTML} 1.82
@item rsync
@end itemize
diff --git a/configure.in b/configure.in
index 6253b66..f0aea5f 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
dnl configure.in -*-shell-script-*-
-dnl Process this file with autoconf to produce a configure script.
+dnl Process this file with autoconf to produce a configure script.
# Bootstrap the init proces.
AC_INIT
@@ -90,10 +90,10 @@ AC_MSG_RESULT($NCSB_SOURCE_FILES)
STEPMAKE_PYTHON(REQUIRED, 2.4)
-STEPMAKE_GCC(REQUIRED, 3.4)
+STEPMAKE_GCC(REQUIRED, 4.0)
STEPMAKE_CXX(REQUIRED)
-STEPMAKE_GXX(REQUIRED, 3.4)
+STEPMAKE_GXX(REQUIRED, 4.0)
STEPMAKE_CXXTEMPLATE
STEPMAKE_STL_DATA_METHOD
STEPMAKE_LIB(REQUIRED)
@@ -110,9 +110,7 @@ STEPMAKE_GETTEXT
STEPMAKE_MSGFMT(REQUIRED)
STEPMAKE_TEXMF(REQUIRED)
STEPMAKE_TEXMF_DIRS
-
-## should check for 1.8.2 ?
-STEPMAKE_GUILE_DEVEL(REQUIRED, 1.8.0)
+STEPMAKE_GUILE_DEVEL(REQUIRED, 1.8.2)
## check rational bugfix.
@@ -122,7 +120,7 @@ AC_MSG_CHECKING(GUILE rational bugfix)
AC_TRY_CPP(
#include <libguile.h>
#ifdef SCM_FRACTION_REDUCED_BIT
-#error
+#error
#endif
,
AC_MSG_RESULT(ok),
@@ -133,7 +131,7 @@ CPPFLAGS="$save_CPPFLAGS"
STEPMAKE_PYTHON_DEVEL(REQUIRED)
-STEPMAKE_PATH_PROG(GHOSTSCRIPT, gs, OPTIONAL, 8.15)
+STEPMAKE_PATH_PROG(GHOSTSCRIPT, gs, OPTIONAL, 8.60)
STEPMAKE_PATH_PROG(FONTFORGE, fontforge, REQUIRED, 20050624)
--
1.6.3.3
_______________________________________________
lilypond-devel mailing list
lilypond-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-devel
