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/libxmlsec | |
| 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/libxmlsec')
| -rw-r--r-- | external/libxmlsec/ExternalProject_xmlsec.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/external/libxmlsec/ExternalProject_xmlsec.mk b/external/libxmlsec/ExternalProject_xmlsec.mk index 2c4b18ab51ab..851a2680539c 100644 --- a/external/libxmlsec/ExternalProject_xmlsec.mk +++ b/external/libxmlsec/ExternalProject_xmlsec.mk @@ -27,7 +27,7 @@ $(call gb_ExternalProject_get_state_target,xmlsec,build) : autoreconf \ && ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \ --without-libxslt --without-openssl --without-gnutls --disable-crypto-dl \ - $(if $(filter NO,$(SYSTEM_NSS)),--disable-pkgconfig) \ + $(if $(SYSTEM_NSS),,--disable-pkgconfig) \ CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \ LDFLAGS="-Wl$(COMMA)--no-undefined $(ILIB:;= -L)" \ LIBS="$(if $(filter YES,$(MINGW_SHARED_GXXLIB)),$(MINGW_SHARED__LIBSTDCPP))" \ @@ -57,7 +57,7 @@ $(call gb_ExternalProject_get_state_target,xmlsec,build) : --with-pic --disable-shared --disable-crypto-dl --without-libxslt --without-gnutls \ $(if $(or $(filter-out ANDROID,$(OS)),$(DISABLE_OPENSSL)),--without-openssl,--with-openssl=$(call gb_UnpackedTarball_get_dir,openssl)) \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ - $(if $(filter NO,$(SYSTEM_NSS))$(filter MACOSX,$(OS)),--disable-pkgconfig) \ + $(if $(SYSTEM_NSS),,$(if $(filter MACOSX,$(OS)),--disable-pkgconfig)) \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(filter NO,$(SYSTEM_LIBXML)),LIBXML_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,xml2)/include" LIBXML_LIBS="-L$(call gb_UnpackedTarball_get_dir,xml2)/.libs -lxml2")\ $(if $(SYSBASE),CFLAGS="-I$(SYSBASE)/usr/include" \ |