Sam Steingold wrote: > >> On one of these, do a > >> sed -e s/_GL_UNISTD_H/_GL_UNISTD_H_2/ > > > > 2. you can use the --macro-prefix gnulib-too argument to augment the guards. > > i.e., whenever you generate a header, modify the guards according to the > > prefix. > > diff --git a/gnulib-tool b/gnulib-tool > index ea451ec..de264d8 100755 > --- a/gnulib-tool > +++ b/gnulib-tool > @@ -2846,6 +2846,9 @@ s,^\(.................................................[^ > ]*\) *, > break > fi > done > + test -n ${macro_prefix} && sed_transform_lib_file=$sed_transform_lib_file" > + s/_GL_/_${macro_prefix}_GL_/g > + " > sed_transform_main_lib_file="$sed_transform_lib_file" > if test -n "$do_copyrights"; then > if test -n "$lgpl"; then
Yes, this is the idea. But I would not like it to apply it in general, because it has lots of possible side effects / damage. Just do a $ grep 'defined _GL_' lib/*.h to see how often these _GL_* symbols are used elsewhere. Therefore for now, this change is better limited to your project. Bruno