autoconf: Provide libexec_libdir_suffix

This is going to be used to put libfsimage.so into a path containing
the multiarch triplet.

Signed-off-by: Ian Jackson <ian.jackson@citrix.com>
Gbp-Pq: Name 0036-autoconf-Provide-libexec_libdir_suffix.patch

diff --git a/m4/paths.m4 b/m4/paths.m4
index 89d3bb83123162a27243dc75b482ed6c39e1e76a..42b4970e9d92a2fe0f5331e9832ed17e939d2df2 100644 (file)
--- a/m4/paths.m4
+++ b/m4/paths.m4
@@ -70,6 +70,13 @@ AC_ARG_WITH([libexec-leaf-dir],
     [libexec_subdir=$withval],
     [libexec_subdir=$PACKAGE_TARNAME])
 
+dnl Allows .../libexec/lib (used for libfsimage) to have a multiarch path
+AC_ARG_WITH([libexec-libdir-suffix],
+    AS_HELP_STRING([--with-libexec-libdir-suffix=/SUFFIX],
+    [Name of subdirectory or suffix to use after ...LIBEXEC/lib.]),
+    [libexec_libdir_suffix=$withval],
+    [libexec_libdir_suffix=''])
+
 AC_ARG_WITH([xen-dumpdir],
     AS_HELP_STRING([--with-xen-dumpdir=DIR],
     [Path to directory for domU crash dumps. [LOCALSTATEDIR/lib/xen/dump]]),
@@ -103,7 +110,7 @@ AC_SUBST(LIBEXEC)
 dnl These variables will be substituted in various .in files
 LIBEXEC_BIN=${LIBEXEC}/bin
 AC_SUBST(LIBEXEC_BIN)
-LIBEXEC_LIB=${LIBEXEC}/lib
+LIBEXEC_LIB=${LIBEXEC}/lib${libexec_libdir_suffix}
 AC_SUBST(LIBEXEC_LIB)
 LIBEXEC_INC=${LIBEXEC}/include
 AC_SUBST(LIBEXEC_INC)