getopt, argp fixes.

diff --git a/ChangeLog b/ChangeLog
index 3e595e6d711e149eaa6865867fd9bf054f0ff9ab..9dbd8585f467f67970d0382951eaba372bc33ec2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2004-08-12  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * modules/argp (Files): Add m4/unlocked-io.m4.
+       (Depends-on): Add extensions.
+
+2004-08-12  Simon Josefsson  <jas@extundo.com>
+
+       * modules/getopt (Files): Rename getopt.h to getopt_.h.
+       (Makefile.am): Rewrite, use logic from argz.
+       (Include): Use <getopt.h> instead of "getopt.h".
+
 2004-08-11  Paul Eggert  <eggert@cs.ucla.edu>
 
        * modules/obstack (Files): Add m4/inttypes_h.m4, m4/stdint_h.m4,

diff --git a/config/ChangeLog b/config/ChangeLog
index 98807860a9d5b2d89e35c81018460fc003e6e9a0..cda64db1f96b9ea821b29dc53ec477b30b6fdaf4 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-12  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * srclist.txt: Remove getopt.c, getopt.h (renamed to getopt_.h),
+       getopt1.c.
+
 2004-06-22  Paul Eggert  <eggert@cs.ucla.edu>
 
        * srclist-update: Don't insist on "USA." before the close-comment,

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 44f736a17dad85e335752c46306f5bf16734603e..251ee6ec63c6ae5302f659d3223c3ea488c9a4ca 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,25 @@
+2004-08-12  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * argp-help.c, argp-parse.c: Use "gettext.h" instead of
+       its complicated substitute.
+       * argp-help.c: Include <errno.h>, for program_invocation_short_name
+       and program_invocation_name.
+       (__argp_basename) [!_LIBC]: Remove; the only use was
+       replaced by its body.
+       (__argp_short_program_name): Change condition from
+       !defined __argp_short_program_name to
+       ! (defined _LIBC || HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME),
+       to match argp-namefrob.h.
+       (__argp_failure): Don't assume strerror_r returns char *.
+       * argp-parse.c (N_): Define unconditionally.
+       (argp_default_options): Fill out initializers with 0 to avoid
+       gcc warnings.
+       
+2004-08-12  Simon Josefsson  <jas@extundo.com>
+
+       * getopt.c, getopt1.c: Remove ELIDE_CODE hack.
+       * getopt_.h: Renamed from getopt.h.
+       
 2004-08-11  Paul Eggert  <eggert@cs.ucla.edu>
 
        Merge from coreutils.

diff --git a/m4/ChangeLog b/m4/ChangeLog
index f7fb4243cb86d5bfd6b42fcea315e1e40676799b..aaa3285b43a421ea3226cb85a017a42d56e24ecd 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,23 @@
+2004-08-12  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * argp.m4 (gl_ARGP): Do not check for argp.h or argp_parse; nobody
+       uses HAVE_ARGP_H or HAVE_ARGP_PARSE.
+       Require gl_FUNC_GLIBC_UNLOCKED_IO, gl_USE_SYSTEM_EXTENSIONS.
+       Check for program_invocation_name, program_invocation_short_name,
+       flockfile, funlockfile, features.h, _getopt_long_only_r.
+
+2004-08-12  Simon Josefsson  <jas@extundo.com>
+
+       * getopt.m4 (gl_GETOPT_SUBSTITUTE): New macro,
+       as discussed with Paul Eggert in threads rooted at
+       <http://lists.gnu.org/archive/html/bug-gnulib/2004-06/msg00039.html>
+       and
+       <http://lists.gnu.org/archive/html/bug-gnulib/2004-07/msg00001.html>.
+       Before, the test was empty, and relied on ELIDE_CODE in source
+       code.)
+       (gl_PREREQ_GETOPT): New macro.
+       (gl_GETOPT): Use them.
+
 2004-08-11  Paul Eggert  <eggert@cs.ucla.edu>
 
        Merge from coreutils.