autotools: Properly order install dependencies of pam_lastlog2

As pam_lastlog2 is relinked during installation, all its dependencies
need to already be installed.
This is the same issue that affected pylibmount which was fixed in
commit 324330aca644 ("build-sys: Properly order install dependencies of pylibmount").
Extend the logic added in that commit to also apply to pam_lastlog2.

Closes: #3011
Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
(cherry picked from commit 20dc72d8c1f3a53c0408858f0046e1849644c710)

diff --git a/Makefile.am b/Makefile.am
index b4475a4e53c7fb747e74850c8c062d7ebd78eddb..54e0fd4977656308f7bbbe16d57a41924b631b80 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -154,10 +154,12 @@ EXTRA_DIST += \
 # pylibmountexec module must be installed after usrlib_exec libraries,
 # otherwise the libtool relink step will fail to find libmount.la and
 # will try -lmount which is possibly not available.
+# The same for usrsecurelib_exec and liblastlog2.la
 #
 # So introduce this dependency rule:
 # install-pylibmountexecLTLIBRARIES: install-usrlib_execLTLIBRARIES
-@verbatim_pylibmount_dependency@
+# install-usrsecurelib_execLTLIBRARIES: install-usrlib_execLTLIBRARIES
+@verbatim_extra_dependency@
 
 #
 # Don't rely on configure.ac AC_CONFIG_FILES for install paths.

diff --git a/configure.ac b/configure.ac
index e8d8878cd262d242fedc3f4d8110e3b43c4293a1..3fe58db18bad7ff9581417aa4f6a9d718028119b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2758,16 +2758,17 @@ AM_CONDITIONAL([BUILD_PYLIBMOUNT], [test "x$build_pylibmount" = "xyes"])
 
 # We need to introduce a verbatim dependency into the Makefile, without automake
 # trying to interpret it, so push it as a AM_SUBST_NOTMAKE variable.
-verbatim_pylibmount_dependency='
+verbatim_extra_dependency='
 
 # pylibmountexec module must be installed after usrlib_exec libraries,
 # otherwise the libtool relink step will fail to find libmount.la and
 # will try -lmount which is possibly not available.
 install-pylibmountexecLTLIBRARIES: install-usrlib_execLTLIBRARIES
+install-usrsecurelib_execLTLIBRARIES: install-usrlib_execLTLIBRARIES
 
 '
-AC_SUBST([verbatim_pylibmount_dependency])
-AM_SUBST_NOTMAKE([verbatim_pylibmount_dependency])
+AC_SUBST([verbatim_extra_dependency])
+AM_SUBST_NOTMAKE([verbatim_extra_dependency])
 
 AC_ARG_ENABLE([pg-bell],
   AS_HELP_STRING([--disable-pg-bell], [let pg not ring the bell on invalid keys]),