diff options
| author | Sami Kerola | 2013-03-19 23:24:41 +0100 |
|---|---|---|
| committer | Sami Kerola | 2013-03-30 11:17:49 +0100 |
| commit | 9cc36e9fdf24a67cc7a7d186a39cbf8398ba9d37 (patch) | |
| tree | 8138dc19d94ace700c90886ec94c6511b01b5208 | |
| parent | lsblk: add --paths (diff) | |
| download | kernel-qcow2-util-linux-9cc36e9fdf24a67cc7a7d186a39cbf8398ba9d37.tar.gz kernel-qcow2-util-linux-9cc36e9fdf24a67cc7a7d186a39cbf8398ba9d37.tar.xz kernel-qcow2-util-linux-9cc36e9fdf24a67cc7a7d186a39cbf8398ba9d37.zip | |
bash-completion: add bash completetion configure option
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | configure.ac | 13 | ||||
| -rw-r--r-- | shell-completion/Makemodule.am | 1 |
3 files changed, 19 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 3afcad16d..b963af941 100644 --- a/Makefile.am +++ b/Makefile.am @@ -27,6 +27,8 @@ ul_libfdisk_incdir = $(top_srcdir)/libfdisk/src pkgconfigdir = $(usrlib_execdir)/pkgconfig +bashcompletiondir = @bashcompletiondir@ + dist_noinst_HEADERS = noinst_PROGRAMS = noinst_LTLIBRARIES = @@ -87,6 +89,8 @@ include misc-utils/Makemodule.am include disk-utils/Makemodule.am include fdisks/Makemodule.am +include shell-completion/Makemodule.am + include tests/Makemodule.am # @@ -158,6 +162,7 @@ checkdecl: ENABLE_ALL = --enable-static-programs --enable-most-builds DISTCHECK_CONFIGURE_FLAGS = --disable-use-tty-group \ --disable-silent-rules $(ENABLE_ALL) \ + --with-bashcompletiondir=$$dc_install_base/$(bashcompletiondir) \ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) diff --git a/configure.ac b/configure.ac index 92a5a3b12..cd4e826a9 100644 --- a/configure.ac +++ b/configure.ac @@ -1342,6 +1342,18 @@ fi AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != "xno" ]) +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([bashcompletiondir], [$with_bashcompletiondir]) + + AC_ARG_ENABLE([pg-bell], AS_HELP_STRING([--disable-pg-bell], [let pg not ring the bell on invalid keys]), [], enable_pg_bell=yes @@ -1463,6 +1475,7 @@ AC_MSG_RESULT([ suid cflags: ${SUID_CFLAGS} ldflags: ${LDFLAGS} suid ldflags: ${SUID_LDFLAGS} + Bash completions dir: ${with_bashcompletiondir} warnings: diff --git a/shell-completion/Makemodule.am b/shell-completion/Makemodule.am new file mode 100644 index 000000000..b784ec703 --- /dev/null +++ b/shell-completion/Makemodule.am @@ -0,0 +1 @@ +dist_bashcompletion_DATA = |