[Intel-gfx] [RFC i-g-t 1/9] configure.ac: Test for libdrm_intel and build for it if present.

Robert Foss robert.foss at collabora.com
Sat May 21 13:15:02 UTC 2016



On 2016-05-21 03:55 AM, Chris Wilson wrote:
> On Fri, May 20, 2016 at 06:59:25PM -0400, robert.foss at collabora.com wrote:
>> From: Robert Foss <robert.foss at collabora.com>
>>
>> Test for libdrm_intel and build for it if present.
>> Also expose the HAVE_INTEL #define to allow code to be conditionally
>> compiled.
>>
>> Signed-off-by: Robert Foss <robert.foss at collabora.com>
>> ---
>>   configure.ac | 14 +++++++++++++-
>>   1 file changed, 13 insertions(+), 1 deletion(-)
>>
>> diff --git a/configure.ac b/configure.ac
>> index 0589782..b6fc168 100644
>> --- a/configure.ac
>> +++ b/configure.ac
>> @@ -100,7 +100,7 @@ if test "x$GCC" = "xyes"; then
>>   fi
>>   AC_SUBST(ASSEMBLER_WARN_CFLAGS)
>>
>> -PKG_CHECK_MODULES(DRM, [libdrm_intel >= 2.4.64 libdrm])
>> +PKG_CHECK_MODULES(DRM, [libdrm])
>>   PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10])
>>
>>   case "$target_cpu" in
>> @@ -150,6 +150,18 @@ PKG_CHECK_MODULES(GLIB, glib-2.0)
>>   # -----------------------------------------------------------------------------
>>   #			Configuration options
>>   # -----------------------------------------------------------------------------
>> +AC_ARG_ENABLE(intel, AS_HELP_STRING([--disable-intel],
>> +	      [Enable building of intel specific parts (default: auto)]),
>> +	      [INTEL=$enableval], [INTEL=auto])
>> +if test "x$INTEL" = xauto; then
>> +	PKG_CHECK_EXISTS([libdrm_intel >= 2.4.64], [INTEL=yes], [INTEL=no])
>> +fi
>> +if test "x$INTEL" = xyes; then
>> +	PKG_CHECK_MODULES(DRM_INTEL, [libdrm_intel >= 2.4.64])
>> +	AC_DEFINE(HAVE_INTEL, 1, [Have intel support])
>> +fi
>> +AM_CONDITIONAL(HAVE_INTEL, [test "x$INTEL" = xyes])
>
> HAVE_INTEL caused quite a bit of confusion when reading the later build
> patches.
>
> Please use HAVE_LIBDRM_INTEL instead
> -Chris
>

That is definitely better, I've added it to v2.
Thanks for the suggestion.

Rob.


More information about the Intel-gfx mailing list