Changeset 109754 in webkit

Timestamp:

Mar 5, 2012 8:55:37 AM (12 years ago)

Author:

joone.hur@collabora.co.uk

Message:

[GTK] zlib link error with --enable-webkit2
​https://bugs.webkit.org/show_bug.cgi?id=79877

Reviewed by Martin Robinson.

zlib should be linked properly.

• GNUmakefile.am: Link $(ZLIB_LIBS) with libwebkit2gtk instead of

linking it with WebKitWebProcess.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• GNUmakefile.am (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-03-05  Joone Hur  <joone.hur@collabora.co.uk>
+
+        [GTK] zlib link error with --enable-webkit2
+        https://bugs.webkit.org/show_bug.cgi?id=79877
+
+        Reviewed by Martin Robinson.
+
+        zlib should be linked properly.
+
+        * GNUmakefile.am: Link $(ZLIB_LIBS) with libwebkit2gtk instead of
+        linking it with WebKitWebProcess.
+
 2012-03-05  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit2/GNUmakefile.am

@@ -1109 +1109 @@
         $(UNICODE_LIBS) \
         $(XRENDER_LIBS) \
-        $(XT_LIBS)
+        $(XT_LIBS) \
+        $(ZLIB_LIBS)
 
 if ENABLE_WEBKIT2
@@ -1279 +1280 @@
         $(GTK_LIBS) \
         $(GTK_UNIX_PRINTING_LIBS) \
-        $(LIBSOUP_LIBS) \
-        $(ZLIB_LIBS)
+        $(LIBSOUP_LIBS)
 
 Programs_WebKitWebProcess_LDFLAGS = \
@@ -1325 +1325 @@
         $(UNICODE_CFLAGS) \
         $(XRENDER_CFLAGS) \
-        $(XT_CFLAGS) \
-        $(ZLIB_LIBS)
+        $(XT_CFLAGS)
 
 libexec_PROGRAMS += \