1
0
mirror of https://github.com/Yubico/yubico-pam.git synced 2025-03-16 03:29:17 +01:00

prepare by building a temporary library for the module

also fix the linking of libpam so we only do that when we want/need it
This commit is contained in:
Klas Lindfors 2015-01-16 10:19:31 +01:00
parent 057c3743c9
commit 68d3f5879e
2 changed files with 7 additions and 5 deletions

View File

@ -37,16 +37,18 @@ libdir = $(PAMDIR)
lib_LTLIBRARIES = pam_yubico.la lib_LTLIBRARIES = pam_yubico.la
pam_yubico_la_SOURCES = pam_yubico.c drop_privs.h drop_privs.c pam_yubico_la_SOURCES = drop_privs.h drop_privs.c
# XXX add -Wl,-x too? PAM documentation suggests it. # XXX add -Wl,-x too? PAM documentation suggests it.
pam_yubico_la_LIBADD = @LTLIBYUBIKEY@ @LTLIBYKCLIENT@ @LIBLDAP@ -lpam pam_yubico_la_LIBADD = @LTLIBYUBIKEY@ @LTLIBYKCLIENT@ @LIBLDAP@ @LIBPAM@
pam_yubico_la_LIBADD += libpam_util.la pam_yubico_la_LIBADD += libpam_util.la libpam_real.la
pam_yubico_la_LDFLAGS = -module -avoid-version pam_yubico_la_LDFLAGS = -module -avoid-version
noinst_LTLIBRARIES = libpam_util.la noinst_LTLIBRARIES = libpam_util.la libpam_real.la
libpam_util_la_SOURCES = util.c util.h libpam_util_la_SOURCES = util.c util.h
libpam_util_la_LIBADD = @LTLIBYUBIKEY@ @YKPERS_LIBS@ libpam_util_la_LIBADD = @LTLIBYUBIKEY@ @YKPERS_LIBS@
libpam_real_la_SOURCES = pam_yubico.c
DEFS = -DDEBUG_PAM -DPAM_DEBUG @DEFS@ DEFS = -DDEBUG_PAM -DPAM_DEBUG @DEFS@
# The command line tools. # The command line tools.

View File

@ -46,7 +46,7 @@ AC_CHECK_HEADERS([security/pam_modules.h security/_pam_macros.h security/pam_mod
[#include <sys/types.h> [#include <sys/types.h>
#include <security/pam_appl.h>]) #include <security/pam_appl.h>])
AC_CHECK_LIB([pam], [pam_start]) AC_CHECK_LIB([pam], [pam_start], [AC_SUBST([LIBPAM], ["-lpam"])])
AC_ARG_WITH([ldap], AC_ARG_WITH([ldap],
[AS_HELP_STRING([--without-ldap], [AS_HELP_STRING([--without-ldap],