diff options
| author | Will Johansson <will.johansson@gmail.com> | 2014-12-09 18:40:31 -0800 |
|---|---|---|
| committer | Karel Zak <kzak@redhat.com> | 2014-12-15 10:16:03 +0100 |
| commit | fe2c9909cd127b5be0f103b8e633807c6afde000 (patch) | |
| tree | 6d6b9b36aa0e9884a3785303cbe06a79b6a15c31 /login-utils/Makemodule.am | |
| parent | 0d75c73d4fc9f638b9fbcab142002acadca9e603 (diff) | |
| download | util-linux-fe2c9909cd127b5be0f103b8e633807c6afde000.tar.gz | |
login-utils: Enable building util-linux against OpenPAM
OpenPAM is compatible with util-linux, with a few changes, namely
using OpenPAM's conversation function, openpam_ttyconv.
We check for Linux-PAM by querying for security/pam_misc.h, and OpenPAM
by querying for security/openpam.h.
Signed-off-by: Will Johansson <will.johansson@gmail.com>
Diffstat (limited to 'login-utils/Makemodule.am')
| -rw-r--r-- | login-utils/Makemodule.am | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/login-utils/Makemodule.am b/login-utils/Makemodule.am index 34c5fb424..47291afd3 100644 --- a/login-utils/Makemodule.am +++ b/login-utils/Makemodule.am @@ -50,7 +50,10 @@ login_SOURCES = \ login-utils/login.c \ login-utils/logindefs.c \ login-utils/logindefs.h -login_LDADD = $(LDADD) libcommon.la -lpam -lpam_misc +login_LDADD = $(LDADD) libcommon.la -lpam +if HAVE_LINUXPAM +login_LDADD += -lpam_misc +endif if HAVE_AUDIT login_LDADD += -laudit endif @@ -86,11 +89,14 @@ chfn_chsh_ldflags = $(SUID_LDFLAGS) $(AM_LDFLAGS) chfn_chsh_ldadd = libcommon.la if CHFN_CHSH_PASSWORD -chfn_chsh_ldadd += -lpam -lpam_misc +chfn_chsh_ldadd += -lpam +if HAVE_LINUXPAM +chfn_chsh_ldadd += -lpam_misc +endif chfn_chsh_sources += \ login-utils/auth.c \ login-utils/auth.h -endif +endif # CHFN_CHSH_PASSWORD if HAVE_USER chfn_chsh_ldflags += $(LIBUSER_LIBS) @@ -136,8 +142,11 @@ su_SOURCES = \ login-utils/logindefs.h su_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS) su_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS) -su_LDADD = $(LDADD) libcommon.la -lpam -lpam_misc +su_LDADD = $(LDADD) libcommon.la -lpam +if HAVE_LINUXPAM +su_LDADD += -lpam_misc endif +endif # BUILD_SU if BUILD_RUNUSER @@ -149,8 +158,11 @@ runuser_SOURCES = \ login-utils/su-common.h \ login-utils/logindefs.c \ login-utils/logindefs.h -runuser_LDADD = $(LDADD) libcommon.la -lpam -lpam_misc +runuser_LDADD = $(LDADD) libcommon.la -lpam +if HAVE_LINUXPAM +runuser_LDADD += -lpam_misc endif +endif # BUILD_RUNUSER if BUILD_NEWGRP |