diff options
| author | Bruno Haible <bruno@clisp.org> | 2023-04-13 21:25:59 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2023-04-13 21:25:59 +0200 |
| commit | a194861e540c2e278c716022f4ca4103710d1d8f (patch) | |
| tree | 26c273614ea96099dadae14b1da94a58f1126da7 /m4 | |
| parent | c5a9b3eaf8d48c19bf39fbcc7bf0d930d988efed (diff) | |
| download | gnulib-a194861e540c2e278c716022f4ca4103710d1d8f.tar.gz | |
getprogname: Avoid using HAVE_* macros in *.in.h files.
* m4/stdlib_h.m4 (gl_STDLIB_H_DEFAULTS): Initialize
HAVE_DECL_PROGRAM_INVOCATION_NAME.
* m4/getprogname.m4 (gl_FUNC_GETPROGNAME): Require gl_STDLIB_H_DEFAULTS
and gl_USE_SYSTEM_EXTENSIONS. Set HAVE_DECL_PROGRAM_INVOCATION_NAME.
* modules/stdlib (Makefile.am): Substitute
HAVE_DECL_PROGRAM_INVOCATION_NAME.
* lib/stdlib.in.h (getprogname): Test HAVE_DECL_PROGRAM_INVOCATION_NAME
as an Autoconf variable.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/getprogname.m4 | 8 | ||||
| -rw-r--r-- | m4/stdlib_h.m4 | 3 |
2 files changed, 9 insertions, 2 deletions
diff --git a/m4/getprogname.m4 b/m4/getprogname.m4 index b8636e143a..2b741f5083 100644 --- a/m4/getprogname.m4 +++ b/m4/getprogname.m4 @@ -5,10 +5,12 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 7 +# serial 8 AC_DEFUN([gl_FUNC_GETPROGNAME], [ + AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) + AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) gl_CHECK_FUNCS_ANDROID([getprogname], [[#include <stdlib.h>]]) if test $ac_cv_func_getprogname = no; then HAVE_GETPROGNAME=0 @@ -16,6 +18,10 @@ AC_DEFUN([gl_FUNC_GETPROGNAME], future*) REPLACE_GETPROGNAME=1 ;; esac fi + AC_CHECK_DECLS([program_invocation_name], + [], + [HAVE_DECL_PROGRAM_INVOCATION_NAME=0], + [[#include <errno.h>]]) ]) AC_DEFUN([gl_PREREQ_GETPROGNAME], diff --git a/m4/stdlib_h.m4 b/m4/stdlib_h.m4 index cef133e051..3274ea4948 100644 --- a/m4/stdlib_h.m4 +++ b/m4/stdlib_h.m4 @@ -1,4 +1,4 @@ -# stdlib_h.m4 serial 73 +# stdlib_h.m4 serial 74 dnl Copyright (C) 2007-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -175,6 +175,7 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS], HAVE_DECL_FCVT=1; AC_SUBST([HAVE_DECL_FCVT]) HAVE_DECL_GCVT=1; AC_SUBST([HAVE_DECL_GCVT]) HAVE_DECL_GETLOADAVG=1; AC_SUBST([HAVE_DECL_GETLOADAVG]) + HAVE_DECL_PROGRAM_INVOCATION_NAME=1; AC_SUBST([HAVE_DECL_PROGRAM_INVOCATION_NAME]) HAVE_GETPROGNAME=1; AC_SUBST([HAVE_GETPROGNAME]) HAVE_GETSUBOPT=1; AC_SUBST([HAVE_GETSUBOPT]) HAVE_GRANTPT=1; AC_SUBST([HAVE_GRANTPT]) |