diff options
author | Bruno Haible <bruno@clisp.org> | 2022-01-03 16:34:39 +0100 |
---|---|---|
committer | Bruno Haible <bruno@clisp.org> | 2022-01-03 16:34:39 +0100 |
commit | 11d41f8739f2c4ea375e785682935b11f0ab1967 (patch) | |
tree | da9b33797cdcd26f1414561a3731f420a4e35bc7 /modules | |
parent | a690f1be8debcbe5d5265915233d533a7f9dcbaf (diff) | |
download | gnulib-11d41f8739f2c4ea375e785682935b11f0ab1967.tar.gz |
getpass-gnu: Allow use as dependency from test modules.
* m4/getpass.m4 (gl_FUNC_GETPASS_GNU): Set
REPLACE_GETPASS_FOR_GETPASS_GNU instead of REPLACE_GETPASS.
* m4/unistd_h.m4 (gl_UNISTD_H_REQUIRE_DEFAULTS): Initialize the
getpass-gnu module indicator.
(gl_UNISTD_H_DEFAULTS): Initialize REPLACE_GETPASS_FOR_GETPASS_GNU.
* modules/unistd (Makefile.am): Substitute GNULIB_GETPASS_GNU,
REPLACE_GETPASS_FOR_GETPASS_GNU.
* modules/getpass-gnu (configure.ac): Test
REPLACE_GETPASS_FOR_GETPASS_GNU instead of REPLACE_GETPASS. Set a module
indicator.
* lib/unistd.in.h (getpass): Test REPLACE_GETPASS,
REPLACE_GETPASS_FOR_GETPASS_GNU, and the respective module indicators
instead of just REPLACE_GETPASS.
Diffstat (limited to 'modules')
-rw-r--r-- | modules/getpass-gnu | 4 | ||||
-rw-r--r-- | modules/unistd | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/modules/getpass-gnu b/modules/getpass-gnu index 2c9f76e3ff..d968af7e33 100644 --- a/modules/getpass-gnu +++ b/modules/getpass-gnu @@ -11,11 +11,11 @@ getpass configure.ac: gl_FUNC_GETPASS_GNU -if test $HAVE_GETPASS = 0 || test $REPLACE_GETPASS = 1; then +if test $HAVE_GETPASS = 0 || test $REPLACE_GETPASS_FOR_GETPASS_GNU = 1; then AC_LIBOBJ([getpass]) gl_PREREQ_GETPASS fi -gl_UNISTD_MODULE_INDICATOR([getpass]) +gl_UNISTD_MODULE_INDICATOR([getpass-gnu]) Makefile.am: diff --git a/modules/unistd b/modules/unistd index faec2da651..326bae0e48 100644 --- a/modules/unistd +++ b/modules/unistd @@ -74,6 +74,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's/@''GNULIB_GETOPT_POSIX''@/$(GNULIB_GETOPT_POSIX)/g' \ -e 's/@''GNULIB_GETPAGESIZE''@/$(GNULIB_GETPAGESIZE)/g' \ -e 's/@''GNULIB_GETPASS''@/$(GNULIB_GETPASS)/g' \ + -e 's/@''GNULIB_GETPASS_GNU''@/$(GNULIB_GETPASS_GNU)/g' \ -e 's/@''GNULIB_GETUSERSHELL''@/$(GNULIB_GETUSERSHELL)/g' \ -e 's/@''GNULIB_GROUP_MEMBER''@/$(GNULIB_GROUP_MEMBER)/g' \ -e 's/@''GNULIB_ISATTY''@/$(GNULIB_ISATTY)/g' \ @@ -194,6 +195,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \ -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \ -e 's|@''REPLACE_GETPASS''@|$(REPLACE_GETPASS)|g' \ + -e 's|@''REPLACE_GETPASS_FOR_GETPASS_GNU''@|$(REPLACE_GETPASS_FOR_GETPASS_GNU)|g' \ -e 's|@''REPLACE_ISATTY''@|$(REPLACE_ISATTY)|g' \ -e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \ -e 's|@''REPLACE_LINK''@|$(REPLACE_LINK)|g' \ |