You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
52 lines
1.8 KiB
52 lines
1.8 KiB
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
|
From: Peter Jones <pjones@redhat.com> |
|
Date: Wed, 3 Apr 2013 14:35:34 -0400 |
|
Subject: [PATCH] Move bash completion script (#922997) |
|
|
|
Apparently these go in a new place now. |
|
--- |
|
configure.ac | 11 +++++++++++ |
|
util/bash-completion.d/Makefile.am | 1 - |
|
2 files changed, 11 insertions(+), 1 deletion(-) |
|
|
|
diff --git a/configure.ac b/configure.ac |
|
index 7517fc49d98..8331f95b645 100644 |
|
--- a/configure.ac |
|
+++ b/configure.ac |
|
@@ -314,6 +314,14 @@ AC_SUBST(grubdirname) |
|
AC_DEFINE_UNQUOTED(GRUB_DIR_NAME, "$grubdirname", |
|
[Default grub directory name]) |
|
|
|
+PKG_PROG_PKG_CONFIG |
|
+AS_IF([$($PKG_CONFIG --exists bash-completion)], [ |
|
+ bashcompletiondir=$($PKG_CONFIG --variable=completionsdir bash-completion) |
|
+] , [ |
|
+ bashcompletiondir=${datadir}/bash-completion/completions |
|
+]) |
|
+AC_SUBST(bashcompletiondir) |
|
+ |
|
# |
|
# Checks for build programs. |
|
# |
|
@@ -525,6 +533,9 @@ HOST_CFLAGS="$HOST_CFLAGS $grub_cv_cc_w_extra_flags" |
|
# Check for target programs. |
|
# |
|
|
|
+# This makes sure pkg.m4 is available. |
|
+m4_pattern_forbid([^_?PKG_[A-Z_]+$],[*** pkg.m4 missing, please install pkg-config]) |
|
+ |
|
# Find tools for the target. |
|
if test "x$target_alias" != x && test "x$host_alias" != "x$target_alias"; then |
|
tmp_ac_tool_prefix="$ac_tool_prefix" |
|
diff --git a/util/bash-completion.d/Makefile.am b/util/bash-completion.d/Makefile.am |
|
index 136287cf1bf..61108f05429 100644 |
|
--- a/util/bash-completion.d/Makefile.am |
|
+++ b/util/bash-completion.d/Makefile.am |
|
@@ -6,7 +6,6 @@ EXTRA_DIST = $(bash_completion_source) |
|
|
|
CLEANFILES = $(bash_completion_script) config.log |
|
|
|
-bashcompletiondir = $(sysconfdir)/bash_completion.d |
|
bashcompletion_DATA = $(bash_completion_script) |
|
|
|
$(bash_completion_script): $(bash_completion_source) $(top_builddir)/config.status
|
|
|