diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-02-11 15:57:18 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-02-12 09:53:08 +0100 |
| commit | e3abec3f07f2a710bfce66f77b33f494e2aa4972 (patch) | |
| tree | 740f34ea017abc08ce444b93ccad57a628e4f444 /external/curl | |
| parent | b62f5c2a22d968d06ea9e638126278bbd1158bf6 (diff) | |
fdo#74825: fix missing lcms2/libxslt/curl in installation sets
The assumption that all configure variables had been normalized to
TRUE/<empty> turned out not to hold; convert a bit more in that
direction.
(regression from 4af38b099c741c3676aefeb20c515913aaeed666)
Change-Id: I2127c515e8a833a07c9b26ed9d693ce5a1853fe4
Diffstat (limited to 'external/curl')
| -rw-r--r-- | external/curl/ExternalProject_curl.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/external/curl/ExternalProject_curl.mk b/external/curl/ExternalProject_curl.mk index 23161a0fea04..e67fdf230e4b 100644 --- a/external/curl/ExternalProject_curl.mk +++ b/external/curl/ExternalProject_curl.mk @@ -31,7 +31,7 @@ endif endif # there are 2 include paths, the other one is passed to --with-nss below -ifeq ($(SYSTEM_NSS),NO) +ifeq ($(SYSTEM_NSS),) curl_CPPFLAGS += -I$(call gb_UnpackedTarball_get_dir,nss)/dist/public/nss endif @@ -43,7 +43,7 @@ $(call gb_ExternalProject_get_state_target,curl,build): ./configure \ $(if $(filter MACOSX IOS,$(OS)),\ --with-darwinssl, \ - --with-nss$(if $(filter NO,$(SYSTEM_NSS)),="$(call gb_UnpackedTarball_get_dir,nss)/dist/out")) \ + --with-nss$(if $(SYSTEM_NSS),,="$(call gb_UnpackedTarball_get_dir,nss)/dist/out")) \ --without-ssl \ --without-libidn --enable-ftp --enable-ipv6 --enable-http --disable-gopher \ --disable-file --disable-ldap --disable-telnet --disable-dict --without-libssh2 \ |