getopt: fix compilation on darwin

* lib/getopt.in.h (includes): Leave breadcrumbs during system
include.
* lib/unistd.in.h (getopt): Use them to avoid recursive include.
Reported by Ludovic Courtès.

Signed-off-by: Eric Blake <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index e971922af5f4be52d5bd0e647f214e14dab5db51..78b33867c48ed57c5b5c14f262bc1fae73ee93ca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-10-06  Eric Blake  <ebb9@byu.net>
+
+       getopt: fix compilation on darwin
+       * lib/getopt.in.h (includes): Leave breadcrumbs during system
+       include.
+       * lib/unistd.in.h (getopt): Use them to avoid recursive include.
+       Reported by Ludovic Courtès.
+
 2009-10-06  Bruno Haible  <bruno@clisp.org>
 
        * modules/size_max (Description): Discourage its use.

diff --git a/lib/getopt.in.h b/lib/getopt.in.h
index 9de467ae98cbc76fb3c6449e4a5669ae303c721b..7377f3cfbd8fd5443ad9e854fd30129acbe01d52 100644 (file)
--- a/lib/getopt.in.h
+++ b/lib/getopt.in.h
@@ -22,9 +22,13 @@
 @PRAGMA_SYSTEM_HEADER@
 #endif
 
-/* The include_next requires a split double-inclusion guard.  */
+/* The include_next requires a split double-inclusion guard.  We must
+   also inform the replacement unistd.h to not recursively use
+   <getopt.h>; our definitions will be present soon enough.  */
 #if @HAVE_GETOPT_H@
+# define _GL_SYSTEM_GETOPT
 # @INCLUDE_NEXT@ @NEXT_GETOPT_H@
+# undef _GL_SYSTEM_GETOPT
 #endif
 
 #ifndef _GL_GETOPT_H

diff --git a/lib/unistd.in.h b/lib/unistd.in.h
index 38e2e13f702b91e4d3432fba0d4daba79aea89da..b6ea889a8b8f0677d8cbb2ebc22f4e5ca4eba691 100644 (file)
--- a/lib/unistd.in.h
+++ b/lib/unistd.in.h
@@ -49,7 +49,7 @@
 #endif
 
 /* Get getopt(), optarg, optind, opterr, optopt.  */
-#if @GNULIB_UNISTD_H_GETOPT@
+#if @GNULIB_UNISTD_H_GETOPT@ && !defined _GL_SYSTEM_GETOPT
 # include <getopt.h>
 #endif