diff options
| author | Elliott Hughes <enh@google.com> | 2015-12-02 22:59:24 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-12-02 22:59:24 +0000 |
| commit | 9becc6eda68ce10fe3ab39a1c2424a8e5861a2f1 (patch) | |
| tree | df25a4c27f5e3765640290daa27070a9c4965221 /configure.ac | |
| parent | 205b310ec0ad7cf9a4aab02430a9a18196c07be3 (diff) | |
| parent | 6be364848cb20f3345abc12fedff35cdd464a600 (diff) | |
| download | android_external_libxml2-9becc6eda68ce10fe3ab39a1c2424a8e5861a2f1.tar.gz android_external_libxml2-9becc6eda68ce10fe3ab39a1c2424a8e5861a2f1.tar.bz2 android_external_libxml2-9becc6eda68ce10fe3ab39a1c2424a8e5861a2f1.zip | |
Merge remote-tracking branch \'libxml2/master\' into mymerge
am: 6be364848c
* commit '6be364848cb20f3345abc12fedff35cdd464a600':
Release of libxml2-2.9.3
CVE-2015-8242 Buffer overead with HTML parser in push mode
CVE-2015-7500 Fix memory access error due to incorrect entities boundaries
Bug on creating new stream from entity
Fix some loop issues embedding NEXT
Detect incoherency on GROW
Do not print error context when there is none
Reuse xmlHaltParser() where it makes sense
Add xmlHaltParser() to stop the parser
CVE-2015-5312 Another entity expansion issue
CVE-2015-7497 Avoid an heap buffer overflow in xmlDictComputeFastQKey
xmlStopParser reset errNo
Avoid processing entities after encoding conversion failures
Avoid extra processing of MarkupDecl when EOF
Reenable xz support by default
CVE-2015-8035 Fix XZ compression support loop
Fix parsing short unclosed comment uninitialized access
Fix an error in previous Conditional section patch
Correct spelling of "calling"
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 14ac0a8a..02602814 100644 --- a/configure.ac +++ b/configure.ac @@ -8,7 +8,7 @@ AC_CANONICAL_HOST LIBXML_MAJOR_VERSION=2 LIBXML_MINOR_VERSION=9 -LIBXML_MICRO_VERSION=2 +LIBXML_MICRO_VERSION=3 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 @@ -445,6 +445,9 @@ else fi], [have_liblzma=no]) LDFLAGS="${SAVE_LDFLAGS}"]) + else + # we still need to check for lzma,h header + AC_CHECK_HEADERS([lzma.h]) fi # Found the library via either method? |