Updated

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 752465e21d6849e28ec8a83a003646feea33b7a4..93d905a970d230e2d1226d82afb186de78756bf5 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,16 @@
+2004-11-23  Sergey Poznyakoff  <gray@Mirddin.farlep.net>
+
+       * lib/getopt_.h: Re-addition of __getopt_argv_const caused
+       redefinition warnings. To avoid them, include the defines
+       in `#if !defined __need_getopt ... #endif'. The only place
+       where __getopt_argv_const is used is in definitions
+       of getopt_long and getopt_long_only below, which are as well
+       protected by `#ifndef __need_getopt'.
+       [defined __GETOPT_PREFIX && !defined __need_getopt]: Undef
+       __need_getopt after including <stdio.h> and <unistd.h> These
+       headers might have defined it.
+       
+
 2004-11-20  Paul Eggert  <eggert@cs.ucla.edu>
 
        * getopt_.h (__GETOPT_CONCAT, __GETOPT_XCONCAT, __GETOPT_ID):

diff --git a/m4/ChangeLog b/m4/ChangeLog
index 78b0f428acc4f9f9e2a8a639201b9b5e6c0e7fbd..498e3e1d6c4768845564f7ac02ca8133cebeb4f2 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,12 @@
+2004-11-23  Sergey Poznyakoff  <gray@Mirddin.farlep.net>
+
+       * argp.m4 (gl_ARGP): Require gl_GETOPT_SUBSTITUTE unconditionally:
+       argp-parse.c depends on getopt internals, that means we should
+       always use our getopt, to be on the safe side.
+       * getopt.m4 (gl_GETOPT): Check if GETOPT_H is already set, in
+       order not to spoil the result of an eventual previous invocation
+       of gl_GETOPT_SUBSTITUTE.
+
 2004-11-17  Paul Eggert  <eggert@cs.ucla.edu>
 
        * calloc.m4 (_AC_FUNC_CALLOC_IF): Check for buggy calloc implementations