Base getprogname() on program_invocation_short_name presence instead of glibc

diff --git a/configure.ac b/configure.ac
index 0304f578c7b9285ef1f28f3b43fee15238b21a65..54da1017634c6a63fc924e4262144c8333319f51 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -45,6 +45,15 @@ AC_CHECK_DECL([F_CLOSEM],
                #include <fcntl.h>])
 
 # Checks for library functions.
+AC_MSG_CHECKING([for program_invocation_short_name])
+AC_LINK_IFELSE(
+       [AC_LANG_PROGRAM([[#include <errno.h>]],
+                        [[const char *p = program_invocation_short_name;]])],
+       [AC_DEFINE([HAVE_PROGRAM_INVOCATION_SHORT_NAME], [1],
+                  [Define to 1 if you have program_invocation_short_name])
+        AC_MSG_RESULT([yes])],
+       [AC_MSG_RESULT([no])])
+
 AC_MSG_CHECKING([for __progname])
 AC_LINK_IFELSE(
        [AC_LANG_PROGRAM([[]],

diff --git a/src/progname.c b/src/progname.c
index 4d0fee7e48853e91bfb973f8165a90afe601c1d0..9bc5e4b77b8165fd3a6519825f581fe28ce688eb 100644 (file)
--- a/src/progname.c
+++ b/src/progname.c
@@ -42,7 +42,7 @@ static const char *__progname = NULL;
 const char *
 getprogname(void)
 {
-#ifdef __GLIBC__
+#if defined(HAVE_PROGRAM_INVOCATION_SHORT_NAME)
        if (__progname == NULL)
                __progname = program_invocation_short_name;
 #elif defined(HAVE_GETEXECNAME)