* config.hh.in: Add HAVE_SSTREAM.

* configure.in: Add check for sstream header.

* flower/source-file.cc: Fix compatibility with older g++.  (Mats)

diff --git a/ChangeLog b/ChangeLog
index 8a03f5ed0a049153507074d960d68094e7d6eacb..802ed12ee4730a05b07e197a6093b46a2c5a274f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2002-07-10  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * config.hh.in: Add HAVE_SSTREAM.
+       
+       * configure.in: Add check for sstream header.
+
+2002-07-09  Mats Bengtsson  <matsb@s3.kth.se>
+ 
+       * flower/source-file.cc: Fix compatibility with older g++.
+ 
 2002-07-09  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * input/twinkle.ly: Bugfix: no automaticMelismata.

diff --git a/Documentation/windows/lilypond.hint b/Documentation/windows/lilypond.hint
index 2c7e7da48f9a065d1190082c8a4104458ec8a190..517c4038d660658df8ef86e6a0c3ecc39f667ced 100644 (file)
--- a/Documentation/windows/lilypond.hint
+++ b/Documentation/windows/lilypond.hint
@@ -1,6 +1,7 @@
 sdesc: "A program for printing sheet music"
 category: Publishing
-requires: ash bash libguile14 libintl2 python tetex-beta texmf-tiny
+# actually, guile needs libtool-devel 
+requires: ash bash libguile14 libintl2 libtool-devel python tetex-beta texmf-tiny
 #suggests: emacs gsview lilypond-doc rxvt xdvi texmf-base
 ldesc: "A program for printing sheet music.
 LilyPond prints beautiful sheet music.  It produces music notation

diff --git a/VERSION b/VERSION
index e9382179f87d82e40b8f17533a6dc4c27bb1c1f4..aa342fef9947520731ea0479e59c03cf6cf6e655 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=5
 PATCH_LEVEL=66
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=jcn1
 
 # Use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/config.hh.in b/config.hh.in
index 6c58034b22d7ed3c5c5cb0d1d3badbd5abd7ea0c..1c16bed76b6f7c10c7b162884a1fe66dbf93def6 100644 (file)
--- a/config.hh.in
+++ b/config.hh.in
@@ -73,6 +73,8 @@
 /* define if you have sys/stat.h */
 #define STAT_MACROS_BROKEN 0
 
+/* define if you have sstream */
+#define HAVE_SSTREAM 0
 
 /* GUILE only includes version in headers (libguile/version.h) as of
    1.5.x.  For some strange reason, they call it SCM.*VERSION. */

diff --git a/configure.in b/configure.in
index 3f9bdbef163db8962a5298c3b4f662d789bf1d89..7edb9bc87aea7051bac2afa55a0dc7238a79e3f3 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -35,8 +35,7 @@ STEPMAKE_MAKEINFO(REQUIRED)
 STEPMAKE_PYTHON_DEVEL(REQUIRED)
 
 
-# AC_HAVE_HEADERS(limits.h malloc.h string.h unistd.h values.h)
-AC_HAVE_HEADERS(assert.h sys/stat.h)
+AC_HAVE_HEADERS(assert.h sys/stat.h sstream)
 AC_HEADER_STAT
 
 AC_FUNC_MEMCMP

diff --git a/flower/source-file.cc b/flower/source-file.cc
index 6e607980fe612d1610ce4e0a855c8514ea435854..e8d55966f1753c00f0d3cf0d3e10d83d46275819 100644 (file)
--- a/flower/source-file.cc
+++ b/flower/source-file.cc
@@ -9,7 +9,12 @@
 
 
 #include <assert.h>
+#if HAVE_SSTREAM
 #include <sstream>
+#else
+#include <strstream.h>
+#define istringstream(x) istrstream(x, length_i ()) 
+#endif
 
 #include "string.hh"
 #include "flower-proto.hh"
@@ -45,7 +50,7 @@ Source_file::istream_l ()
   if (!istream_p_)
     {
       if (length_i ()) // can-t this be done without such a hack?
-       istream_p_ = new std::stringstream (ch_C ());
+       istream_p_ = new std::istringstream (ch_C ());
       else
        {
          istream_p_ = new std::istringstream ("");