diff options
| author | mmoss@google.com <mmoss@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-06 18:37:03 +0000 |
|---|---|---|
| committer | mmoss@google.com <mmoss@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-06 18:37:03 +0000 |
| commit | e6d08cad82c6175196682a0730be347d5dddd415 (patch) | |
| tree | 0e37904d053ce3e28c4e3889079d0cc5e3fee177 /third_party/libxml/configure | |
| parent | 754e5bc23b758ef3444dd7383822563e46da8405 (diff) | |
| download | chromium_src-e6d08cad82c6175196682a0730be347d5dddd415.zip chromium_src-e6d08cad82c6175196682a0730be347d5dddd415.tar.gz chromium_src-e6d08cad82c6175196682a0730be347d5dddd415.tar.bz2 | |
Allow third_party/libxml to compile on Linux. This uses static config.h and xmlversion.h files generated by ./configure, which probably isn't ideal, but it's a start.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@441 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/libxml/configure')
| -rw-r--r-- | third_party/libxml/configure | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/third_party/libxml/configure b/third_party/libxml/configure index d02721f..c2e694a 100644 --- a/third_party/libxml/configure +++ b/third_party/libxml/configure @@ -952,6 +952,7 @@ XPATH_OBJ TEST_XPATH WITH_OUTPUT WITH_ICONV +WITH_ICU WITH_ISO8859X WITH_SCHEMATRON TEST_SCHEMATRON @@ -28792,6 +28793,8 @@ else fi +WITH_ICU=1 + WITH_ICONV=0 if test "$with_iconv" = "no" ; then echo Disabling ICONV support @@ -29213,7 +29216,7 @@ rm -f COPYING.LIB COPYING ln -s Copyright COPYING # keep on one line for cygwin c.f. #130896 -ac_config_files="$ac_config_files libxml2.spec:libxml.spec.in Makefile include/Makefile include/libxml/Makefile doc/Makefile doc/examples/Makefile doc/devhelp/Makefile example/Makefile python/Makefile python/tests/Makefile xstc/Makefile include/libxml/xmlversion.h xml2-config libxml-2.0.pc libxml-2.0-uninstalled.pc python/setup.py" +ac_config_files="$ac_config_files include/libxml/xmlversion.h xml2-config " cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -30119,6 +30122,7 @@ XPATH_OBJ!$XPATH_OBJ$ac_delim TEST_XPATH!$TEST_XPATH$ac_delim WITH_OUTPUT!$WITH_OUTPUT$ac_delim WITH_ICONV!$WITH_ICONV$ac_delim +WITH_ICU!$WITH_ICU$ac_delim WITH_ISO8859X!$WITH_ISO8859X$ac_delim WITH_SCHEMATRON!$WITH_SCHEMATRON$ac_delim TEST_SCHEMATRON!$TEST_SCHEMATRON$ac_delim @@ -30130,7 +30134,7 @@ WITH_DEBUG!$WITH_DEBUG$ac_delim DEBUG_OBJ!$DEBUG_OBJ$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 98; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -30794,5 +30798,5 @@ if test "$no_create" != yes; then fi -chmod +x xml2-config python/setup.py +chmod +x xml2-config echo Done configuring |