From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stefan Schantl <stefan.schantl@ipfire.org>
To: location@lists.ipfire.org
Subject: [PATCH 2/2] Install bash-completion files.
Date: Fri, 24 Feb 2023 17:22:06 +0100
Message-ID: <20230224162206.89971-2-stefan.schantl@ipfire.org>
In-Reply-To: <20230224162206.89971-1-stefan.schantl@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2126504857588308448=="
List-Id: <location.lists.ipfire.org>

--===============2126504857588308448==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
 Makefile.am  |  9 +++++++++
 configure.ac | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index 4da2ec5..4edb9e9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,6 +13,8 @@ if ENABLE_PERL
 BINDINGS +=3D perl
 endif
=20
+bashcompletiondir =3D @bashcompletiondir@
+
 AM_CPPFLAGS =3D \
 	-include $(top_builddir)/config.h \
 	-DSYSCONFDIR=3D\""$(sysconfdir)"\" \
@@ -172,6 +174,13 @@ EXTRA_DIST +=3D \
 CLEANFILES +=3D \
 	src/libloc.pc
=20
+#dist_bashcompletion_DATA =3D
+
+if BUILD_BASH_COMPLETION
+dist_bashcompletion_DATA =3D \
+	bash-completion/location
+endif
+
 dist_pkgpython_PYTHON =3D \
 	src/python/database.py \
 	src/python/downloader.py \
diff --git a/configure.ac b/configure.ac
index edca1d4..e21574d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,6 +55,41 @@ AC_CHECK_PROGS(ASCIIDOC, [asciidoc])
 if test "${have_man_pages}" =3D "yes" && test -z "${ASCIIDOC}"; then
 	AC_MSG_ERROR([Required program 'asciidoc' not found])
 fi
+
+# - pkg-config -------------------------------------------------------------=
----
+
+m4_ifndef([PKG_PROG_PKG_CONFIG],
+	[m4_fatal([Could not locate the pkg-config autoconf
+		macros. These are usually located in /usr/share/aclocal/pkg.m4.
+		If your macros are in a different location, try setting the
+		environment variable AL_OPTS=3D"-I/other/macro/dir" before running
+		./autogen.sh or autoreconf again. Make sure pkg-config is installed.])])
+
+PKG_PROG_PKG_CONFIG
+PKG_INSTALLDIR(['${usrlib_execdir}/pkgconfig'])
+
+# - bash-completion --------------------------------------------------------=
----
+
+#enable_bash_completion=3Dyes
+AC_ARG_WITH([bashcompletiondir],
+	AS_HELP_STRING([--with-bashcompletiondir=3DDIR], [Bash completions director=
y]),
+	[],
+	[AS_IF([`$PKG_CONFIG --exists bash-completion`], [
+		with_bashcompletiondir=3D`$PKG_CONFIG --variable=3Dcompletionsdir bash-com=
pletion`
+	], [
+		with_bashcompletiondir=3D${datadir}/bash-completion/completions
+	])
+])
+
+AC_SUBST([bashcompletiondir], [$with_bashcompletiondir])
+
+AC_ARG_ENABLE([bash-completion],
+	AS_HELP_STRING([--disable-bash-completion], [do not install bash completion=
 files]),
+	[], [enable_bash_completion=3Dyes]
+)
+
+AM_CONDITIONAL([BUILD_BASH_COMPLETION], [test "x$enable_bash_completion" =3D=
 xyes])
+
 # - debug ------------------------------------------------------------------=
----
=20
 AC_ARG_ENABLE([debug],
@@ -206,6 +241,7 @@ AC_MSG_RESULT([
=20
         debug:                  ${enable_debug}
         systemd support:        ${have_systemd}
+	bash-completion:        ${enable_bash_completion}
=20
 	Bindings:
 	  perl:			${enable_perl}
--=20
2.30.2


--===============2126504857588308448==--