Merge branch 'master' of ssh://kainhofer@git.sv.gnu.org/srv/git/lilypond into dev...

diff --git a/Documentation/user/install.itely b/Documentation/user/install.itely
index 854dc502c8a8046f0ab3ceebb07ad7157489ab91..277aaa0e6d2b56e1b09051465ea8c50e23821b21 100644 (file)
--- a/Documentation/user/install.itely
+++ b/Documentation/user/install.itely
@@ -132,8 +132,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 4.x 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://www.python.org,Python} (version 2.4 or newer)
 

diff --git a/configure.in b/configure.in
index 90ffacba6ec8e33aea5b5dfed17487568f5c4913..b7475b7ba96d74bccb794b0f96d4e3c9869da85a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -85,10 +85,10 @@ AC_MSG_RESULT($NCSB_SOURCE_FILES)
 
 
 STEPMAKE_PYTHON(REQUIRED, 2.4)
-STEPMAKE_GCC(REQUIRED, 4.0)
+STEPMAKE_GCC(REQUIRED, 3.4)
 
 STEPMAKE_CXX(REQUIRED)
-STEPMAKE_GXX(REQUIRED, 4.0)
+STEPMAKE_GXX(REQUIRED, 3.4)
 STEPMAKE_CXXTEMPLATE
 STEPMAKE_STL_DATA_METHOD
 STEPMAKE_LIB(REQUIRED)

diff --git a/lily/source-file.cc b/lily/source-file.cc
index 90bc5fcabde4a01ecfd8d0e6a55e09d8aa1621f5..7667b2f810d21973e8ed757522ddf06bb3cbe794 100644 (file)
--- a/lily/source-file.cc
+++ b/lily/source-file.cc
@@ -7,15 +7,20 @@
   Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
+#if GCC_MAJOR < 4
+#define _GLIBCXX_HAVE_MBSTATE_T
+#include <wchar.h>
+#endif /* GCC_MAJOR < 4 */
+
 #include "source-file.hh"
 
 #include "config.hh"
 
 #if HAVE_UTF8_WCHAR_H
 #include <utf8/wchar.h>  /* mbrtowc */
-#else
+#else /* !HAVE_UTF8_WCHAR_H */
 #include <cwchar> /* mbrtowc */
-#endif
+#endif /* HAVE_UTF8_WCHAR_H */
 
 #include <cstdio>