diff options
| author | Lukas Slebodnik <lslebodn@redhat.com> | 2014-05-27 22:44:17 +0200 |
|---|---|---|
| committer | Jakub Hrozek <jhrozek@redhat.com> | 2014-06-03 13:52:35 +0200 |
| commit | af6ac75f077a1bc3a389560db96ca1f04a94a8d6 (patch) | |
| tree | 675148f7e914be6b0ddde2f490700511a8d43e8e | |
| parent | 5791844745bf8d9568b6bd11c4f078b8db8c7986 (diff) | |
| download | sssd-af6ac75f077a1bc3a389560db96ca1f04a94a8d6.tar.gz sssd-af6ac75f077a1bc3a389560db96ca1f04a94a8d6.tar.xz sssd-af6ac75f077a1bc3a389560db96ca1f04a94a8d6.zip | |
CONFIGURE: Enhance detection of pam
Reviewed-by: Sumit Bose <sbose@redhat.com>
(cherry picked from commit d2d21d45a88d0869f860e215c2cf946f032818ca)
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | src/external/pam.m4 | 18 |
2 files changed, 18 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 9c7fd0485..83ba673da 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1652,7 +1652,7 @@ noinst_PROGRAMS += autofs_test_client endif pam_test_client_SOURCES = src/sss_client/pam_test_client.c -pam_test_client_LDADD = -lpam -lpam_misc +pam_test_client_LDADD = $(PAM_LIBS) $(PAM_MISC_LIBS) if BUILD_AUTOFS autofs_test_client_SOURCES = \ @@ -1699,7 +1699,7 @@ pam_sss_la_SOURCES = \ pam_sss_la_LIBADD = \ $(CLIENT_LIBS) \ - -lpam + $(PAM_LIBS) pam_sss_la_LDFLAGS = \ -module \ -avoid-version \ diff --git a/src/external/pam.m4 b/src/external/pam.m4 index 40c8fd0dc..90f89bee3 100644 --- a/src/external/pam.m4 +++ b/src/external/pam.m4 @@ -1,6 +1,20 @@ AC_SUBST(PAM_LIBS) +AC_SUBST(PAM_MISC_LIBS) -AC_CHECK_HEADERS([security/pam_appl.h security/pam_misc.h security/pam_modules.h], - [AC_CHECK_LIB(pam, pam_get_item, [ PAM_LIBS="-lpam" ], [AC_MSG_ERROR([PAM must support pam_get_item])])], +AC_CHECK_HEADERS([security/pam_appl.h security/pam_modules.h], + [AC_CHECK_LIB([pam], [pam_get_item], + [PAM_LIBS="-lpam"], + [AC_MSG_ERROR([PAM must support pam_get_item])])], [AC_MSG_ERROR([PAM development libraries not installed])] ) + +AC_CHECK_HEADERS([security/pam_ext.h security/pam_modutil.h]) +AC_CHECK_HEADERS([security/pam_misc.h security/_pam_macros.h]) +AC_CHECK_HEADERS([security/openpam.h],,,[ + #ifdef HAVE_SECURITY_PAM_APPL_H + #include <security/pam_appl.h> + #endif + ]) + +AC_CHECK_LIB([pam_misc], [misc_conv], + [PAM_MISC_LIBS="-lpam_misc"]) |