Bug 121703 – [Autotools] Rework the build target selection

• Status: RESOLVED
• Resolution: FIXED
• Component: New Bugs

[Zan Dobersek]

[Autotools] Rework the build target selection

[Zan Dobersek]

Created attachment 212203 [details]
Patch

[WebKit Commit Bot]

Attachment 212203 [details] did not pass style-queue:

Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'ChangeLog', u'Source/autotools/CheckSystemAndBasicDependencies.m4', u'Source/autotools/FindDependencies.m4', u'Source/autotools/PrintBuildConfiguration.m4', u'Source/autotools/ReadCommandLineArguments.m4', u'Source/autotools/SetupAutoconfHeader.m4', u'Source/autotools/SetupAutomake.m4', u'configure.ac']" exit_code: 1
ChangeLog:9:  Need whitespace between colon and description  [changelog/filechangedescriptionwhitespace] [5]
ChangeLog:10:  Need whitespace between colon and description  [changelog/filechangedescriptionwhitespace] [5]
ChangeLog:11:  Need whitespace between colon and description  [changelog/filechangedescriptionwhitespace] [5]
ChangeLog:12:  Need whitespace between colon and description  [changelog/filechangedescriptionwhitespace] [5]
ChangeLog:13:  Need whitespace between colon and description  [changelog/filechangedescriptionwhitespace] [5]
Total errors found: 5 in 8 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[kov's GTK+ EWS bot]

Comment on attachment 212203 [details]
Patch

Attachment 212203 [details] did not pass gtk-wk2-ews (gtk-wk2):
Output: http://webkit-queues.appspot.com/results/2004310

[Zan Dobersek]

Created attachment 212209 [details]
Patch

[Gustavo Noronha (kov)]

Comment on attachment 212209 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=212209&action=review

> Source/autotools/CustomMacros.m4:24
> +dnl AM_APPEND_TO_DESCRIPTION([DESCRIPTION], [STRING])
> +AC_DEFUN([AM_APPEND_TO_DESCRIPTION], [
> +  if test "$$1" != ""; then
> +    $1="${$1}, "
> +  fi
> +

Didn't we have something similar to this for the EGL/GLX/GLES2 stuff?

> Source/autotools/FindDependencies.m4:157
> -if test "$with_target" = "directfb"; then
> +if test "$enable_directdb_target" = "yes"; then
>      PKG_CHECK_MODULES(CAIRO, cairo-directfb >= cairo_required_version)
>      PKG_CHECK_MODULES(GTK, gtk+-directfb-2.0 >= $GTK_REQUIRED_VERSION)
>  else

This if/else should probably not be an else any longer, the directfb deps should be an addition to the other ones, not an alternative. CAIRO_DIRECTFB and GTK_DIRECTFB in order?

> ChangeLog:15
> +        By default, the X11 target is enabled. This set is preserved only if no --enable-*-target flag

This set? This default, maybe?

[Zan Dobersek]

Comment on attachment 212209 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=212209&action=review

>> Source/autotools/CustomMacros.m4:24
>> +
> 
> Didn't we have something similar to this for the EGL/GLX/GLES2 stuff?

I think you're thinking of the manufacturing of the description of all the enabled AC backends. That code is still there and I think it could be changed to use this macro.

>> Source/autotools/FindDependencies.m4:157
>>  else
> 
> This if/else should probably not be an else any longer, the directfb deps should be an addition to the other ones, not an alternative. CAIRO_DIRECTFB and GTK_DIRECTFB in order?

OK, I'll also append the CAIRO_DIRECTFB_* and GTK_DIRECTFB_* variables to the main ones so we don't have to go into changing all the GNUmakefiles.

>> ChangeLog:15
>> +        By default, the X11 target is enabled. This set is preserved only if no --enable-*-target flag
> 
> This set? This default, maybe?

OK.

[Zan Dobersek]

Committed r156271: <http://trac.webkit.org/changeset/156271>