comparison make/common/shared/Sanity-Settings.gmk @ 1225:4b922e8fef3b

Merge
author yan
date Tue, 28 Apr 2009 13:41:11 -0700
parents 964cc8eb3232 7f45fcc04f8e
children 4fef42eb432c 7e7153da24ef
comparison
equal deleted inserted replaced
8:659c56ec0c4e 10:afb609891c09
231 ALL_SETTINGS+=$(call addAltSetting,MSITRAN) 231 ALL_SETTINGS+=$(call addAltSetting,MSITRAN)
232 ALL_SETTINGS+=$(call addAltSetting,MSIVAL2) 232 ALL_SETTINGS+=$(call addAltSetting,MSIVAL2)
233 endif 233 endif
234 endif 234 endif
235 ALL_SETTINGS+=$(call addAltSetting,CACERTS_FILE) 235 ALL_SETTINGS+=$(call addAltSetting,CACERTS_FILE)
236 ALL_SETTINGS+=$(call addAltSetting,JIBX_LIBS_PATH)
236 ifndef OPENJDK 237 ifndef OPENJDK
237 ALL_SETTINGS+=$(call addAltSetting,MOZILLA_HEADERS_PATH) 238 ALL_SETTINGS+=$(call addAltSetting,MOZILLA_HEADERS_PATH)
238 endif 239 endif
239 ifneq ($(PLATFORM),windows) 240 ifneq ($(PLATFORM),windows)
240 ALL_SETTINGS+=$(call addAltSetting,CUPS_HEADERS_PATH) 241 ALL_SETTINGS+=$(call addAltSetting,CUPS_HEADERS_PATH)