From: Sam Steingold Date: Tue, 12 Oct 2010 02:01:21 +0000 (+0700) Subject: gnulib-tool: transform include guards with `--macro-prefix' X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=6ed3edf4d9eff87bb161ef549fffbce6ee1c3b18;p=gnulib.git 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. --- diff --git a/ChangeLog b/ChangeLog index 25790a619d..8b0f6a51fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2010-10-12 Sam Steingold + Gary V. Vaughan + + 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 stdlib: Allow multiple gnulib generated replacements to coexist. diff --git a/gnulib-tool b/gnulib-tool index 0e1694d76f..f43b7addb3 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -3847,6 +3847,9 @@ s,^\(.................................................[^ ]*\) *, 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,^\(.................................................[^ ]*\) *, 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"