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

[Matt Turner]

On Fri, Jan 27, 2012 at 8:11 PM, Jon TURNEY <jon.turney at dronecode.org.uk> wrote:
> On 27/01/2012 08:03, Eric Anholt wrote:
>> On Thu, 26 Jan 2012 16:32:24 -0800 (PST), mattst88 at kemper.freedesktop.org (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)
>
> [1]
> http://tinderbox.freedesktop.org/builds/2012-01-27-0017/logs/libGL-indirect-only/#build

Please change test ... || test ... || ... into test ... -o ... -o ..., ie

AM_CONDITIONAL(HAVE_COMMON_DRI, test x$HAVE_I915_DRI = xyes || test
x$HAVE_I965_DRI = xyes || test x$HAVE_NOUVEAU_DRI = xyes || test
x$HAVE_R200_DRI = xyes || test x$HAVE_RADEON_DRI = xyes)

becomes

AM_CONDITIONAL(HAVE_COMMON_DRI, test x$HAVE_I915_DRI = xyes -o
x$HAVE_I965_DRI = xyes -o x$HAVE_NOUVEAU_DRI = xyes -o x$HAVE_R200_DRI
= xyes -o x$HAVE_RADEON_DRI = xyes)

and it looks like swrast is still broken anyway. It should have
../common/utils.c ../common/drisw_util.c in its sources.