* configure.in: check for C language.

* lily/source-file.cc: include strstream without h.

* scm/documentation-generate.scm (string-append): use name without
.texi.

* autogen.sh (srcdir): suse fix.

diff --git a/ChangeLog b/ChangeLog
index 7487f2dcb529f9da53e36df51172c9a24e59bde3..fcd6ce2a6515cb897e7e0dae03efc989194fed72 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2004-03-31  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
 2004-03-31  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 

+       * configure.in: check for C language.
+
+       * lily/source-file.cc: include strstream without h.
+
+       * scm/documentation-generate.scm (string-append): use name without
+       .texi.
+
+       * autogen.sh (srcdir): suse fix.
+

        * Documentation/user/notation.itely (Ancient clefs): idem.
 
        * Documentation/user/lilypond-book.itely (Integrating HTML and music): idem.
        * Documentation/user/notation.itely (Ancient clefs): idem.
 
        * Documentation/user/lilypond-book.itely (Integrating HTML and music): idem.

diff --git a/autogen.sh b/autogen.sh
index 55560b9d937caf6bfa0045f2289270078e9992c7..6abd4cd4aa94913c51970bece0684d463b71a4b7 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -15,7 +15,7 @@ fi
 if [ ! -f autogen.sh -o stepmake/autogen.sh -nt autogen.sh ]; then
     echo "stepmake/autogen.sh is newer. Copying file." 
     cp -f stepmake/autogen.sh autogen.sh
 if [ ! -f autogen.sh -o stepmake/autogen.sh -nt autogen.sh ]; then
     echo "stepmake/autogen.sh is newer. Copying file." 
     cp -f stepmake/autogen.sh autogen.sh

-    exec ./autogen.sh
+    exec ./autogen.sh "$@"

 fi
 
 # Be paranoid: check for autoconf >= 2.50
 fi
 
 # Be paranoid: check for autoconf >= 2.50

diff --git a/configure.in b/configure.in
index 28e7d287f3664ae4b8d5108f31958cdb8f859597..1948109ea3a6b3bcdf8b9a73f47939f641bdd4be 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -36,6 +36,7 @@ STEPMAKE_LIB(REQUIRED)
 STEPMAKE_BISON(REQUIRED, 1.25)
 STEPMAKE_FLEX(REQUIRED)
 STEPMAKE_FLEXLEXER(REQUIRED)
 STEPMAKE_BISON(REQUIRED, 1.25)
 STEPMAKE_FLEX(REQUIRED)
 STEPMAKE_FLEXLEXER(REQUIRED)

+AC_LANG_C

 STEPMAKE_LOCALE
 STEPMAKE_GETTEXT
 STEPMAKE_MSGFMT(REQUIRED)
 STEPMAKE_LOCALE
 STEPMAKE_GETTEXT
 STEPMAKE_MSGFMT(REQUIRED)

diff --git a/lily/source-file.cc b/lily/source-file.cc
index 79f23214120d0658f3d9249372d3908359158d6d..108c68b6a23e9b3b2a21bb9dc50860ce3a210d5d 100644 (file)
--- a/lily/source-file.cc
+++ b/lily/source-file.cc
@@ -14,7 +14,7 @@
 #if HAVE_SSTREAM
 #include <sstream>
 #else
 #if HAVE_SSTREAM
 #include <sstream>
 #else

-#include <strstream.h>
+#include <strstream>

 #define istringstream(x) istrstream(x, length ()) 
 #endif
 
 #define istringstream(x) istrstream(x, length ()) 
 #endif
 

diff --git a/scm/documentation-generate.scm b/scm/documentation-generate.scm
index e1f8235784703d0b4a413f5ba3f4e0affa18683f..ccaa6d00ef27014fc52037961dc5142859ddf708 100644 (file)
--- a/scm/documentation-generate.scm
+++ b/scm/documentation-generate.scm
@@ -63,7 +63,8 @@
 
 (display
  (string-append
 
 (display
  (string-append

-  (texi-file-head "LilyPond program-reference" outname "(lilypond-internals.info)")
+  (texi-file-head "LilyPond program-reference" file-name
+                 "(lilypond-internals.info)")

   "
 
 @ifhtml
   "
 
 @ifhtml