diff options
| author | Karel Zak <kzak@redhat.com> | 2020-05-25 12:23:13 +0200 |
|---|---|---|
| committer | Karel Zak <kzak@redhat.com> | 2020-05-25 12:23:13 +0200 |
| commit | d5e8818e03e581e2e4fab8942a13a4c6731f5da9 (patch) | |
| tree | ce89b60a6b4feca4302beb7d181f46914e1deae1 /login-utils/Makemodule.am | |
| parent | 9995da01e0a17f0a381cd691fb9c371cf4a6b4f4 (diff) | |
| parent | b6b7348eeeb1c5e973840f11f44c9fbe9dcf4d88 (diff) | |
| download | util-linux-d5e8818e03e581e2e4fab8942a13a4c6731f5da9.tar.gz | |
Merge branch 'libeconf' of https://github.com/thkukuk/util-linux
* 'libeconf' of https://github.com/thkukuk/util-linux:
Adjust test output to pass test suite
Add support for libeconf
Diffstat (limited to 'login-utils/Makemodule.am')
| -rw-r--r-- | login-utils/Makemodule.am | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/login-utils/Makemodule.am b/login-utils/Makemodule.am index fac5bfc19..08977a343 100644 --- a/login-utils/Makemodule.am +++ b/login-utils/Makemodule.am @@ -44,6 +44,9 @@ login_SOURCES = \ login-utils/logindefs.c \ login-utils/logindefs.h login_LDADD = $(LDADD) libcommon.la -lpam +if HAVE_VENDORDIR +login_CFLAGS = $(AM_CFLAGS) -DHAVE_VENDORDIR -DVENDORDIR=\"@vendordir@\" +endif if HAVE_LINUXPAM login_LDADD += -lpam_misc endif @@ -53,6 +56,9 @@ endif if HAVE_SELINUX login_LDADD += -lselinux endif +if HAVE_ECONF +login_LDADD += -leconf +endif endif # BUILD_LOGIN @@ -121,8 +127,14 @@ chfn_SOURCES = \ login-utils/logindefs.h \ $(chfn_chsh_sources) chfn_CFLAGS = $(chfn_chsh_cflags) +if HAVE_VENDORDIR +chfn_CFLAGS += -DHAVE_VENDORDIR -DVENDORDIR=\"@vendordir@\" +endif chfn_LDFLAGS = $(chfn_chsh_ldflags) chfn_LDADD = $(LDADD) $(chfn_chsh_ldadd) +if HAVE_ECONF +chfn_LDADD += -leconf +endif chsh_SOURCES = login-utils/chsh.c $(chfn_chsh_sources) chsh_CFLAGS = $(chfn_chsh_cflags) @@ -141,6 +153,9 @@ su_SOURCES = \ login-utils/logindefs.c \ login-utils/logindefs.h su_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS) +if HAVE_VENDORDIR +su_CFLAGS += -DHAVE_VENDORDIR -DVENDORDIR=\"@vendordir@\" +endif su_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS) su_LDADD = $(LDADD) libcommon.la -lpam if HAVE_LINUXPAM @@ -152,6 +167,9 @@ su_SOURCES += lib/pty-session.c \ lib/monotonic.c su_LDADD += -lutil $(REALTIME_LIBS) endif +if HAVE_ECONF +su_LDADD += -leconf +endif endif # BUILD_SU @@ -174,6 +192,12 @@ runuser_SOURCES += lib/pty-session.c \ lib/monotonic.c runuser_LDADD += -lutil $(REALTIME_LIBS) endif +if HAVE_ECONF +runuser_LDADD += -leconf +endif +if HAVE_VENDORDIR +runuser_CFLAGS = $(AM_CFLAGS) -DHAVE_VENDORDIR -DVENDORDIR=\"@vendordir@\" +endif endif # BUILD_RUNUSER @@ -198,6 +222,9 @@ lslogins_SOURCES = \ login-utils/logindefs.h lslogins_LDADD = $(LDADD) libcommon.la libsmartcols.la lslogins_CFLAGS = $(AM_CFLAGS) -I$(ul_libsmartcols_incdir) +if HAVE_VENDORDIR +lslogins_CFLAGS += -DHAVE_VENDORDIR -DVENDORDIR=\"@vendordir@\" +endif if HAVE_SELINUX lslogins_LDADD += -lselinux endif @@ -205,6 +232,9 @@ if HAVE_SYSTEMD lslogins_LDADD += $(SYSTEMD_LIBS) $(SYSTEMD_JOURNAL_LIBS) lslogins_CFLAGS += $(SYSTEMD_CFLAGS) $(SYSTEMD_JOURNAL_CFLAGS) endif +if HAVE_ECONF +lslogins_LDADD += -leconf +endif endif # BUILD_LSLOGINS if BUILD_VIPW @@ -237,6 +267,12 @@ test_logindefs_SOURCES = \ login-utils/logindefs.c \ login-utils/logindefs.h test_logindefs_CPPFLAGS = -DTEST_PROGRAM $(AM_CPPFLAGS) +if HAVE_VENDORDIR +test_logindefs_CPPFLAGS += -DHAVE_VENDORDIR -DVENDORDIR=\"@vendordir@\" +endif +if HAVE_ECONF +test_logindefs_LDADD = -leconf +endif install-exec-hook: |