summaryrefslogtreecommitdiff
path: root/config.make.in
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2019-09-01 17:25:49 +0200
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2019-09-01 18:04:32 +0200
commit670a1ff8f97962efd6b27436b50fc51b62683c25 (patch)
tree11139ff0e3aa9eb48bc9af2aa48afaa05ad03b0b /config.make.in
parent1186cf1d97d62105aa0f63cd3fce49f124e4e4c4 (diff)
Fix password checking with as-needed linking
Newer gcc toolchains tend to enable as-needed by default, so runtime detection of libcrypt will fail. We can just explicitly link against libcrypt anyway. * configure.ac: Check for `crypt()' in libcrypt. * config.make.in: Substitute HAVE_LIBCRYPT. * libshouldbeinlibc/idvec-verify.c: Include <crypt.h> only when libcrypt is available. Replace weak reference with explicit call and fallback macro. * utils/x.c: Likewise. * libshouldbeinlibc/Makefile (LDLIBS): Add -lcrypt when libcrypt is available.
Diffstat (limited to 'config.make.in')
-rw-r--r--config.make.in3
1 files changed, 3 insertions, 0 deletions
diff --git a/config.make.in b/config.make.in
index 7b62e851..28d4501e 100644
--- a/config.make.in
+++ b/config.make.in
@@ -96,6 +96,9 @@ libblkid_LIBS = @libblkid_LIBS@
# Whether Sun RPC support is available.
HAVE_SUN_RPC = @HAVE_SUN_RPC@
+# Whether we found libcrypt.
+HAVE_LIBCRYPT = @HAVE_LIBCRYPT@
+
# Whether we found libgcrypt.
HAVE_LIBGCRYPT = @HAVE_LIBGCRYPT@