diff --git a/Makefile.am b/Makefile.am index 75b784f75..b39fc4162 100644 --- a/Makefile.am +++ b/Makefile.am @@ -59,7 +59,7 @@ endif cmakedir = $(libdir)/cmake/PulseAudio cmake_DATA = PulseAudioConfig.cmake PulseAudioConfigVersion.cmake -bashcompletiondir=$(sysconfdir)/bash_completion.d +bashcompletiondir=@bashcompletiondir@ dist_bashcompletion_DATA = shell-completion/bash/pulseaudio install-bashcompletion-aliases: diff --git a/configure.ac b/configure.ac index b2fcd1e74..9e656841c 100644 --- a/configure.ac +++ b/configure.ac @@ -1436,6 +1436,20 @@ AC_ARG_WITH( AC_SUBST(udevrulesdir) +# PKG_CHECK_VAR available with pkg-config 0.28 +AC_DEFUN([PKG_CHECK_VAR], + [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl + AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl + _PKG_CONFIG([$1], [variable="][$3]["], [$2]) + AS_VAR_COPY([$1], [pkg_cv_][$1]) + AS_VAR_IF([$1], [""], [$5], [$4])dnl + ]) + +PKG_CHECK_VAR(bashcompletiondir, [bash-completion], [completionsdir], , + bashcompletiondir="${sysconfdir}/bash_completion.d") + +AC_SUBST(bashcompletiondir) + AC_ARG_WITH( [zsh-completion-dir], AS_HELP_STRING([--with-zsh-completion-dir], [Zsh completions directory (defaults to ${datadir}/zsh/site-functions)]), @@ -1563,6 +1577,7 @@ echo " System State Path: ${PA_SYSTEM_STATE_PATH} System Config Path: ${PA_SYSTEM_CONFIG_PATH} Zsh completions directory: ${zshcompletiondir} + Bash completions directory: ${bashcompletiondir} Compiler: ${CC} CFLAGS: ${CFLAGS} CPPFLAGS: ${CPPFLAGS}