Ensure that optarg etc. get declared by <unistd.h>.

diff --git a/ChangeLog b/ChangeLog
index 2e4643b..530999b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2009-08-12  Bruno Haible  <bruno@clisp.org>
 
+       Ensure that optarg etc. get declared by <unistd.h>.
+       * m4/getopt.m4 (gl_GETOPT_CHECK_HEADERS): Require
+       AC_USE_SYSTEM_EXTENSIONS.
+       * modules/getopt (Depends-on): Add 'extensions'.
+
+2009-08-12  Bruno Haible  <bruno@clisp.org>
+
        Avoid test link errors.
        * modules/pipe-filter-ii-tests (Makefile.am): Define
        test_pipe_filter_ii1_LDADD and test_pipe_filter_ii2_main_LDADD.

diff --git a/m4/getopt.m4 b/m4/getopt.m4
index 3f8597a..7fefef7 100644 (file)
--- a/m4/getopt.m4
+++ b/m4/getopt.m4
@@ -1,4 +1,4 @@
-# getopt.m4 serial 19
+# getopt.m4 serial 20
 dnl Copyright (C) 2002-2006, 2008-2009 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -41,6 +41,9 @@ AC_DEFUN([gl_GETOPT_IFELSE],
 # Determine whether to replace the entire getopt facility.
 AC_DEFUN([gl_GETOPT_CHECK_HEADERS],
 [
+  dnl Persuade Solaris <unistd.h> to declare optarg, optind, opterr, optopt.
+  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
+
   gl_replace_getopt=
   if test -z "$gl_replace_getopt"; then
     AC_CHECK_HEADERS([getopt.h], [], [gl_replace_getopt=yes])

diff --git a/modules/getopt b/modules/getopt
index 39751bf..bad6de2 100644 (file)
--- a/modules/getopt
+++ b/modules/getopt
@@ -11,6 +11,7 @@ m4/getopt.m4
 Depends-on:
 gettext-h
 unistd
+extensions
 
 configure.ac:
 gl_GETOPT