From be8171be791da35d33de3d7d18c29137a85fe7e3 Mon Sep 17 00:00:00 2001
From: Tanu Kaskinen <tanu.kaskinen@linux.intel.com>
Date: Tue, 12 Aug 2014 12:41:55 +0300
Subject: [PATCH] shell-completion: Install the Zsh completions

This makes the Zsh completions work out-of-the-box. I also moved
pulseaudio-zsh-completion.zsh to zsh/_pulseaudio to be in line with
the common naming convention of Zsh completion files.
---
 Makefile.am                                               | 4 +++-
 configure.ac                                              | 8 ++++++++
 .../{pulseaudio-zsh-completion.zsh => zsh/_pulseaudio}    | 0
 3 files changed, 11 insertions(+), 1 deletion(-)
 rename shell-completion/{pulseaudio-zsh-completion.zsh => zsh/_pulseaudio} (100%)

diff --git a/Makefile.am b/Makefile.am
index f4bd79ff5..ddbf64a8f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,7 +29,6 @@ EXTRA_DIST = \
 	PROTOCOL \
 	README \
 	todo \
-	shell-completion/pulseaudio-zsh-completion.zsh \
 	.gitignore \
 	doxygen/.gitignore \
 	m4/.gitignore \
@@ -64,6 +63,9 @@ cmake_DATA = PulseAudioConfig.cmake PulseAudioConfigVersion.cmake
 bashcompletiondir=$(sysconfdir)/bash_completion.d
 dist_bashcompletion_DATA = shell-completion/pulseaudio-bash-completion.sh
 
+zshcompletiondir=@zshcompletiondir@
+dist_zshcompletion_DATA = shell-completion/zsh/_pulseaudio
+
 homepage: all dist doxygen
 	test -d $$HOME/homepage/private
 	mkdir -p $$HOME/homepage/private/projects/pulseaudio $$HOME/homepage/private/projects/pulseaudio/doxygen
diff --git a/configure.ac b/configure.ac
index 837e81e63..dc2298dfe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1353,6 +1353,13 @@ AC_ARG_WITH(
 
 AC_SUBST(udevrulesdir)
 
+AC_ARG_WITH(
+        [zsh-completion-dir],
+        AS_HELP_STRING([--with-zsh-completion-dir], [Zsh completions directory (defaults to ${datadir}/zsh/site-functions)]),
+        [zshcompletiondir=$withval], [zshcompletiondir="${datadir}/zsh/site-functions"])
+
+AC_SUBST(zshcompletiondir)
+
 AC_ARG_ENABLE([force-preopen],
     AS_HELP_STRING([--enable-force-preopen],[Preopen modules, even when dlopen() is supported.]))
 
@@ -1465,6 +1472,7 @@ echo "
     System Runtime Path:           ${PA_SYSTEM_RUNTIME_PATH}
     System State Path:             ${PA_SYSTEM_STATE_PATH}
     System Config Path:            ${PA_SYSTEM_CONFIG_PATH}
+    Zsh completions directory:     ${zshcompletiondir}
     Compiler:                      ${CC}
     CFLAGS:                        ${CFLAGS}
     CPPFLAGS:                      ${CPPFLAGS}
diff --git a/shell-completion/pulseaudio-zsh-completion.zsh b/shell-completion/zsh/_pulseaudio
similarity index 100%
rename from shell-completion/pulseaudio-zsh-completion.zsh
rename to shell-completion/zsh/_pulseaudio