Avoid compilation error in libgettextpo directory on Solaris 8.

diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog
index c691c889bf77c96c6a0a8d12e4367b49a5e51756..c44a7ff2c5c062ace20a0d36b33f7205e68db3a1 100644 (file)
--- a/gnulib-local/ChangeLog
+++ b/gnulib-local/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-09  Bruno Haible  <bruno@clisp.org>
+
+       Avoid compilation error in libgettextpo directory on Solaris 8.
+       * lib/unistd.in.h.diff: New file.
+       * Makefile.am (EXTRA_DIST): Add it.
+
 2010-03-28  Bruno Haible  <bruno@clisp.org>
 
        * modules/closeout (Depends-on): Add stdlib, remove exit.

diff --git a/gnulib-local/Makefile.am b/gnulib-local/Makefile.am
index 28ac7428634b48f8332c348d73603cf74591de53..a46d7b3db354a63b63ed8adf599b8265a11f3baa 100644 (file)
--- a/gnulib-local/Makefile.am
+++ b/gnulib-local/Makefile.am
@@ -232,6 +232,7 @@ lib/termcap.h \
 lib/terminfo.h \
 lib/tparm.c \
 lib/tputs.c \
+lib/unistd.in.h.diff \
 lib/xalloc.h \
 lib/xerror.c \
 lib/xerror.h \

diff --git a/gnulib-local/lib/unistd.in.h.diff b/gnulib-local/lib/unistd.in.h.diff
new file mode 100644 (file)
index 0000000..db12e64
--- /dev/null
+++ b/gnulib-local/lib/unistd.in.h.diff
@@ -0,0 +1,15 @@
+--- unistd.in.h.orig   2010-05-09 02:37:27.000000000 +0200
++++ unistd.in.h        2010-05-09 10:51:25.000000000 +0200
+@@ -93,7 +93,11 @@
+ 
+ /* Get getopt(), optarg, optind, opterr, optopt.
+    But avoid namespace pollution on glibc systems.  */
+-#if @GNULIB_UNISTD_H_GETOPT@ && !defined __GLIBC__ && !defined _GL_SYSTEM_GETOPT
++/* Also, don't include <getopt.h> inside libgettextpo, because we use
++   the getopt module only in gettext-tools/gnulib-lib/, not in
++   gettext-tools/libgettextpo/, but there is only a single
++   GNULIB_UNISTD_H_GETOPT variable for both.  */
++#if @GNULIB_UNISTD_H_GETOPT@ && !defined GTPO_CONFIG_H && !defined __GLIBC__ && !defined _GL_SYSTEM_GETOPT
+ # include <getopt.h>
+ #endif
+