|
 |
6b2dd0f |
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
0ac23e2 |
From: Peter Jones <pjones@redhat.com>
|
|
|
0ac23e2 |
Date: Wed, 3 Apr 2013 14:35:34 -0400
|
|
|
31cddd6 |
Subject: [PATCH] Move bash completion script (#922997)
|
|
|
0ac23e2 |
|
|
|
0ac23e2 |
Apparently these go in a new place now.
|
|
|
0ac23e2 |
---
|
|
|
0ac23e2 |
configure.ac | 11 +++++++++++
|
|
|
0ac23e2 |
util/bash-completion.d/Makefile.am | 1 -
|
|
|
0ac23e2 |
2 files changed, 11 insertions(+), 1 deletion(-)
|
|
|
0ac23e2 |
|
|
|
0ac23e2 |
diff --git a/configure.ac b/configure.ac
|
|
|
752ceb1 |
index c7888e40f66..783118ccdcd 100644
|
|
|
0ac23e2 |
--- a/configure.ac
|
|
|
0ac23e2 |
+++ b/configure.ac
|
|
|
752ceb1 |
@@ -289,6 +289,14 @@ AC_SUBST(grubdirname)
|
|
|
0ac23e2 |
AC_DEFINE_UNQUOTED(GRUB_DIR_NAME, "$grubdirname",
|
|
|
0ac23e2 |
[Default grub directory name])
|
|
|
0ac23e2 |
|
|
|
0ac23e2 |
+PKG_PROG_PKG_CONFIG
|
|
|
0ac23e2 |
+AS_IF([$($PKG_CONFIG --exists bash-completion)], [
|
|
|
0ac23e2 |
+ bashcompletiondir=$($PKG_CONFIG --variable=completionsdir bash-completion)
|
|
|
0ac23e2 |
+] , [
|
|
|
0ac23e2 |
+ bashcompletiondir=${datadir}/bash-completion/completions
|
|
|
0ac23e2 |
+])
|
|
|
0ac23e2 |
+AC_SUBST(bashcompletiondir)
|
|
|
0ac23e2 |
+
|
|
|
0ac23e2 |
#
|
|
|
0ac23e2 |
# Checks for build programs.
|
|
|
0ac23e2 |
#
|
|
|
752ceb1 |
@@ -498,6 +506,9 @@ HOST_CFLAGS="$HOST_CFLAGS $grub_cv_cc_w_extra_flags"
|
|
|
0ac23e2 |
# Check for target programs.
|
|
|
0ac23e2 |
#
|
|
|
0ac23e2 |
|
|
|
0ac23e2 |
+# This makes sure pkg.m4 is available.
|
|
|
0ac23e2 |
+m4_pattern_forbid([^_?PKG_[A-Z_]+$],[*** pkg.m4 missing, please install pkg-config])
|
|
|
0ac23e2 |
+
|
|
|
0ac23e2 |
# Find tools for the target.
|
|
|
0ac23e2 |
if test "x$target_alias" != x && test "x$host_alias" != "x$target_alias"; then
|
|
|
0ac23e2 |
tmp_ac_tool_prefix="$ac_tool_prefix"
|
|
|
0ac23e2 |
diff --git a/util/bash-completion.d/Makefile.am b/util/bash-completion.d/Makefile.am
|
|
|
ec4acbb |
index 136287cf1bf..61108f05429 100644
|
|
|
0ac23e2 |
--- a/util/bash-completion.d/Makefile.am
|
|
|
0ac23e2 |
+++ b/util/bash-completion.d/Makefile.am
|
|
|
0ac23e2 |
@@ -6,7 +6,6 @@ EXTRA_DIST = $(bash_completion_source)
|
|
|
0ac23e2 |
|
|
|
0ac23e2 |
CLEANFILES = $(bash_completion_script) config.log
|
|
|
0ac23e2 |
|
|
|
0ac23e2 |
-bashcompletiondir = $(sysconfdir)/bash_completion.d
|
|
|
0ac23e2 |
bashcompletion_DATA = $(bash_completion_script)
|
|
|
0ac23e2 |
|
|
|
0ac23e2 |
$(bash_completion_script): $(bash_completion_source) $(top_builddir)/config.status
|