From: Karel Zak <kzak@redhat.com>
Date: Mon, 25 May 2020 10:23:13 +0000 (+0200)
Subject: Merge branch 'libeconf' of https://github.com/thkukuk/util-linux
X-Git-Tag: v2.36-rc1~70
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d5e8818e03e581e2e4fab8942a13a4c6731f5da9;p=thirdparty%2Futil-linux.git

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
---

d5e8818e03e581e2e4fab8942a13a4c6731f5da9
diff --cc login-utils/Makemodule.am
index fac5bfc199,22a6c867e8..08977a3438
--- a/login-utils/Makemodule.am
+++ b/login-utils/Makemodule.am
@@@ -146,12 -161,12 +161,15 @@@ su_LDADD = $(LDADD) libcommon.la -lpa
  if HAVE_LINUXPAM
  su_LDADD += -lpam_misc
  endif
 -if HAVE_UTIL
 -su_LDADD += -lutil
 +if HAVE_PTY
 +su_SOURCES += lib/pty-session.c \
 +      include/pty-session.h \
 +      lib/monotonic.c
 +su_LDADD += -lutil $(REALTIME_LIBS)
  endif
+ if HAVE_ECONF
+ su_LDADD += -leconf
+ endif
  endif # BUILD_SU
  
  
@@@ -168,12 -183,15 +186,18 @@@ runuser_LDADD = $(LDADD) libcommon.la -
  if HAVE_LINUXPAM
  runuser_LDADD += -lpam_misc
  endif
 -if HAVE_UTIL
 -runuser_LDADD += -lutil
 +if HAVE_PTY
 +runuser_SOURCES += lib/pty-session.c \
 +	include/pty-session.h \
 +	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