diff options
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | configure.ac | 12 |
2 files changed, 20 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 758c4f285..f5322b3da 100644 --- a/Makefile.am +++ b/Makefile.am @@ -96,6 +96,14 @@ include bash-completion/Makemodule.am include tests/Makemodule.am +# 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. +# +# So introduce this dependency rule: +# install-pylibmountexecLTLIBRARIES: install-usrlib_execLTLIBRARIES +@verbatim_pylibmount_dependency@ + # # Don't rely on configure.ac AC_CONFIG_FILES for install paths. # diff --git a/configure.ac b/configure.ac index 75e869064..455957396 100644 --- a/configure.ac +++ b/configure.ac @@ -1918,6 +1918,18 @@ UL_REQUIRES_HAVE([pylibmount], [libpython], [libpython]) UL_REQUIRES_BUILD([pylibmount], [libmount]) 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=' + +# 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 + +' +AC_SUBST([verbatim_pylibmount_dependency]) +AM_SUBST_NOTMAKE([verbatim_pylibmount_dependency]) AC_ARG_ENABLE([pg-bell], AS_HELP_STRING([--disable-pg-bell], [let pg not ring the bell on invalid keys]), |