Mercurial > hg > octave-lojdl > gnulib-hg
changeset 14098:25daaadfa3d0
gnulib-tool: transform include guards with `--macro-prefix'
* gnulib-tool (func_import): support multiple gllib directories:
headers are generated for each gllib differently, depending on which
features are actually used, so we need to be able to include all
these generated headers without fear that one will shadow another,
so we prepend the macro-prefix before the guard macros.
| author | Sam Steingold <sds@gnu.org> |
|---|---|
| date | Tue, 12 Oct 2010 09:01:21 +0700 |
| parents | f93a5e80c44f |
| children | 888c4683d9aa |
| files | ChangeLog gnulib-tool |
| diffstat | 2 files changed, 17 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2010-10-12 Sam Steingold <sds@gnu.org> + Gary V. Vaughan <gary@gnu.org> + + gnulib-tool: transform include guards with `--macro-prefix' + * gnulib-tool (func_import): support multiple gllib directories: + headers are generated for each gllib differently, depending on which + features are actually used, so we need to be able to include all + these generated headers without fear that one will shadow another, + so we prepend the macro-prefix before the guard macros. + 2010-10-11 Bruno Haible <bruno@clisp.org> stdlib: Allow multiple gnulib generated replacements to coexist.
--- a/gnulib-tool +++ b/gnulib-tool @@ -3847,6 +3847,9 @@ break fi done + test -n ${macro_prefix} && sed_transform_lib_file=$sed_transform_lib_file" + s/_GL_\(.*\)_H/_${macro_prefix}_GL_\1_H/g + " sed_transform_main_lib_file="$sed_transform_lib_file" if test -n "$do_copyrights"; then if test -n "$lgpl"; then @@ -3885,6 +3888,10 @@ s/version 2\(.1\)\{0,1\}\([ ,]\)/version 3\2/g ' fi + test -n ${macro_prefix} \ + && sed_transform_build_aux_file=$sed_transform_build_aux_file" + s/_GL_\(.*\)_H/_${macro_prefix}_GL_\1_H/g + " # Determine script to apply to library files that go into $testsbase/. sed_transform_testsrelated_lib_file="$sed_transform_lib_file"