Please find attached a patch needed to make the new upstream
libpam-mount build. The upstream part should probably also
be sent upstream,
Actually, the patch logic should be different: The pmt-ehd binary
relies on the presence of libcryptsetup (i.e. it unconditionally
includes its headers) and should thus not get build if
HAVE_LIBCRYPTSETUP isn't true. The ${libcryptsetup_LIBS} dependency
should get added to pmt_ehd_LDADD unconditionally, hence.
Please find my reworked patch attached.
- Fabian
Author: Fabian Greffrath <fabian+deb...@greffrath.com>
Description: Build pmt-ehd only if libcryptsetup is available and link it against this library
--- libpam-mount-2.13.orig/src/Makefile.am
+++ libpam-mount-2.13/src/Makefile.am
@@ -9,7 +9,9 @@ moduledir = @PAM_MODDIR@
module_LTLIBRARIES = pam_mount.la
bin_PROGRAMS = pmt-fd0ssh pmt-ofl
sbin_PROGRAMS = pmvarrun
+if HAVE_LIBCRYPTSETUP
sbin_PROGRAMS += pmt-ehd
+endif
ssbin_PROGRAMS = mount.crypt
noinst_PROGRAMS = autoloop ismnt
noinst_SCRIPTS = umount.crypt
@@ -76,7 +78,7 @@ mount_crypt_SOURCES = mtcrypt.c spawn.c
mount_crypt_LDADD = libcryptmount.la libpmt_mtab.la ${libHX_LIBS}
pmt_ehd_SOURCES = ehd.c bdev.c misc.c spawn.c
-pmt_ehd_LDADD = libcryptmount.la ${libHX_LIBS}
+pmt_ehd_LDADD = libcryptmount.la ${libHX_LIBS} ${libcryptsetup_LIBS}
pmt_fd0ssh_SOURCES = fd0ssh.c
