Changeset 95283 in webkit
- Timestamp:
- Sep 16, 2011 4:43:16 AM (13 years ago)
- Location:
- trunk
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r95271 r95283 1 2011-09-16 Martin Robinson <mrobinson@igalia.com> 2 3 [GTK] Disable WebKit2 by default in configure.ac, but enable it with build-webkit 4 https://bugs.webkit.org/show_bug.cgi?id=68178 5 6 Reviewed by Xan Lopez. 7 8 * configure.ac: Do not build WebKit2 by default. Re-add pkgconfig support 9 for WebKit2. 10 1 11 2011-09-15 Adam Barth <abarth@webkit.org> 2 12 -
trunk/Source/WebKit2/ChangeLog
r95271 r95283 1 2011-09-16 Martin Robinson <mrobinson@igalia.com> 2 3 [GTK] Disable WebKit2 by default in configure.ac, but enable it with build-webkit 4 https://bugs.webkit.org/show_bug.cgi?id=68178 5 6 Reviewed by Xan Lopez. 7 8 * GNUmakefile.am: Do not build WebKit2 by default. Re-add pkgconfig support 9 for WebKit2. 10 1 11 2011-09-15 Adam Barth <abarth@webkit.org> 2 12 -
trunk/Source/WebKit2/GNUmakefile.am
r94456 r95283 914 914 $(XT_LIBS) 915 915 916 pkgconfig_DATA += Source/WebKit2/webkit2gtk-@WEBKITGTK_API_VERSION@.pc 917 916 918 # WebKit2 specific variables 917 919 forwarding_headers := $(GENSOURCES_WEBKIT2)/include … … 960 962 $(BUILT_SOURCES) \ 961 963 $(top_builddir)/Programs/WebKitWebProcess 964 965 DISTCLEANFILES += \ 966 $(top_builddir)/WebKit2/webkit2gtk-@WEBKITGTK_API_VERSION@.pc 962 967 963 968 # WebKitWebProcess -
trunk/Tools/ChangeLog
r95258 r95283 1 2011-09-16 Martin Robinson <mrobinson@igalia.com> 2 3 [GTK] Disable WebKit2 by default in configure.ac, but enable it with build-webkit 4 https://bugs.webkit.org/show_bug.cgi?id=68178 5 6 Reviewed by Xan Lopez. 7 8 Add a work-around to enable WebKit2 when using build-webkit. 9 10 * Scripts/webkitdirs.pm: 11 (buildAutotoolsProject): 12 1 13 2011-09-15 James Robinson <jamesr@chromium.org> 2 14 -
trunk/Tools/Scripts/webkitdirs.pm
r95188 r95283 1522 1522 } 1523 1523 1524 # This is a temporary work-around to enable building WebKit2 on the bots, 1525 # but ensuring that it does not ship until the API is stable. 1526 if ($project eq "WebKit" and isGtk()) { 1527 push @buildArgs, "--enable-webkit2"; 1528 } 1529 1524 1530 $prefix = $ENV{"WebKitInstallationPrefix"} if !defined($prefix); 1525 1531 push @buildArgs, "--prefix=" . $prefix if defined($prefix); -
trunk/configure.ac
r95271 r95283 1064 1064 AC_MSG_CHECKING([whether to build Webkit2]) 1065 1065 AC_ARG_ENABLE(webkit2, 1066 AC_HELP_STRING([--enable-webkit2], [build webkit2 [default= yes]]),1067 [], [enable_webkit2=" yes"])1066 AC_HELP_STRING([--enable-webkit2], [build webkit2 [default=no]]), 1067 [], [enable_webkit2="no"]) 1068 1068 AC_MSG_RESULT([$enable_webkit2]) 1069 1069 if test "$enable_webkit2" = "yes"; then … … 1204 1204 ,[WEBKITGTK_API_VERSION=$WEBKITGTK_API_VERSION,WEBKITGTK_PC_NAME=$WEBKITGTK_PC_NAME] 1205 1205 ) 1206 1207 1208 if test "$enable_webkit2" = "yes"; then 1209 AC_CONFIG_FILES([ 1210 Source/WebKit2/webkit2gtk-${WEBKITGTK_API_VERSION}.pc:Source/WebKit2/webkit2gtk.pc.in 1211 ] 1212 ,[WEBKITGTK_API_VERSION=$WEBKITGTK_API_VERSION,WEBKITGTK_PC_NAME=$WEBKITGTK_PC_NAME] 1213 ) 1214 fi 1206 1215 1207 1216 AC_OUTPUT
Note: See TracChangeset
for help on using the changeset viewer.