[Libreoffice-commits] .: libxslt/makefile.mk

[Tor Lillqvist]

 libxslt/makefile.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit dc7afa23bc4cb16a8f3730185af81a0a02642aac
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Thu Oct 27 15:48:21 2011 +0300

    Don't build libxslt.dll against debugging runtime for --enable-debug
    
    Same problem as a few commits earlier: libxslt's configure.js uses
    debug=yes to mean using the debugging crt, which we don't want in just
    a debug=t build. (And which will make libxslt.dll fail to load.) Look
    at $(dbgutil), not $(debug). (And note that in general dbgutil builds
    are disabled for Windows currently anyway.)

diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk
index 9d77bba..fe808dd 100644
--- a/libxslt/makefile.mk
+++ b/libxslt/makefile.mk
@@ -93,7 +93,7 @@ BUILD_DIR=$(CONFIGURE_DIR)
 CONFIGURE_DIR=win32
 CONFIGURE_ACTION=cscript configure.js
 #CONFIGURE_FLAGS=iconv=no sax1=yes
-.IF "$(debug)"!=""
+.IF "$(dbgutil)"!=""
 CONFIGURE_FLAGS+=debug=yes
 .ENDIF
 BUILD_ACTION=nmake