From 25beb8d01bf6deb04a0a558d2870fe60d81493ac Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Fri, 18 Apr 2008 10:44:12 +0200
Subject: [PATCH] Relax gcc/g++ version requirement to 3.4.

Enables GUB building for Cygwin with 3.4.  Using gcc 4.x is recommended.
---
 Documentation/user/install.itely | 4 ++--
 configure.in                     | 4 ++--
 lily/source-file.cc              | 9 +++++++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/Documentation/user/install.itely b/Documentation/user/install.itely
index 854dc502c8..277aaa0e6d 100644
--- 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 b9413d122e..38a7957081 100644
--- 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 90bc5fcabd..7667b2f810 100644
--- 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>
 
-- 
2.39.2