>From 8d02412238cc68398702cdc591e4a5936f8dda43 Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: Tue, 27 May 2014 22:44:17 +0200 Subject: [PATCH 3/7] CONFIGURE: Enhance detection of pam --- Makefile.am | 4 ++-- src/external/pam.m4 | 18 ++++++++++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 0d24729200df6d7e189c7b307bf3f7ffdf4a8543..0fa613505881a5080040a97351cd5f9b07e77b3c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1879,7 +1879,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 = \ @@ -1926,7 +1926,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 40c8fd0dc748dcf9015a5f771fcb45ebce39c67c..90f89bee3f3a6cdfc967498b5aea603609f92c3b 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 + #endif + ]) + +AC_CHECK_LIB([pam_misc], [misc_conv], + [PAM_MISC_LIBS="-lpam_misc"]) -- 1.9.3