[pulseaudio-discuss] [pulseaudio-commits] 3 commits - Makefile.am configure.ac src/pulsecore

[Arun Raghavan]

On 27 May 2015 at 13:55, Tanu Kaskinen <tanuk at iki.fi> wrote:
> On Mon, 2015-05-25 at 07:22 -0700, Peter Meerwald wrote:
>>  Makefile.am                   |    2 +-
>>  configure.ac                  |   15 +++++++++++++++
>>  src/pulsecore/filter/biquad.c |   24 ++++++++++++------------
>>  3 files changed, 28 insertions(+), 13 deletions(-)
>>
>> New commits:
>> commit 84dff820ed14f8a4d95f4dd230a02f33c0d6a1ea
>> Author: Ville Skyttä <ville.skytta at iki.fi>
>> Date:   Sun Jan 25 13:38:43 2015 +0200
>>
>>     build-sys: Install bash completion to where bash-completion.pc says
>>
>>     Fall back to the previous /etc/bash_completion.d dir on failures
>>     (either old bash completion or not installed).
>>
>>     changes over Ville Skyttä's patch:
>>     define PKG_CHECK_VAR macro which became available only in pkg-config 0.28
>>
>>     see https://bugs.freedesktop.org/show_bug.cgi?id=88782 and
>>     https://bugs.freedesktop.org/show_bug.cgi?id=89540
>>
>>     Signed-off-by: Ville Skyttä <ville.skytta at iki.fi>
>>     Signed-off-by: Peter Meerwald <pmeerw at pmeerw.net>
>>
>> diff --git a/Makefile.am b/Makefile.am
>> index 75b784f..b39fc41 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 b2fcd1e..9e65684 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
>
> So this is to keep compatibility with versions older than 0.28? 0.28 was
> released in January 2013, I'm not sure if we should still care about
> older versions...
>
>> +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")
>
> I don't like installing things over distribution files by default. See
> the discussion here:
> http://thread.gmane.org/gmane.comp.audio.pulseaudio.general/22711/focus=22741

We already have this problem with the udev rules dir and systemd user units dir.

That said, distcheck is now broken with this, and there isn't a clean
way to override. Anyone have an objection to something like the patch
in the next mail?

-- Arun