From 3afb626d27c8f4118863c3283c71fb9031038f8e Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 3 Oct 2018 16:25:58 +0100 Subject: [PATCH] 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 --- m4/paths.m4 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/m4/paths.m4 b/m4/paths.m4 index 89d3bb8312..42b4970e9d 100644 --- 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) -- 2.30.2