46 lines
1.9 KiB
Diff
46 lines
1.9 KiB
Diff
From 1f51b8ef921ad804022fc39b7465f9f731cbb6be Mon Sep 17 00:00:00 2001
|
|
From: Gilles Dartiguelongue <eva@gentoo.org>
|
|
Date: Fri, 7 Dec 2018 12:14:15 +0100
|
|
Subject: [PATCH 4/5] Loosen build time requirement on bash-completion
|
|
|
|
Distributions might avoid pulling bash-completion during build as it is
|
|
an optional feature and would only make sense at runtime anyway. Since
|
|
this setting is well-known across a given distribution, allow them to
|
|
provide the value and avoid the dependency.
|
|
---
|
|
m4/guestfs_bash_completion.m4 | 21 ++++++++++-----------
|
|
1 file changed, 10 insertions(+), 11 deletions(-)
|
|
|
|
diff --git a/m4/guestfs_bash_completion.m4 b/m4/guestfs_bash_completion.m4
|
|
index 1f171b79d..9e877f6ab 100644
|
|
--- a/m4/guestfs_bash_completion.m4
|
|
+++ b/m4/guestfs_bash_completion.m4
|
|
@@ -16,14 +16,13 @@
|
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
|
|
dnl Bash completion.
|
|
-PKG_CHECK_MODULES([BASH_COMPLETION], [bash-completion >= 2.0], [
|
|
- bash_completion=yes
|
|
- AC_MSG_CHECKING([for bash-completions directory])
|
|
- BASH_COMPLETIONS_DIR="`pkg-config --variable=completionsdir bash-completion`"
|
|
- AC_MSG_RESULT([$BASH_COMPLETIONS_DIR])
|
|
- AC_SUBST([BASH_COMPLETIONS_DIR])
|
|
-],[
|
|
- bash_completion=no
|
|
- AC_MSG_WARN([bash-completion not installed])
|
|
-])
|
|
-AM_CONDITIONAL([HAVE_BASH_COMPLETION],[test "x$bash_completion" = "xyes"])
|
|
+AC_ARG_WITH([bashcompletiondir],
|
|
+ AS_HELP_STRING([--with-bashcompletiondir=DIR], [Bash completions directory]),
|
|
+ [],
|
|
+ [AS_IF([$($PKG_CONFIG --exists bash-completion)], [
|
|
+ with_bashcompletiondir=$($PKG_CONFIG --variable=completionsdir bash-completion)
|
|
+ ] , [
|
|
+ with_bashcompletiondir=${datadir}/bash-completion/completions
|
|
+ ])])
|
|
+AC_SUBST([BASH_COMPLETIONS_DIR], [$with_bashcompletiondir])
|
|
+AM_CONDITIONAL([HAVE_BASH_COMPLETION],[test -n "$with_bashcompletiondir"])
|
|
--
|
|
2.19.2
|
|
|