diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-04-13 14:06:05 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-04-13 14:06:55 +0100 |
| commit | 3934efe28c70b1c21a60f38fe726a935c15f4e99 (patch) | |
| tree | c322f38a215b05ff0c457366e08fab9255b64114 /moz | |
| parent | 134fe756a1659e352c96d0a6da34dd3c7d23e3a9 (diff) | |
sigh, need a 64bit zlib too on windows, reverting
Diffstat (limited to 'moz')
| -rw-r--r-- | moz/makefile.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/moz/makefile.mk b/moz/makefile.mk index 6b3155692bff..13db91fc0517 100644 --- a/moz/makefile.mk +++ b/moz/makefile.mk @@ -220,14 +220,16 @@ MOZDIR=$(MISC)$/build$/seamonkey MOZTARGET=$(OS)$(COM)$(CPU) .IF "$(GUI)"=="WNT" -#for moz to link to our static lz if necessary -SYSTEM_ZLIB:="YES" # "Our" build environment uses "NO" for the environment variable that # indicate if system libraries should be used, the mozilla build uses # "" in this case. This conflicts (at least for W32) with mozilla (1.7b) # because it disables the library checks for msvc so that # --without-system-* is not evaluated. To build the included libraries # the affected variables have to be empty and not NO. +.IF "$(SYSTEM_ZLIB)"=="NO" +SYSTEM_ZLIB:= +.EXPORT : SYSTEM_ZLIB +.ENDIF .IF "$(SYSTEM_JPEG)"=="NO" SYSTEM_JPEG:= .EXPORT : SYSTEM_JPEG |