Title: [107565] trunk
- Revision
- 107565
- Author
- [email protected]
- Date
- 2012-02-13 06:16:32 -0800 (Mon, 13 Feb 2012)
Log Message
[GTK] Revise configuration for MHTML
https://bugs.webkit.org/show_bug.cgi?id=78364
Patch by ChangSeok Oh <[email protected]> on 2012-02-13
Reviewed by Gustavo Noronha Silva.
.:
Added some lines to show checking messages, whether mhtml is enabled or not
during configuration and the configuration result for mhtml.
MHTML is a web page archive format used to combine resources
that are typically represented by external links (such as images, Flash animations,
Java applets, audio files) together with HTML code into a single file.
http://en.wikipedia.org/wiki/MHTML
* configure.ac:
Source/WebCore:
Added mhtml directory and removed target files duplicated to build when enabling mhtml.
Archive.cpp, ArchiveFactory.cpp & their headers are included at the above line.
This duplication has caused build-break if mhtml is enabled.
No new tests, since no new features.
* GNUmakefile.am:
* GNUmakefile.list.am:
Modified Paths
Diff
Modified: trunk/ChangeLog (107564 => 107565)
--- trunk/ChangeLog 2012-02-13 13:59:13 UTC (rev 107564)
+++ trunk/ChangeLog 2012-02-13 14:16:32 UTC (rev 107565)
@@ -1,3 +1,19 @@
+2012-02-13 ChangSeok Oh <[email protected]>
+
+ [GTK] Revise configuration for MHTML
+ https://bugs.webkit.org/show_bug.cgi?id=78364
+
+ Reviewed by Gustavo Noronha Silva.
+
+ Added some lines to show checking messages, whether mhtml is enabled or not
+ during configuration and the configuration result for mhtml.
+ MHTML is a web page archive format used to combine resources
+ that are typically represented by external links (such as images, Flash animations,
+ Java applets, audio files) together with HTML code into a single file.
+ http://en.wikipedia.org/wiki/MHTML
+
+ * configure.ac:
+
2012-02-06 Raphael Kubo da Costa <[email protected]>
[EFL] Drop support for the Curl network backend.
Modified: trunk/Source/WebCore/ChangeLog (107564 => 107565)
--- trunk/Source/WebCore/ChangeLog 2012-02-13 13:59:13 UTC (rev 107564)
+++ trunk/Source/WebCore/ChangeLog 2012-02-13 14:16:32 UTC (rev 107565)
@@ -1,3 +1,19 @@
+2012-02-13 ChangSeok Oh <[email protected]>
+
+ [GTK] Revise configuration for MHTML
+ https://bugs.webkit.org/show_bug.cgi?id=78364
+
+ Reviewed by Gustavo Noronha Silva.
+
+ Added mhtml directory and removed target files duplicated to build when enabling mhtml.
+ Archive.cpp, ArchiveFactory.cpp & their headers are included at the above line.
+ This duplication has caused build-break if mhtml is enabled.
+
+ No new tests, since no new features.
+
+ * GNUmakefile.am:
+ * GNUmakefile.list.am:
+
2012-02-06 Raphael Kubo da Costa <[email protected]>
[EFL] Drop support for the Curl network backend.
Modified: trunk/Source/WebCore/GNUmakefile.am (107564 => 107565)
--- trunk/Source/WebCore/GNUmakefile.am 2012-02-13 13:59:13 UTC (rev 107564)
+++ trunk/Source/WebCore/GNUmakefile.am 2012-02-13 14:16:32 UTC (rev 107565)
@@ -588,7 +588,9 @@
# ---
if ENABLE_MHTML
FEATURE_DEFINES += ENABLE_MHTML=1
-webcore_cppflags += -DENABLE_MHTML=1
+webcore_cppflags += \
+ -DENABLE_MHTML=1 \
+ -I$(srcdir)/Source/WebCore/loader/archive/mhtml
endif # END ENABLE_MHTML
# ---
Modified: trunk/Source/WebCore/GNUmakefile.list.am (107564 => 107565)
--- trunk/Source/WebCore/GNUmakefile.list.am 2012-02-13 13:59:13 UTC (rev 107564)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2012-02-13 14:16:32 UTC (rev 107565)
@@ -5697,10 +5697,6 @@
# ---
if ENABLE_MHTML
webcore_sources += \
- Source/WebCore/loader/archive/Archive.cpp \
- Source/WebCore/loader/archive/Archive.h \
- Source/WebCore/loader/archive/ArchiveFactory.cpp \
- Source/WebCore/loader/archive/ArchiveFactory.h \
Source/WebCore/loader/archive/mhtml/MHTMLArchive.cpp \
Source/WebCore/loader/archive/mhtml/MHTMLArchive.h \
Source/WebCore/loader/archive/mhtml/MHTMLParser.cpp \
Modified: trunk/configure.ac (107564 => 107565)
--- trunk/configure.ac 2012-02-13 13:59:13 UTC (rev 107564)
+++ trunk/configure.ac 2012-02-13 14:16:32 UTC (rev 107565)
@@ -805,6 +805,14 @@
[],[enable_mathml="yes"])
AC_MSG_RESULT([$enable_mathml])
+# check whether to enable MHTML support
+AC_MSG_CHECKING([whether to enable MHTML support])
+AC_ARG_ENABLE(mhtml,
+ AC_HELP_STRING([--enable-mhtml],
+ [enable support for MHTML [default=no]]),
+ [],[enable_mhtml="no"])
+AC_MSG_RESULT([$enable_mhtml])
+
# check whether to enable SVG support
AC_MSG_CHECKING([whether to enable SVG support])
AC_ARG_ENABLE(svg,
@@ -1427,6 +1435,7 @@
MathML support : $enable_mathml
Media source : $enable_media_source
Media statistics : $enable_media_statistics
+ MHTML support : $enable_mhtml
HTML5 channel messaging support : $enable_channel_messaging
HTML5 meter element support : $enable_meter_tag
HTML5 microdata support : $enable_microdata
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
