[Mesa-dev] Mesa (master): dri: make sure to build libdricommon.la

[Jon TURNEY]

On 03/02/2012 09:28, Eric Anholt wrote:
> On Thu, 02 Feb 2012 10:54:22 +0000, Jon TURNEY wrote:
>> On 27/01/2012 20:20, Matt Turner wrote:
>>> On Fri, Jan 27, 2012 at 8:11 PM, Jon TURNEY wrote:
>>>> On 27/01/2012 08:03, Eric Anholt wrote:
>>>>> On Thu, 26 Jan 2012 16:32:24 -0800 (PST), (Matt Turner) wrote:
>>>>>> Module: Mesa
>>>>>> Branch: master
>>>>>> Commit: 80aa78142d12b21dd7d4f0edc786af98a159a80f
>>>>>> URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=80aa78142d12b21dd7d4f0edc786af98a159a80f
>>>>>>
>>>>>> Author: Matt Turner <mattst88 at gmail.com>
>>>>>> Date:   Thu Jan 26 19:31:12 2012 -0500
>>>>>>
>>>>>> dri: make sure to build libdricommon.la
>>>>>
>>>>> Ouch.  Sorry about this, folks, I built with a dirty tree and didn't
>>>>> notice that the rebase off of the drirc changes wasn't good enough.
>>>>
>>>> This commit breaks the ability to build when ./configured -with-driver=dri
>>>> --disable-driglx-direct --with-dri-drivers=swrast for platforms which don't
>>>> have DRM (See [1]), as it tries to build libdricommon.la even if we aren't
>>>> building a dri driver which requires it.
>>>>
>>>> Attached is a patch which fixes this, although I'm not sure if that's the best
>>>> way of solving this problem (it might make more sense to conditionalize on
>>>> DRI_DIRS containing something other than swrast if all dri drivers are going
>>>> to use libdricommon)
>>
>> Attached is a patch which fixes this the other way, which I think is probably
>> better.
> 
> This looks good, except that the HAVE_ check should be put around the
> definitions in common/, not the SUBDIRs.
> 
> (this is a general automake rule, and something that we're failing at in
> Mesa).

Can you be a bit more explicit about what rule we are violating here?

Conditionally constructing SUBDIRS in this fashion is described in the
automake manual (see [1]), and seems to be a common style in automakefiles.

[1]
http://www.gnu.org/software/automake/manual/html_node/Subdirectories-with-AM_005fCONDITIONAL.html#Subdirectories-with-AM_005fCONDITIONAL