diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-04-12 16:05:31 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-04-13 13:15:25 +0100 |
| commit | 452af5f4522e750627d0c0ac9fbc794aeb1f1f8f (patch) | |
| tree | 950d062f9e183873d64b06e212568a3b0968bb58 /moz | |
| parent | 99b04ed2be3023bec874fce529d453123f48ac99 (diff) | |
gbuildize internal zlib
and stick headers into the solver in the same hierarchy as is "standard"
so we don't have to patch so much, similiarly rename to libz
Diffstat (limited to 'moz')
| -rw-r--r-- | moz/makefile.mk | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/moz/makefile.mk b/moz/makefile.mk index 13db91fc0517..6b3155692bff 100644 --- a/moz/makefile.mk +++ b/moz/makefile.mk @@ -220,16 +220,14 @@ 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 |