--- /dev/null
+--- gnulib/lib/argp-help.c Sun Apr 4 16:32:34 2004
++++ lib/argp-help.c Sun May 16 13:18:15 2004
+@@ -1690,7 +1690,7 @@ void __argp_help (const struct argp *arg
+ weak_alias (__argp_help, argp_help)
+ #endif
+
+-#ifndef _LIBC
++#ifndef __argp_short_program_name
+ char *__argp_basename (char *name)
+ {
+ char *short_name = strrchr (name, '/');
--- /dev/null
+Index: lib/getopt.c
+--- gnulib/lib/getopt.c Thu Mar 11 15:04:48 2004
++++ lib/getopt.c Sun May 16 12:34:12 2004
+@@ -48,7 +48,7 @@
+ # endif
+ #endif
+
+-#ifndef ELIDE_CODE
++#if defined WANT_INCLUDED_GETOPT || !defined ELIDE_CODE
+
+
+ /* This needs to come after some library #include
+Index: lib/getopt1.c
+--- gnulib/lib/getopt1.c Tue Mar 9 21:42:23 2004
++++ lib/getopt1.c Sun May 16 12:34:36 2004
+@@ -46,7 +46,7 @@
+ #endif
+ #endif
+
+-#ifndef ELIDE_CODE
++#if defined WANT_INCLUDED_GETOPT || !defined ELIDE_CODE
+
+
+ /* This needs to come after some library #include