* stepmake/aclocal.m4: Include compile fix for broken flex, as

used in includable-lexer.hh.

* lily/includable-lexer.cc: Bugfix: include config.h.

diff --git a/ChangeLog b/ChangeLog
index b7cb5ea969542c30c2e3a4ae9ed7f33962803cd2..114ddd3bb3e7d3b92582a9eedb6343b39fe398af 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2003-04-14  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * stepmake/aclocal.m4: Include compile fix for broken flex, as
+       used in includable-lexer.hh.
+
+       * lily/includable-lexer.cc: Bugfix: include config.h.
+
        * stepmake/aclocal.m4: Check for $GUILE_CONFIG; allows
         circumvention of Debian packaging bug.
 

diff --git a/lily/includable-lexer.cc b/lily/includable-lexer.cc
index e22180aad514a6828851a67671c0236d491dfc79..929397042501302787e52ec5bb1a6edf410bda3d 100644 (file)
--- a/lily/includable-lexer.cc
+++ b/lily/includable-lexer.cc
@@ -7,10 +7,10 @@
 */
 
 #include <sstream>
+#include "config.h"
 
-
-#include "file-path.hh"
 #include "includable-lexer.hh"
+#include "file-path.hh"
 #include "source-file.hh"
 #include "source.hh"
 #include "warn.hh"

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index 1abbe7cf82291b012b0de821a9bb0a2e91a89b8f..eae65025b5ff34d90f3fe1d6b11997b7e58124fc 100644 (file)
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -337,6 +337,7 @@ AC_DEFUN(STEPMAKE_FLEXLEXER, [
     AC_CACHE_CHECK([for yyFlexLexer.yy_current_buffer],
        [stepmake_flexlexer_yy_current_buffer],
        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+using namespace std;
 #include <FlexLexer.h>
 class yy_flex_lexer: public yyFlexLexer
 {