(__argp_basename): Removed definition. Was a typo.

(__argp_base_name): Provide macro definition or extern declaration
depending on the configuration

diff --git a/lib/argp-namefrob.h b/lib/argp-namefrob.h
index 98c57a70b7332157b69d2cc65f9c53f7f4f55c18..d7b991518d407cb607affe6a0f9bd8f51fd1493e 100644 (file)
--- a/lib/argp-namefrob.h
+++ b/lib/argp-namefrob.h
@@ -141,14 +141,21 @@
 # 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
 
+#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