Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(410)

Side by Side Diff: third_party/libxml/src/configure.ac

Issue 1752223002: Roll libxml to 2.9.3 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Re-cherry-pick fprintf formatting fix. Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 dnl Process this file with autoconf to produce a configure script. 1 dnl Process this file with autoconf to produce a configure script.
2 AC_PREREQ([2.63]) 2 AC_PREREQ([2.63])
3 AC_INIT 3 AC_INIT
4 AC_CONFIG_SRCDIR([entities.c]) 4 AC_CONFIG_SRCDIR([entities.c])
5 AC_CONFIG_HEADERS([config.h]) 5 AC_CONFIG_HEADERS([config.h])
6 AC_CONFIG_MACRO_DIR([m4]) 6 AC_CONFIG_MACRO_DIR([m4])
7 AC_CANONICAL_HOST 7 AC_CANONICAL_HOST
8 8
9 LIBXML_MAJOR_VERSION=2 9 LIBXML_MAJOR_VERSION=2
10 LIBXML_MINOR_VERSION=9 10 LIBXML_MINOR_VERSION=9
11 LIBXML_MICRO_VERSION=2 11 LIBXML_MICRO_VERSION=3
12 LIBXML_MICRO_VERSION_SUFFIX= 12 LIBXML_MICRO_VERSION_SUFFIX=
13 LIBXML_VERSION=$LIBXML_MAJOR_VERSION.$LIBXML_MINOR_VERSION.$LIBXML_MICRO_VERSION $LIBXML_MICRO_VERSION_SUFFIX 13 LIBXML_VERSION=$LIBXML_MAJOR_VERSION.$LIBXML_MINOR_VERSION.$LIBXML_MICRO_VERSION $LIBXML_MICRO_VERSION_SUFFIX
14 LIBXML_VERSION_INFO=`expr $LIBXML_MAJOR_VERSION + $LIBXML_MINOR_VERSION`:$LIBXML _MICRO_VERSION:$LIBXML_MINOR_VERSION 14 LIBXML_VERSION_INFO=`expr $LIBXML_MAJOR_VERSION + $LIBXML_MINOR_VERSION`:$LIBXML _MICRO_VERSION:$LIBXML_MINOR_VERSION
15 15
16 LIBXML_VERSION_NUMBER=`expr $LIBXML_MAJOR_VERSION \* 10000 + $LIBXML_MINOR_VERSI ON \* 100 + $LIBXML_MICRO_VERSION` 16 LIBXML_VERSION_NUMBER=`expr $LIBXML_MAJOR_VERSION \* 10000 + $LIBXML_MINOR_VERSI ON \* 100 + $LIBXML_MICRO_VERSION`
17 17
18 if test -f CVS/Entries ; then 18 if test -f CVS/Entries ; then
19 extra=`grep ChangeLog CVS/Entries | grep -v LIBXML | sed -e s\%/ChangeLog/1\.% % -e s\%/.*$%%` 19 extra=`grep ChangeLog CVS/Entries | grep -v LIBXML | sed -e s\%/ChangeLog/1\.% % -e s\%/.*$%%`
20 echo extra=$extra 20 echo extra=$extra
21 if test "$extra" != "" 21 if test "$extra" != ""
(...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after
438 AC_CHECK_LIB(lzma, lzma_code,[ 438 AC_CHECK_LIB(lzma, lzma_code,[
439 have_liblzma=yes 439 have_liblzma=yes
440 if test "x${LZMA_DIR}" != "x"; then 440 if test "x${LZMA_DIR}" != "x"; then
441 LZMA_CFLAGS="-I${LZMA_DIR}/include" 441 LZMA_CFLAGS="-I${LZMA_DIR}/include"
442 LZMA_LIBS="-L${LZMA_DIR}/lib -llzma" 442 LZMA_LIBS="-L${LZMA_DIR}/lib -llzma"
443 else 443 else
444 LZMA_LIBS="-llzma" 444 LZMA_LIBS="-llzma"
445 fi], 445 fi],
446 [have_liblzma=no]) 446 [have_liblzma=no])
447 LDFLAGS="${SAVE_LDFLAGS}"]) 447 LDFLAGS="${SAVE_LDFLAGS}"])
448 else
449 # we still need to check for lzma,h header
450 AC_CHECK_HEADERS([lzma.h])
448 fi 451 fi
449 452
450 # Found the library via either method? 453 # Found the library via either method?
451 if test "x$have_liblzma" = "xyes"; then 454 if test "x$have_liblzma" = "xyes"; then
452 AC_DEFINE([HAVE_LIBLZMA], [1], [Have compression library]) 455 AC_DEFINE([HAVE_LIBLZMA], [1], [Have compression library])
453 WITH_LZMA=1 456 WITH_LZMA=1
454 fi 457 fi
455 fi 458 fi
456 459
457 AC_SUBST(LZMA_CFLAGS) 460 AC_SUBST(LZMA_CFLAGS)
(...skipping 1197 matching lines...) Expand 10 before | Expand all | Expand 10 after
1655 rm -f COPYING.LIB COPYING 1658 rm -f COPYING.LIB COPYING
1656 ln -s $srcdir/Copyright COPYING 1659 ln -s $srcdir/Copyright COPYING
1657 1660
1658 # keep on one line for cygwin c.f. #130896 1661 # keep on one line for cygwin c.f. #130896
1659 AC_CONFIG_FILES([libxml2.spec:libxml.spec.in Makefile include/Makefile include/l ibxml/Makefile doc/Makefile doc/examples/Makefile doc/devhelp/Makefile example/M akefile python/Makefile python/tests/Makefile xstc/Makefile include/libxml/xmlve rsion.h libxml-2.0.pc libxml-2.0-uninstalled.pc libxml2-config.cmake]) 1662 AC_CONFIG_FILES([libxml2.spec:libxml.spec.in Makefile include/Makefile include/l ibxml/Makefile doc/Makefile doc/examples/Makefile doc/devhelp/Makefile example/M akefile python/Makefile python/tests/Makefile xstc/Makefile include/libxml/xmlve rsion.h libxml-2.0.pc libxml-2.0-uninstalled.pc libxml2-config.cmake])
1660 AC_CONFIG_FILES([python/setup.py], [chmod +x python/setup.py]) 1663 AC_CONFIG_FILES([python/setup.py], [chmod +x python/setup.py])
1661 AC_CONFIG_FILES([xml2-config], [chmod +x xml2-config]) 1664 AC_CONFIG_FILES([xml2-config], [chmod +x xml2-config])
1662 AC_OUTPUT 1665 AC_OUTPUT
1663 1666
1664 echo Done configuring 1667 echo Done configuring
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698