]> git.ozlabs.org Git - ppp.git/commitdiff
pppd: Use a compile test to detect crypt.h (#198)
authorSamuel Thibault <samuel.thibault@ens-lyon.org>
Thu, 31 Dec 2020 05:35:24 +0000 (06:35 +0100)
committerGitHub <noreply@github.com>
Thu, 31 Dec 2020 05:35:24 +0000 (16:35 +1100)
ppp checks header for existence of crypt.h looking it up in /usr/include.
That's incompatible with non-glibcs or a glibc with multiarch headers
(https://bugs.debian.org/798955). This patch replaces the file existence
test with a compile test.

Reviewed-by: Chris Boot <bootc@debian.org>
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Co-authored-by: Helmut Grohne <helmut@subdivi.de>
pppd/Makefile.linux

index a971ff34b33d7506865912f75acbe26d5bb18614..a6348ebf8117b814f16eabd2385d0c555b16068c 100644 (file)
@@ -140,7 +140,7 @@ CFLAGS   += -DHAS_SHADOW
 #LIBS     += -lshadow $(LIBS)
 endif
 
-ifneq ($(wildcard $(shell $(CC) --print-sysroot)/usr/include/crypt.h),)
+ifeq ($(shell echo '\#include <crypt.h>' | $(CC) -E - >/dev/null 2>&1 && echo yes),yes)
 CFLAGS  += -DHAVE_CRYPT_H=1
 LIBS   += -lcrypt
 endif