[Libguestfs] [PATCH v1 2/2] build: add ./configure --with-guestfs-path option

[Pavel Butsykin]

Signed-off-by: Pavel Butsykin <pbutsykin at virtuozzo.com>
---
 lib/Makefile.am         |  1 -
 m4/guestfs_appliance.m4 | 11 +++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 063706f8f..18b6dd678 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -130,7 +130,6 @@ libguestfs_la_SOURCES = \
 	libguestfs.syms
 
 libguestfs_la_CPPFLAGS = \
-	-DGUESTFS_DEFAULT_PATH='"$(libdir)/guestfs"' \
 	-DGUESTFS_WARN_DEPRECATED=1 \
 	-DGUESTFS_PRIVATE=1 \
 	-DLIBOSINFO_DB_PATH='"$(datadir)/libosinfo/db"' \
diff --git a/m4/guestfs_appliance.m4 b/m4/guestfs_appliance.m4
index 890b1999c..81c43879f 100644
--- a/m4/guestfs_appliance.m4
+++ b/m4/guestfs_appliance.m4
@@ -128,3 +128,14 @@ AC_ARG_WITH([extra-packages],
     [EXTRA_PACKAGES="$withval"],
     [EXTRA_PACKAGES=])
 AC_SUBST([EXTRA_PACKAGES])
+
+dnl Set guestfs default path
+AC_ARG_WITH([guestfs-path],
+    [AS_HELP_STRING([--with-guestfs-path=PATH],
+                   [specify guestfs path (default=$libdir/guestfs)])],
+    [GUESTFS_DEFAULT_PATH="$withval"],
+    [GUESTFS_DEFAULT_PATH="${acl_final_exec_prefix}/${acl_libdirstem}/guestfs"])
+AC_SUBST([GUESTFS_DEFAULT_PATH])
+
+AC_DEFINE_UNQUOTED([GUESTFS_DEFAULT_PATH], ["$GUESTFS_DEFAULT_PATH"],
+    [Define guestfs default path.])
-- 
2.11.0