Bug 68178 – [GTK] Disable WebKit2 by default in configure.ac, but enable it with build-webkit

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKitGTK

[Martin Robinson]

We do not want to ship WebKit2 yet, so we should disable it in configure.ac. We want the bots to test the build though, so we should enable it during calls to build-webkit.

[Martin Robinson]

Created attachment 107527 [details]
Patch

[Carlos Garcia Campos]

Comment on attachment 107527 [details]
Patch

Looks good to me

[Xan Lopez]

Comment on attachment 107527 [details]
Patch

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

> Source/WebKit2/GNUmakefile.am:916
> +pkgconfig_DATA += Source/WebKit2/webkit2gtk-@WEBKITGTK_API_VERSION@.pc

Shouldn't this have $(top_builddir)? Otherwise might be ambiguous?

[Carlos Garcia Campos]

(In reply to comment #3)
> (From update of attachment 107527 [details])
> View in context: https://bugs.webkit.org/attachment.cgi?id=107527&action=review
> 
> > Source/WebKit2/GNUmakefile.am:916
> > +pkgconfig_DATA += Source/WebKit2/webkit2gtk-@WEBKITGTK_API_VERSION@.pc
> 
> Shouldn't this have $(top_builddir)? Otherwise might be ambiguous?

We have the same for the other .pc files, so if this is wrong we should fix all of them:

pkgconfig_DATA += Source/WebKit/gtk/@WEBKITGTK_PC_NAME@-@WEBKITGTK_API_VERSION@.pc
pkgconfig_DATA += Source/JavaScriptCore/javascriptcoregtk-@WEBKITGTK_API_VERSION@.pc

[Carlos Garcia Campos]

Committed r95283: <http://trac.webkit.org/changeset/95283>

[Xan Lopez]

(In reply to comment #4)
> We have the same for the other .pc files, so if this is wrong we should fix all of them:
> 
> pkgconfig_DATA += Source/WebKit/gtk/@WEBKITGTK_PC_NAME@-@WEBKITGTK_API_VERSION@.pc
> pkgconfig_DATA += Source/JavaScriptCore/javascriptcoregtk-@WEBKITGTK_API_VERSION@.pc

Well, ok, but that does not really answer anything. I'd have expected someone to say whether it's wrong or not before committing...

[Carlos Garcia Campos]

(In reply to comment #6)
> (In reply to comment #4)
> > We have the same for the other .pc files, so if this is wrong we should fix all of them:
> > 
> > pkgconfig_DATA += Source/WebKit/gtk/@WEBKITGTK_PC_NAME@-@WEBKITGTK_API_VERSION@.pc
> > pkgconfig_DATA += Source/JavaScriptCore/javascriptcoregtk-@WEBKITGTK_API_VERSION@.pc
> 
> Well, ok, but that does not really answer anything. I'd have expected someone to say whether it's wrong or not before committing...

we are trying to release, and webkit2 breaks distcheck.