X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fargp-namefrob.h;h=f10f58297bb43686e8d0f9e50877e287932cb55f;hb=4c399534696c5acbe5ecb57c40f2b5841cb8320d;hp=d95f48268c772ffdfc320f21d5fad769f0415dde;hpb=1f30af71e044521dc0440350b1afeb1354cce3ed;p=gnulib.git

diff --git a/lib/argp-namefrob.h b/lib/argp-namefrob.h
index d95f48268..f10f58297 100644
--- a/lib/argp-namefrob.h
+++ b/lib/argp-namefrob.h
@@ -76,20 +76,6 @@
 #undef __argp_fmtstream_wmargin
 #define __argp_fmtstream_wmargin argp_fmtstream_wmargin
 
-/* GNULIB makes sure both program_invocation_name and
-   program_invocation_short_name are available */
-#ifdef GNULIB_PROGRAM_INVOCATION_NAME
-extern char *program_invocation_name;
-#undef HAVE_DECL_PROGRAM_INVOCATION_NAME
-#define HAVE_DECL_PROGRAM_INVOCATION_NAME 1
-#endif
-
-#ifdef GNULIB_PROGRAM_INVOCATION_SHORT_NAME
-extern char *program_invocation_short_name;
-#undef HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME
-#define HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME 1
-#endif
-
 #include "mempcpy.h"
 #include "strcase.h"
 #include "strchrnul.h"
@@ -155,19 +141,23 @@ extern char *program_invocation_short_name;
 # define putchar_unlocked(x) putchar (x)
 # endif
 
-extern char *__argp_basename (char *name);
-
 #endif /* !_LIBC */
 
 #ifndef __set_errno
 #define __set_errno(e) (errno = (e))
 #endif
 
-char * __argp_base_name (char *name);
+#if defined GNULIB_ARGP_DISABLE_DIRNAME
+# define __argp_base_name(arg) arg
+#elif defined GNULIB_ARGP_EXTERN_BASENAME
+extern char *__argp_base_name(const char *arg);
+#else
+# include "dirname.h"
+# define __argp_base_name base_name
+#endif
 
 #if defined _LIBC || HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME
 # define __argp_short_program_name()	(program_invocation_short_name)
 #else
 extern char *__argp_short_program_name (void);
 #endif
-