[Mesa-dev] [PATCH] dri/common: use sysconfdir when looking for drirc

[Emil Velikov]

On 14 September 2015 at 22:33, Marcin Ślusarz <marcin.slusarz at gmail.com> wrote:
> On Mon, Sep 14, 2015 at 06:33:16PM +0100, Emil Velikov wrote:
>> Hi Marcin,
>>
>> On 13 September 2015 at 17:55, Marcin Ślusarz <marcin.slusarz at gmail.com> wrote:
>> > Useful when locally installed mesa has more quirks than the system one.
>> > ---
>> >  src/mesa/drivers/dri/common/Makefile.am | 1 +
>> >  src/mesa/drivers/dri/common/xmlconfig.c | 6 +++++-
>>
>> Please update the documentation as well - docs/autoconf.html
>>
>> With that
>> Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>
>
> diff --git a/docs/autoconf.html b/docs/autoconf.html
> index 2ef8c63..5c29e5e 100644
> --- a/docs/autoconf.html
> +++ b/docs/autoconf.html
> @@ -87,6 +87,13 @@ created in a <code>lib64</code> directory at the top of the Mesa source
>  tree.</p>
>  </dd>
>
> +<dt><code>--sysconfdir=DIR</code></dt>
> +<dd><p>This option specifies the directory where the configuration
> +files will be installed. The default is <code>${prefix}/etc</code>.
> +Currently there's only one config file provided when dri drivers are
> +enabled - it's <code>drirc</code>.</p>
> +</dd>
> +
>  <dt><code>--enable-static, --disable-shared</code></dt>
>  <dd><p>By default, Mesa
>  will build shared libraries. Either of these options will force static
> @@ -217,7 +224,7 @@ GLX.
>  <dt><code>--with-expat=DIR</code>
>  <dd><p><strong>DEPRECATED</strong>, use <code>PKG_CONFIG_PATH</code> instead.</p>
>  <p>The DRI-enabled libGL uses expat to
> -parse the DRI configuration files in <code>/etc/drirc</code> and
> +parse the DRI configuration files in <code>${sysconfdir}/drirc</code> and
>  <code>~/.drirc</code>. This option allows a specific expat installation
>  to be used. For example, <code>--with-expat=/usr/local</code> will
>  search for expat headers and libraries in <code>/usr/local/include</code>
>
>
> Does it sound good?

Looks great. Please squash it with the initial patch before pushing.

Thank you
Emil