Sam Steingold wrote:
On Mon, Aug 10, 2009 at 6:26 PM, Bruno Haible<br...@clisp.org> wrote:
Sam Steingold wrote:
the bottom line is:
if I add -I build/gnulib/ to module CFLAGS, then include_next will
make build/gnulib/unistd.h supersede build/syscalls/gnulib/unistd.h,
which is no good.
if I do NOT add -I build/gnulib/ to module CFLAGS, then
regexp/gnulib/regex.c will not find build/gnulib/alloca.h
Indeed, this is still somewhat weird. The include_next should work as expected
if you massage the inclusion guard identifiers of the two unistd.h files
so that they become different: 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
