Mercurial > hg > octave-nkf
diff libinterp/parse-tree/module.mk @ 19268:429ed2f2e8c6
allow building with old versions of bison again (bug #43023)
* libinterp/parse-tree/module.mk: Handle brace style for Bison's api
prefix declaration.
* acinclude.m4 (OCTAVE_PROG_BISON): Don't rely solely on Bison's exit
status. Handle braces for the api.prefix declaration. Improve
warning message.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 10 Sep 2014 11:23:37 -0400 |
| parents | fe505ff21d5b |
| children | 5bc7d059344d |
line wrap: on
line diff
--- a/libinterp/parse-tree/module.mk +++ b/libinterp/parse-tree/module.mk @@ -91,8 +91,22 @@ parse-tree/oct-parse.yy: parse-tree/oct-parse.in.yy case "$(BISON_API_PREFIX_DECL_STYLE)" in \ - *api*) api_prefix_decl='%define api.prefix "octave_"'; ;; \ - *name*) api_prefix_decl='%name-prefix="octave_"'; ;; \ + *api*) \ + case "$(BISON_API_PREFIX_DECL_STYLE)" in \ + *brace*) \ + api_prefix_decl='%define api.prefix {octave_}'; ;; \ + *) \ + api_prefix_decl='%define api.prefix "octave_"'; ;; \ + esac; \ + ;; \ + *name*) \ + case "$(BISON_API_PREFIX_DECL_STYLE)" in \ + *brace*) \ + api_prefix_decl='%name-prefix {octave_}'; ;; \ + *) \ + api_prefix_decl='%name-prefix="octave_"'; ;; \ + esac; \ + ;; \ esac; \ case "$(BISON_PUSH_PULL_DECL_STYLE)" in \ *quote*) quote='"' ;; \