1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
|
https://github.com/ppp-project/ppp/pull/479
From c73498fad415d99aa566b11256938272e62b22dd Mon Sep 17 00:00:00 2001
From: Mike Gilbert <floppym@gentoo.org>
Date: Tue, 5 Mar 2024 14:41:10 -0500
Subject: [PATCH] Use pkg-config to detect PAM when possible
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
---
m4/ax_check_pam.m4 | 50 ++++++++++++++++++++--------------------------
1 file changed, 22 insertions(+), 28 deletions(-)
diff --git a/m4/ax_check_pam.m4 b/m4/ax_check_pam.m4
index b17a7573c..7ebd79b61 100644
--- a/m4/ax_check_pam.m4
+++ b/m4/ax_check_pam.m4
@@ -26,34 +26,28 @@
AC_DEFUN([AX_CHECK_PAM], [
AC_ARG_WITH([pam],
[AS_HELP_STRING([--with-pam=DIR],
- [With libpam support, see ftp.redhat.com:/pub/pam])],
- [
- case "$withval" in
- "" | y | ye | yes)
- pamdirs="/usr/local /usr/lib /usr"
- ;;
- n | no)
- with_pam="no"
- ;;
- *)
- pamdirs="$withval"
- ;;
- esac
- ])
+ [With libpam support, see ftp.redhat.com:/pub/pam])])
- if [ test "x${with_pam}" != "xno" ] ; then
- PAM_LIBS="-lpam"
- for pamdir in $pamdirs; do
- AC_MSG_CHECKING([for pam_appl.h in $pamdir])
- if test -f "$pamdir/include/security/pam_appl.h"; then
- PAM_CFLAGS="-I$pamdir/include"
- PAM_LDFLAGS="-L$pamdir/lib"
- AC_MSG_RESULT([yes])
- break
- else
- AC_MSG_RESULT([no])
- fi
- done
+ AS_IF([test "$with_pam" != "no"], [
+ AS_CASE(["$with_pam"],
+ [""|yes], [PKG_CHECK_MODULES([PAM], [pam], [pamdirs=],
+ [pamdirs="/usr/local /usr/lib /usr"])],
+ [pamdirs="$with_pam"])
+
+ AS_IF([test -n "$pamdirs"], [
+ PAM_LIBS="-lpam"
+ for pamdir in $pamdirs; do
+ AC_MSG_CHECKING([for pam_appl.h in $pamdir])
+ if test -f "$pamdir/include/security/pam_appl.h"; then
+ PAM_CFLAGS="-I$pamdir/include"
+ PAM_LDFLAGS="-L$pamdir/lib"
+ AC_MSG_RESULT([yes])
+ break
+ else
+ AC_MSG_RESULT([no])
+ fi
+ done
+ ])
# try the preprocessor and linker with our new flags,
# being careful not to pollute the global LIBS, LDFLAGS, and CPPFLAGS
@@ -87,7 +81,7 @@ AC_DEFUN([AX_CHECK_PAM], [
AC_SUBST([PAM_CFLAGS])
AC_SUBST([PAM_LIBS])
AC_SUBST([PAM_LDFLAGS])
- fi
+ ])
AM_CONDITIONAL(WITH_LIBPAM, test "x${with_pam}" != "xno")
])
|
