Title: [145532] releases/WebKitGTK/webkit-2.0
- Revision
- 145532
- Author
- [email protected]
- Date
- 2013-03-12 05:27:31 -0700 (Tue, 12 Mar 2013)
Log Message
Merge r145427 - [Autotools] Set ENABLE_GTK_DOC to false if gtk-doc is not installed
https://bugs.webkit.org/show_bug.cgi?id=111980
Patch by Tobias Mueller <[email protected]> on 2013-03-11
Reviewed by Martin Robinson.
WebKit did not configure if gtk-doc-am was not installed with the error:
Tools/GNUmakefile.am:419: ENABLE_GTK_DOC does not appear in AM_CONDITIONAL
* Source/autotools/FindDependencies.m4:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.0/ChangeLog (145531 => 145532)
--- releases/WebKitGTK/webkit-2.0/ChangeLog 2013-03-12 12:23:41 UTC (rev 145531)
+++ releases/WebKitGTK/webkit-2.0/ChangeLog 2013-03-12 12:27:31 UTC (rev 145532)
@@ -1,3 +1,15 @@
+2013-03-11 Tobias Mueller <[email protected]>
+
+ [Autotools] Set ENABLE_GTK_DOC to false if gtk-doc is not installed
+ https://bugs.webkit.org/show_bug.cgi?id=111980
+
+ Reviewed by Martin Robinson.
+
+ WebKit did not configure if gtk-doc-am was not installed with the error:
+ Tools/GNUmakefile.am:419: ENABLE_GTK_DOC does not appear in AM_CONDITIONAL
+
+ * Source/autotools/FindDependencies.m4:
+
2013-03-05 Gustavo Noronha Silva <[email protected]>
Unreviewed build fix.
Modified: releases/WebKitGTK/webkit-2.0/Source/autotools/FindDependencies.m4 (145531 => 145532)
--- releases/WebKitGTK/webkit-2.0/Source/autotools/FindDependencies.m4 2013-03-12 12:23:41 UTC (rev 145531)
+++ releases/WebKitGTK/webkit-2.0/Source/autotools/FindDependencies.m4 2013-03-12 12:27:31 UTC (rev 145532)
@@ -509,4 +509,8 @@
AC_SUBST([ATSPI2_LIBS])
fi
+m4_ifdef([GTK_DOC_CHECK], [
GTK_DOC_CHECK([1.10])
+],[
+AM_CONDITIONAL([ENABLE_GTK_DOC], false)
+])
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
