Changeset 209859 in webkit

Timestamp:

Dec 15, 2016 5:05:44 AM (7 years ago)

Author:

Claudio Saavedra

Message:

[GTK] Ensure gst* docs are not built with update-webkitgtk-libs
​https://bugs.webkit.org/show_bug.cgi?id=165855

Reviewed by Philippe Normand.

GStreamer's autogen.sh enables gtk-doc always so we end up building
docs even if we disable them. Use the configure script instead, since
we build from packages and these include it already.

• gtk/jhbuild.modules: Use shipped configure instead of autogen.sh for

upstream gstreamer packages.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• gtk/jhbuild.modules (modified) (5 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2016-12-15  Claudio Saavedra  <csaavedra@igalia.com>
+
+        [GTK] Ensure gst* docs are not built with update-webkitgtk-libs
+        https://bugs.webkit.org/show_bug.cgi?id=165855
+
+        Reviewed by Philippe Normand.
+
+        GStreamer's autogen.sh enables gtk-doc always so we end up building
+        docs even if we disable them. Use the configure script instead, since
+        we build from packages and these include it already.
+
+        * gtk/jhbuild.modules: Use shipped configure instead of autogen.sh for
+        upstream gstreamer packages.
+
 2016-12-15  Alex Christensen  <achristensen@webkit.org>
 

trunk/Tools/gtk/jhbuild.modules

@@ -348 +348 @@
   </autotools>
 
-  <autotools id="gstreamer" autogenargs="--disable-gtk-doc">
+  <autotools id="gstreamer" autogen-sh="configure" autogenargs="--disable-gtk-doc">
     <if condition-set="macos">
       <autogenargs value="--disable-introspection"/>
@@ -362 +362 @@
 
   <autotools id="gst-plugins-base"
-             autogen-sh="autogen.sh"
+             autogen-sh="configure"
              autogenargs="--disable-examples --disable-gtk-doc">
     <if condition-set="macos">
@@ -376 +376 @@
   </autotools>
 
-  <autotools id="gst-plugins-good" autogenargs="--disable-examples --disable-soup --disable-gtk-doc">
+  <autotools id="gst-plugins-good" autogen-sh="configure" autogenargs="--disable-examples --disable-soup --disable-gtk-doc">
     <if condition-set="macos">
       <autogenargs value="--disable-introspection"/>
@@ -397 +397 @@
   </autotools>
 
-  <autotools id="gst-plugins-bad" autogenargs="--disable-examples --disable-gtk-doc">
+  <autotools id="gst-plugins-bad" autogen-sh="configure" autogenargs="--disable-examples --disable-gtk-doc">
     <if condition-set="macos">
       <autogenargs value="--disable-introspection"/>
@@ -414 +414 @@
   </autotools>
 
-  <autotools id="gst-libav" autogenargs="--with-libav-extra-configure='--disable-yasm' --disable-gtk-doc">
+  <autotools id="gst-libav" autogen-sh="configure" autogenargs="--with-libav-extra-configure='--disable-yasm' --disable-gtk-doc">
     <dependencies>
       <dep package="gst-plugins-base"/>