diff options
| author | maruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-08 19:12:46 +0000 |
|---|---|---|
| committer | maruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-08 19:12:46 +0000 |
| commit | 505115c27f5454df0878407c7706c7f1c3744b0d (patch) | |
| tree | df43feb18444d5be3bf35ed3ee16156d49e17776 /third_party/libxml/configure.in | |
| parent | e8c2172aa23158985682d232cf290593b8206b90 (diff) | |
| download | chromium_src-505115c27f5454df0878407c7706c7f1c3744b0d.zip chromium_src-505115c27f5454df0878407c7706c7f1c3744b0d.tar.gz chromium_src-505115c27f5454df0878407c7706c7f1c3744b0d.tar.bz2 | |
Updates libxml to 2.6.32. Updated google.patch and README.google
BUG=1300342
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@581 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/libxml/configure.in')
| -rw-r--r-- | third_party/libxml/configure.in | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/third_party/libxml/configure.in b/third_party/libxml/configure.in index 699232fd..8fc76e5 100644 --- a/third_party/libxml/configure.in +++ b/third_party/libxml/configure.in @@ -5,7 +5,7 @@ AC_CANONICAL_HOST LIBXML_MAJOR_VERSION=2 LIBXML_MINOR_VERSION=6 -LIBXML_MICRO_VERSION=31 +LIBXML_MICRO_VERSION=32 LIBXML_MICRO_VERSION_SUFFIX= LIBXML_VERSION=$LIBXML_MAJOR_VERSION.$LIBXML_MINOR_VERSION.$LIBXML_MICRO_VERSION$LIBXML_MICRO_VERSION_SUFFIX LIBXML_VERSION_INFO=`expr $LIBXML_MAJOR_VERSION + $LIBXML_MINOR_VERSION`:$LIBXML_MICRO_VERSION:$LIBXML_MINOR_VERSION @@ -1224,6 +1224,29 @@ iconv (cd, NULL, NULL, NULL, NULL);],[ AC_MSG_RESULT(no) LIBS="${_libs}" LDFLAGS="${_ldflags}"])])) + + if test "$WITH_ICONV" = "1" ; then + AC_MSG_CHECKING([for iconv declaration]) + AC_CACHE_VAL(xml_cv_iconv_arg2, [ + AC_TRY_COMPILE([#include <stdlib.h> +#include <iconv.h> +extern +#ifdef __cplusplus +"C" +#endif +#if defined(__STDC__) || defined(__cplusplus) +size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); +#else +size_t iconv(); +#endif +], [], xml_cv_iconv_arg2="", xml_cv_iconv_arg2="const")]) + + xml_cv_iconv_decl="extern size_t iconv (iconv_t cd, $xml_cv_iconv_arg2 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);" + AC_MSG_RESULT([${xml_xxx:- + }$xml_cv_iconv_decl]) + AC_DEFINE_UNQUOTED(ICONV_CONST, $xml_cv_iconv_arg2, + [Define as const if the declaration of iconv() needs const.]) + fi fi case "$host" in *mingw*) M_LIBS="" |