[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 04/17] configure.ac: Move bash completion script
From: |
Leo Sandoval |
Subject: |
[PATCH v2 04/17] configure.ac: Move bash completion script |
Date: |
Mon, 7 Oct 2024 12:17:55 -0600 |
From: Peter Jones <pjones@redhat.com>
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=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 cd667a2eb..ae3a49321 100644
--- a/configure.ac
+++ b/configure.ac
@@ -319,6 +319,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.
#
@@ -534,6 +542,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 136287cf1..61108f054 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
--
2.46.2
- [PATCH v2 00/17] First Distro-agnostic series taken from Fedora Rawhide, Leo Sandoval, 2024/10/07
- [PATCH v2 02/17] term/terminfo: for ppc, reset console display attr when clear screen, Leo Sandoval, 2024/10/07
- [PATCH v2 04/17] configure.ac: Move bash completion script,
Leo Sandoval <=
- [PATCH v2 08/17] normal: Add fw_path variable (revised), Leo Sandoval, 2024/10/07
- [PATCH v2 03/17] ieee1275: Disable GRUB video support for IBM power machines, Leo Sandoval, 2024/10/07
- [PATCH v2 07/17] 20_ppc_terminfo.in: Migrate ieee1275/PPC from Yaboot to Grub2, Leo Sandoval, 2024/10/07
- [PATCH v2 09/17] commands: Pass "\x[[:hex:]][[:hex:]]" straight through unmolested., Leo Sandoval, 2024/10/07
- [PATCH v2 10/17] 10_linux.in: Add devicetree loading, Leo Sandoval, 2024/10/07
- [PATCH v2 05/17] misc: Make "exit" take a return code., Leo Sandoval, 2024/10/07
- [PATCH v2 12/17] Makefile.common: Add .eh_frame to list of relocations stripped, Leo Sandoval, 2024/10/07