Title: [142158] trunk
Revision
142158
Author
[email protected]
Date
2013-02-07 11:31:52 -0800 (Thu, 07 Feb 2013)

Log Message

[Autotools] Remove uses of Automake FARSTREAM_(CFLAGS|LIBS) variables, USE_FARSTREAM conditional
https://bugs.webkit.org/show_bug.cgi?id=109198

Reviewed by Martin Robinson.

.: 

* GNUmakefile.am: The USE_FARSTREAM conditional is being removed while the WTF_USE_FARSTREAM
define is currently a no-op.
* configure.ac: Don't set the Automake conditional as it's currently not needed due
to checking for Farstream dependency being removed in r142005.

Source/WebCore: 

* GNUmakefile.am: Remove FARSTREAM_CFLAGS variable, it's not set to anything.

Source/WebKit2: 

* GNUmakefile.am: Remove the FARSTREAM_(CFLAGS|LIBS) variables, they're
not set to anything.

Modified Paths

Diff

Modified: trunk/ChangeLog (142157 => 142158)


--- trunk/ChangeLog	2013-02-07 19:19:06 UTC (rev 142157)
+++ trunk/ChangeLog	2013-02-07 19:31:52 UTC (rev 142158)
@@ -1,3 +1,15 @@
+2013-02-07  Zan Dobersek  <[email protected]>
+
+        [Autotools] Remove uses of Automake FARSTREAM_(CFLAGS|LIBS) variables, USE_FARSTREAM conditional
+        https://bugs.webkit.org/show_bug.cgi?id=109198
+
+        Reviewed by Martin Robinson.
+
+        * GNUmakefile.am: The USE_FARSTREAM conditional is being removed while the WTF_USE_FARSTREAM
+        define is currently a no-op.
+        * configure.ac: Don't set the Automake conditional as it's currently not needed due
+        to checking for Farstream dependency being removed in r142005.
+
 2013-02-07  Gavin Peters  <[email protected]>
 
         Unreviewed, rolling out r142141.

Modified: trunk/GNUmakefile.am (142157 => 142158)


--- trunk/GNUmakefile.am	2013-02-07 19:19:06 UTC (rev 142157)
+++ trunk/GNUmakefile.am	2013-02-07 19:31:52 UTC (rev 142158)
@@ -209,11 +209,6 @@
 	-DWTF_USE_GSTREAMER=1
 endif
 
-if USE_FARSTREAM
-global_cppflags += \
-	-DWTF_USE_FARSTREAM=1
-endif
-
 if USE_ACCELERATED_COMPOSITING
 global_cppflags += \
 	-DWTF_USE_ACCELERATED_COMPOSITING=1 \

Modified: trunk/Source/WebCore/ChangeLog (142157 => 142158)


--- trunk/Source/WebCore/ChangeLog	2013-02-07 19:19:06 UTC (rev 142157)
+++ trunk/Source/WebCore/ChangeLog	2013-02-07 19:31:52 UTC (rev 142158)
@@ -1,3 +1,12 @@
+2013-02-07  Zan Dobersek  <[email protected]>
+
+        [Autotools] Remove uses of Automake FARSTREAM_(CFLAGS|LIBS) variables, USE_FARSTREAM conditional
+        https://bugs.webkit.org/show_bug.cgi?id=109198
+
+        Reviewed by Martin Robinson.
+
+        * GNUmakefile.am: Remove FARSTREAM_CFLAGS variable, it's not set to anything.
+
 2013-02-07   Vineet Chaudhary  <[email protected]>
 
         Consider replacing return type of Clipboard::types() from ListHashSet<String> to Vector<String>

Modified: trunk/Source/WebCore/GNUmakefile.am (142157 => 142158)


--- trunk/Source/WebCore/GNUmakefile.am	2013-02-07 19:19:06 UTC (rev 142157)
+++ trunk/Source/WebCore/GNUmakefile.am	2013-02-07 19:31:52 UTC (rev 142158)
@@ -736,7 +736,6 @@
 	$(CLUTTER_CFLAGS) \
 	$(COVERAGE_CFLAGS) \
 	$(ENCHANT_CFLAGS) \
-	$(FARSTREAM_CFLAGS) \
 	$(FREETYPE_CFLAGS) \
 	$(GAIL_CFLAGS) \
 	$(GAMEPAD_CFLAGS) \

Modified: trunk/Source/WebKit2/ChangeLog (142157 => 142158)


--- trunk/Source/WebKit2/ChangeLog	2013-02-07 19:19:06 UTC (rev 142157)
+++ trunk/Source/WebKit2/ChangeLog	2013-02-07 19:31:52 UTC (rev 142158)
@@ -1,3 +1,13 @@
+2013-02-07  Zan Dobersek  <[email protected]>
+
+        [Autotools] Remove uses of Automake FARSTREAM_(CFLAGS|LIBS) variables, USE_FARSTREAM conditional
+        https://bugs.webkit.org/show_bug.cgi?id=109198
+
+        Reviewed by Martin Robinson.
+
+        * GNUmakefile.am: Remove the FARSTREAM_(CFLAGS|LIBS) variables, they're
+        not set to anything.
+
 2013-02-07  Kenneth Rohde Christiansen  <[email protected]>
 
         [WK2][EFL] Add WKView methods related to background drawing

Modified: trunk/Source/WebKit2/GNUmakefile.am (142157 => 142158)


--- trunk/Source/WebKit2/GNUmakefile.am	2013-02-07 19:19:06 UTC (rev 142157)
+++ trunk/Source/WebKit2/GNUmakefile.am	2013-02-07 19:31:52 UTC (rev 142158)
@@ -195,7 +195,6 @@
 	$(CAIRO_LIBS) \
 	$(CLUTTER_LIBS) \
 	$(COVERAGE_LDFLAGS) \
-	$(FARSTREAM_LIBS) \
 	$(FREETYPE_LIBS) \
 	$(GAIL_LIBS) \
 	$(GAMEPAD_LIBS) \
@@ -488,7 +487,6 @@
 	$(ENCHANT_CFLAGS) \
 	$(GEOCLUE_CFLAGS) \
 	$(FREETYPE_CFLAGS) \
-	$(FARSTREAM_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(GSTREAMER_CFLAGS) \
 	$(GTK2_CFLAGS) \

Modified: trunk/configure.ac (142157 => 142158)


--- trunk/configure.ac	2013-02-07 19:19:06 UTC (rev 142157)
+++ trunk/configure.ac	2013-02-07 19:31:52 UTC (rev 142158)
@@ -1042,9 +1042,6 @@
 AM_CONDITIONAL([USE_GLES2], [test "$enable_gles2" = "yes"])
 AM_CONDITIONAL([USE_GLX], [test "$enable_glx" = "yes"])
 
-# Farstream feature conditional.
-AM_CONDITIONAL([USE_FARSTREAM], [test "$have_farstream" = "yes"])
-
 #######################################################################################
 #                                     ATTENTION                                       #
 # Please refer to the following guidelines if you're about to add an Automake         #
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to