Fix conflict between two instantiations of module 'unistd'.
authorBruno Haible <bruno@clisp.org>
Sat, 26 Nov 2011 20:08:25 +0000 (21:08 +0100)
committerBruno Haible <bruno@clisp.org>
Sat, 26 Nov 2011 20:08:25 +0000 (21:08 +0100)
commit48bf98f380eeeaebdb5475ff47bf181f62b58ec6
treec378e4c9912f7fa0d54e1275fbd72f9f039f78c5
parent7c455adeee7e1af615a1035a87a918ef24a8e72b
Fix conflict between two instantiations of module 'unistd'.

* gnulib-tool (func_emit_autoconf_snippet): Substitute
${include_guard_prefix} also in the autoconf snippet.
* m4/getopt.m4 (gl_FUNC_GETOPT_POSIX): Don't set GNULIB_UNISTD_H_GETOPT.
* m4/unistd_h.m4 (gl_UNISTD_H_DEFAULTS): Don't initialize
GNULIB_UNISTD_H_GETOPT.
* modules/getopt-posix (configure.ac): Set the
GNULIB_${gl_include_guard_prefix}_UNISTD_H_GETOPT variable.
* modules/getopt-gnu (configure.ac): Likewise.
* modules/unistd (Makefile.am): Change the substitution value of
GNULIB_UNISTD_H_GETOPT to depend on the include guard prefix.
Reported by Simon Josefsson.
ChangeLog
gnulib-tool
m4/getopt.m4
m4/unistd_h.m4
modules/getopt-gnu
modules/getopt-posix
modules/unistd