mirror of
https://gitlab.gnome.org/GNOME/libxml2
synced 2025-03-28 21:33:13 +00:00
480323 add code to plug in ICU converters by default
This is not configured in by default but after some serious massaging incorporate that patch from Chromium/Chrome.
This commit is contained in:
Giuseppe Iuculano
Daniel Veillard
parent
fbd4ddf226
commit
48f7dcb724
19
configure.in
19
configure.in
@ -128,6 +128,8 @@ AC_ARG_WITH(http,
|
||||
[ --with-http add the HTTP support (on)])
|
||||
AC_ARG_WITH(iconv,
|
||||
[ --with-iconv[[=DIR]] add ICONV support (on)])
|
||||
AC_ARG_WITH(icu,
|
||||
[ --with-icu add ICU support (off)])
|
||||
AC_ARG_WITH(iso8859x,
|
||||
[ --with-iso8859x add ISO8859X support if no iconv (on)])
|
||||
AC_ARG_WITH(legacy,
|
||||
@ -1321,6 +1323,23 @@ XML_LIBS="-lxml2 $Z_LIBS $THREAD_LIBS $ICONV_LIBS $M_LIBS $LIBS"
|
||||
XML_LIBTOOLLIBS="libxml2.la"
|
||||
AC_SUBST(WITH_ICONV)
|
||||
|
||||
WITH_ICU=0
|
||||
if test "$with_icu" != "yes" ; then
|
||||
echo Disabling ICU support
|
||||
else
|
||||
ICU_CONFIG=icu-config
|
||||
if ${ICU_CONFIG} --cflags >/dev/null 2>&1
|
||||
then
|
||||
ICU_LIBS=`icu-config --ldflags`
|
||||
LDFLAGS="$LDFLAGS $ICU_LIBS"
|
||||
WITH_ICU=1
|
||||
echo Enabling ICU support
|
||||
else
|
||||
AC_MSG_ERROR([libicu config program icu-config not found])
|
||||
fi
|
||||
fi
|
||||
AC_SUBST(WITH_ICU)
|
||||
|
||||
WITH_ISO8859X=1
|
||||
if test "$WITH_ICONV" != "1" ; then
|
||||
if test "$with_iso8859x" = "no" ; then
|
||||
|
||||
809
encoding.c
809
encoding.c
File diff suppressed because it is too large
Load Diff
@ -27,6 +27,9 @@
|
||||
#ifdef LIBXML_ICONV_ENABLED
|
||||
#include <iconv.h>
|
||||
#endif
|
||||
#ifdef LIBXML_ICU_ENABLED
|
||||
#include <unicode/ucnv.h>
|
||||
#endif
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
@ -125,6 +128,13 @@ typedef int (* xmlCharEncodingOutputFunc)(unsigned char *out, int *outlen,
|
||||
* Block defining the handlers for non UTF-8 encodings.
|
||||
* If iconv is supported, there are two extra fields.
|
||||
*/
|
||||
#ifdef LIBXML_ICU_ENABLED
|
||||
struct _uconv_t {
|
||||
UConverter *uconv; /* for conversion between an encoding and UTF-16 */
|
||||
UConverter *utf8; /* for conversion between UTF-8 and UTF-16 */
|
||||
};
|
||||
typedef struct _uconv_t uconv_t;
|
||||
#endif
|
||||
|
||||
typedef struct _xmlCharEncodingHandler xmlCharEncodingHandler;
|
||||
typedef xmlCharEncodingHandler *xmlCharEncodingHandlerPtr;
|
||||
@ -136,6 +146,10 @@ struct _xmlCharEncodingHandler {
|
||||
iconv_t iconv_in;
|
||||
iconv_t iconv_out;
|
||||
#endif /* LIBXML_ICONV_ENABLED */
|
||||
#ifdef LIBXML_ICU_ENABLED
|
||||
uconv_t *uconv_in;
|
||||
uconv_t *uconv_out;
|
||||
#endif /* LIBXML_ICU_ENABLED */
|
||||
};
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
||||
@ -1222,6 +1222,7 @@ typedef enum {
|
||||
XML_WITH_DEBUG_MEM = 29,
|
||||
XML_WITH_DEBUG_RUN = 30,
|
||||
XML_WITH_ZLIB = 31,
|
||||
XML_WITH_ICU = 32,
|
||||
XML_WITH_NONE = 99999 /* just to be sure of allocation size */
|
||||
} xmlFeature;
|
||||
|
||||
@ -1232,4 +1233,3 @@ XMLPUBFUN int XMLCALL
|
||||
}
|
||||
#endif
|
||||
#endif /* __XML_PARSER_H__ */
|
||||
|
||||
|
||||
@ -268,6 +268,15 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
|
||||
#define LIBXML_ICONV_ENABLED
|
||||
#endif
|
||||
|
||||
/**
|
||||
* LIBXML_ICU_ENABLED:
|
||||
*
|
||||
* Whether icu support is available
|
||||
*/
|
||||
#if @WITH_ICU@
|
||||
#define LIBXML_ICU_ENABLED
|
||||
#endif
|
||||
|
||||
/**
|
||||
* LIBXML_ISO8859X_ENABLED:
|
||||
*
|
||||
|
||||
6
parser.c
6
parser.c
@ -953,6 +953,12 @@ xmlHasFeature(xmlFeature feature)
|
||||
return(1);
|
||||
#else
|
||||
return(0);
|
||||
#endif
|
||||
case XML_WITH_ICU:
|
||||
#ifdef LIBXML_ICU_ENABLED
|
||||
return(1);
|
||||
#else
|
||||
return(0);
|
||||
#endif
|
||||
default:
|
||||
break;
|
||||
|
||||
@ -71,6 +71,9 @@ LIBS = $(LIBS) wsock32.lib ws2_32.lib
|
||||
!if "$(WITH_ICONV)" == "1"
|
||||
LIBS = $(LIBS) iconv.lib
|
||||
!endif
|
||||
+!if "$(WITH_ICU)" == "1"
|
||||
+LIBS = $(LIBS) icu.lib
|
||||
+!endif
|
||||
!if "$(WITH_ZLIB)" == "1"
|
||||
LIBS = $(LIBS) zdll.lib
|
||||
!endif
|
||||
|
||||
@ -40,6 +40,7 @@ var withXpath = true;
|
||||
var withXptr = true;
|
||||
var withXinclude = true;
|
||||
var withIconv = true;
|
||||
var withIcu = false;
|
||||
var withIso8859x = false;
|
||||
var withZlib = false;
|
||||
var withDebug = true;
|
||||
@ -124,6 +125,7 @@ function usage()
|
||||
txt += " xptr: Enable XPointer support (" + (withXptr? "yes" : "no") + ")\n";
|
||||
txt += " xinclude: Enable XInclude support (" + (withXinclude? "yes" : "no") + ")\n";
|
||||
txt += " iconv: Enable iconv support (" + (withIconv? "yes" : "no") + ")\n";
|
||||
txt += " icu: Enable icu support (" + (withIcu? "yes" : "no") + ")\n";
|
||||
txt += " iso8859x: Enable ISO8859X support (" + (withIso8859x? "yes" : "no") + ")\n";
|
||||
txt += " zlib: Enable zlib support (" + (withZlib? "yes" : "no") + ")\n";
|
||||
txt += " xml_debug: Enable XML debbugging module (" + (withDebug? "yes" : "no") + ")\n";
|
||||
@ -233,6 +235,7 @@ function discoverVersion()
|
||||
vf.WriteLine("WITH_XPTR=" + (withXptr? "1" : "0"));
|
||||
vf.WriteLine("WITH_XINCLUDE=" + (withXinclude? "1" : "0"));
|
||||
vf.WriteLine("WITH_ICONV=" + (withIconv? "1" : "0"));
|
||||
vf.WriteLine("WITH_ICU=" + (withIcu? "1" : "0"));
|
||||
vf.WriteLine("WITH_ISO8859X=" + (withIso8859x? "1" : "0"));
|
||||
vf.WriteLine("WITH_ZLIB=" + (withZlib? "1" : "0"));
|
||||
vf.WriteLine("WITH_DEBUG=" + (withDebug? "1" : "0"));
|
||||
@ -319,6 +322,8 @@ function configureLibxml()
|
||||
of.WriteLine(s.replace(/\@WITH_XINCLUDE\@/, withXinclude? "1" : "0"));
|
||||
} else if (s.search(/\@WITH_ICONV\@/) != -1) {
|
||||
of.WriteLine(s.replace(/\@WITH_ICONV\@/, withIconv? "1" : "0"));
|
||||
} else if (s.search(/\@WITH_ICU\@/) != -1) {
|
||||
of.WriteLine(s.replace(/\@WITH_ICU\@/, withIcu? "1" : "0"));
|
||||
} else if (s.search(/\@WITH_ISO8859X\@/) != -1) {
|
||||
of.WriteLine(s.replace(/\@WITH_ISO8859X\@/, withIso8859x? "1" : "0"));
|
||||
} else if (s.search(/\@WITH_ZLIB\@/) != -1) {
|
||||
@ -462,6 +467,8 @@ for (i = 0; (i < WScript.Arguments.length) && (error == 0); i++) {
|
||||
withXinclude = strToBool(arg.substring(opt.length + 1, arg.length));
|
||||
else if (opt == "iconv")
|
||||
withIconv = strToBool(arg.substring(opt.length + 1, arg.length));
|
||||
else if (opt == "icu")
|
||||
withIcu = strToBool(arg.substring(opt.length + 1, arg.length));
|
||||
else if (opt == "iso8859x")
|
||||
withIso8859x = strToBool(arg.substring(opt.length + 1, arg.length));
|
||||
else if (opt == "zlib")
|
||||
@ -611,7 +618,13 @@ if (compiler == "mingw")
|
||||
makefile = ".\\Makefile.mingw";
|
||||
else if (compiler == "bcb")
|
||||
makefile = ".\\Makefile.bcb";
|
||||
fso.CopyFile(makefile, ".\\Makefile", true);
|
||||
var new_makefile = ".\\Makefile";
|
||||
var f = fso.FileExists(new_makefile);
|
||||
if (f) {
|
||||
var t = fso.GetFile(new_makefile);
|
||||
t.Attributes =0;
|
||||
}
|
||||
fso.CopyFile(makefile, new_makefile, true);
|
||||
WScript.Echo("Created Makefile.");
|
||||
// Create the config.h.
|
||||
var confighsrc = "..\\include\\win32config.h";
|
||||
@ -640,6 +653,7 @@ txtOut += " XPath support: " + boolToStr(withXpath) + "\n";
|
||||
txtOut += " XPointer support: " + boolToStr(withXptr) + "\n";
|
||||
txtOut += " XInclude support: " + boolToStr(withXinclude) + "\n";
|
||||
txtOut += " iconv support: " + boolToStr(withIconv) + "\n";
|
||||
txtOut += " icu support: " + boolToStr(withIcu) + "\n";
|
||||
txtOut += " iso8859x support: " + boolToStr(withIso8859x) + "\n";
|
||||
txtOut += " zlib support: " + boolToStr(withZlib) + "\n";
|
||||
txtOut += " Debugging module: " + boolToStr(withDebug) + "\n";
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user