diff options
| author | Bruno Haible <bruno@clisp.org> | 2011-11-26 21:08:25 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2011-11-26 21:08:25 +0100 |
| commit | 48bf98f380eeeaebdb5475ff47bf181f62b58ec6 (patch) | |
| tree | c378e4c9912f7fa0d54e1275fbd72f9f039f78c5 /m4/unistd_h.m4 | |
| parent | 7c455adeee7e1af615a1035a87a918ef24a8e72b (diff) | |
| download | gnulib-48bf98f380eeeaebdb5475ff47bf181f62b58ec6.tar.gz | |
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.
Diffstat (limited to 'm4/unistd_h.m4')
| -rw-r--r-- | m4/unistd_h.m4 | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/m4/unistd_h.m4 b/m4/unistd_h.m4 index 57c8094e42..b4eca68552 100644 --- a/m4/unistd_h.m4 +++ b/m4/unistd_h.m4 @@ -1,4 +1,4 @@ -# unistd_h.m4 serial 61 +# unistd_h.m4 serial 62 dnl Copyright (C) 2006-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -98,7 +98,6 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS], GNULIB_SYMLINK=0; AC_SUBST([GNULIB_SYMLINK]) GNULIB_SYMLINKAT=0; AC_SUBST([GNULIB_SYMLINKAT]) GNULIB_TTYNAME_R=0; AC_SUBST([GNULIB_TTYNAME_R]) - GNULIB_UNISTD_H_GETOPT=0; AC_SUBST([GNULIB_UNISTD_H_GETOPT]) GNULIB_UNISTD_H_NONBLOCKING=0; AC_SUBST([GNULIB_UNISTD_H_NONBLOCKING]) GNULIB_UNISTD_H_SIGPIPE=0; AC_SUBST([GNULIB_UNISTD_H_SIGPIPE]) GNULIB_UNLINK=0; AC_SUBST([GNULIB_UNLINK]) |