diff options
| author | Daniel Richard <oss@teragram.com> | 2012-12-12 17:16:00 +0800 |
|---|---|---|
| committer | Daniel Veillard <veillard@redhat.com> | 2012-12-12 17:16:00 +0800 |
| commit | a0571ebeac8bd853f92c2d029a68702e610b940b (patch) | |
| tree | 2a3687f619fd56dec40e0c8ff2644ae955d95bf0 /win32/configure.js | |
| parent | 6f49c73b53facc1c22c82dc2599f4a24bb7141b5 (diff) | |
| download | libxml2-a0571ebeac8bd853f92c2d029a68702e610b940b.tar.gz | |
Fix for win32/configure.js and WITH_THREAD_ALLOC
Building git master gives me the following error on Windows; this patch
fixes it:
icl /EP /nologo /I..\include /D "NOLIBTOOL" /D "_REENTRANT"
libxml2.def.
src > int.msvc\libxml2.def
libxml2.def.src
Z:\...\libxml2-git8123c4f6_debug\win32\../include/libxml/xmlversion.h(105):
error: unrecognized token
#if @WITH_THREAD_ALLOC@
^
Z:\...\libxml2-git8123c4f6_debug\win32\../include/libxml/xmlversion.h(105):
error: expected an expression
#if @WITH_THREAD_ALLOC@
^
Z:\...\libxml2-git8123c4f6_debug\win32\../include/libxml/xmlversion.h(105):
error: unrecognized token
#if @WITH_THREAD_ALLOC@
^
NMAKE : fatal error U1077: 'icl' : return code '0x2'
Stop.
Diffstat (limited to 'win32/configure.js')
| -rw-r--r-- | win32/configure.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/win32/configure.js b/win32/configure.js index 11d28982..edd943a6 100644 --- a/win32/configure.js +++ b/win32/configure.js @@ -305,6 +305,8 @@ function configureLibxml() of.WriteLine(s.replace(/\@WITH_TRIO\@/, withTrio? "1" : "0")); } else if (s.search(/\@WITH_THREADS\@/) != -1) { of.WriteLine(s.replace(/\@WITH_THREADS\@/, withThreads == "no"? "0" : "1")); + } else if (s.search(/\@WITH_THREAD_ALLOC\@/) != -1) { + of.WriteLine(s.replace(/\@WITH_THREAD_ALLOC\@/, "0")); } else if (s.search(/\@WITH_FTP\@/) != -1) { of.WriteLine(s.replace(/\@WITH_FTP\@/, withFtp? "1" : "0")); } else if (s.search(/\@WITH_HTTP\@/) != -1) { |