From 6dcf0e943aff7b235e382dfa03d74c6e2559c224 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 14 Apr 2003 10:57:48 +0000 Subject: [PATCH] * stepmake/aclocal.m4: Include compile fix for broken flex, as used in includable-lexer.hh. * lily/includable-lexer.cc: Bugfix: include config.h. --- ChangeLog | 5 +++++ lily/includable-lexer.cc | 4 ++-- stepmake/aclocal.m4 | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b7cb5ea969..114ddd3bb3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2003-04-14 Jan Nieuwenhuizen + * 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 e22180aad5..9293970425 100644 --- a/lily/includable-lexer.cc +++ b/lily/includable-lexer.cc @@ -7,10 +7,10 @@ */ #include +#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 1abbe7cf82..eae65025b5 100644 --- 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 class yy_flex_lexer: public yyFlexLexer { -- 2.39.2