diff options
| author | Eli Zaretskii | 2012-04-07 16:57:36 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2012-04-07 16:57:36 +0300 |
| commit | 9078ead6ce0237eb566a2779016560c85fff5768 (patch) | |
| tree | 965a35cb3e4e5f7b83edfd65712ce40105dc1fd5 /lib-src | |
| parent | e4ecc6a217dfe759fdb7859b38079e66368944d2 (diff) | |
| download | emacs-9078ead6ce0237eb566a2779016560c85fff5768.tar.gz emacs-9078ead6ce0237eb566a2779016560c85fff5768.zip | |
Support building on MS-Windows with libxml2.
src/makefile.w32-in (OBJ2): Add xml.$(O).
(GLOBAL_SOURCES): Add xml.c.
($(BLD)/xml.$(O)): New dependency list.
src/xml.c (DEF_XML2_FN, LOAD_XML2_FN) [WINDOWSNT]: New macros.
(fn_htmlReadMemory, fn_xmlReadMemory, fn_xmlDocGetRootElement)
(fn_xmlFreeDoc, fn_xmlCleanupParser, fn_xmlCheckVersion)
[!WINDOWSNT]: New macros.
(init_libxml2_functions, libxml2_loaded_p): New functions.
(parse_region): Call fn_xmlCheckVersion instead of using the macro
LIBXML_TEST_VERSION. Call libxml2 functions via the fn_* macros.
(xml_cleanup_parser): New function, export for fn_xmlCleanupParser.
Calls xmlCleanupParser only if libxml2 was loaded (or statically
linked in).
(Flibxml_parse_html_region, Flibxml_parse_xml_region): Call
init_libxml2_functions before calling libxml2 functions.
(syms_of_xml) <Qlibxml2_dll>: DEFSYM it.
src/emacs.c: Don't include libxml/parser.h.
(shut_down_emacs): Call xml_cleanup_parser, instead of calling
xmlCleanupParser directly.
src/ lisp.h [HAVE_LIBXML2]: Add prototype for xml_cleanup_parser.
nt/configure.bat: Support building with libxml2.
nt/INSTALL:
nt/README.W32: Add information about libxml2.
lisp/term/w32-win.el (dynamic-library-alist): Add libxml2 DLLs.
lib-src/makefile.w32-in (obj): Add xml.o.
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 4 | ||||
| -rw-r--r-- | lib-src/makefile.w32-in | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 0d0a69c367e..aad382de6d0 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog | |||
| @@ -1,5 +1,9 @@ | |||
| 1 | 2012-04-07 Eli Zaretskii <eliz@gnu.org> | 1 | 2012-04-07 Eli Zaretskii <eliz@gnu.org> |
| 2 | 2 | ||
| 3 | * makefile.w32-in (obj): Add xml.o. | ||
| 4 | |||
| 5 | 2012-04-07 Eli Zaretskii <eliz@gnu.org> | ||
| 6 | |||
| 3 | * makefile.w32-in (ALL): Now the list of executables, not of phony | 7 | * makefile.w32-in (ALL): Now the list of executables, not of phony |
| 4 | targets. | 8 | targets. |
| 5 | (.PHONY): Only make-docfile is its prerequisite now. | 9 | (.PHONY): Only make-docfile is its prerequisite now. |
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in index f329ba86f6d..316e4fb127f 100644 --- a/lib-src/makefile.w32-in +++ b/lib-src/makefile.w32-in | |||
| @@ -135,7 +135,7 @@ obj = dosfns.o msdos.o \ | |||
| 135 | process.o callproc.o unexw32.o \ | 135 | process.o callproc.o unexw32.o \ |
| 136 | region-cache.o sound.o atimer.o \ | 136 | region-cache.o sound.o atimer.o \ |
| 137 | doprnt.o intervals.o textprop.o composite.o \ | 137 | doprnt.o intervals.o textprop.o composite.o \ |
| 138 | gnutls.o | 138 | gnutls.o xml.o |
| 139 | 139 | ||
| 140 | # | 140 | # |
| 141 | # These are the lisp files that are loaded up in loadup.el | 141 | # These are the lisp files that are loaded up in loadup.el |