diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-08-31 18:55:53 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-10-17 03:54:05 +0000 |
| commit | bf6d1f77420dcc9ece4d9f4eae1e37b427d85c6a (patch) | |
| tree | 8147c75b761cc8d0546d34813ef1dc90256aa4f8 /postgresql | |
| parent | ce40605a8f906ebb4d800798d1e0c17ded4c053a (diff) | |
Normalize DISABLE_OPENSSL to USE TRUE/<nothing>
Change-Id: I84dd99f42e032315fbf31332dfb62eb3ef4aa4c0
Reviewed-on: https://gerrit.libreoffice.org/5724
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'postgresql')
| -rw-r--r-- | postgresql/ExternalProject_postgresql.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/postgresql/ExternalProject_postgresql.mk b/postgresql/ExternalProject_postgresql.mk index 9f495c51b888..76903579cf4d 100644 --- a/postgresql/ExternalProject_postgresql.mk +++ b/postgresql/ExternalProject_postgresql.mk @@ -32,15 +32,15 @@ $(call gb_ExternalProject_get_state_target,postgresql,build) : $(call gb_ExternalProject_run,build,\ ./configure \ --without-readline --disable-shared --with-ldap \ - $(if $(filter-out YES,$(DISABLE_OPENSSL)),--with-openssl) \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - $(if $(and $(filter YES,$(WITH_KRB5)), $(filter-out YES,$(DISABLE_OPENSSL))),--with-krb5) \ - $(if $(and $(filter YES,$(WITH_GSSAPI)), $(filter-out YES,$(DISABLE_OPENSSL))),--with-gssapi) \ + $(if $(DISABLE_OPENSSL),,--with-openssl \ + $(if $(filter YES,$(WITH_KRB5)), --with-krb5) \ + $(if $(filter YES,$(WITH_GSSAPI)),--with-gssapi)) \ CPPFLAGS="$(ZLIB_CFLAGS) \ $(if $(filter NO,$(SYSTEM_OPENLDAP)),\ -I$(call gb_UnpackedTarball_get_dir,openldap/include)) \ - $(if $(and $(filter NO,$(SYSTEM_OPENSSL)), $(filter-out YES,$(DISABLE_OPENSSL))),\ - -I$(call gb_UnpackedTarball_get_dir,openssl/include))" \ + $(if $(DISABLE_OPENSSL),,$(if $(filter NO,$(SYSTEM_OPENSSL)),\ + -I$(call gb_UnpackedTarball_get_dir,openssl/include)))" \ $(if $(filter NO,$(SYSTEM_OPENLDAP)), \ LDFLAGS="-L$(call gb_UnpackedTarball_get_dir,openldap)/libraries/libldap_r/.libs -L$(call gb_UnpackedTarball_get_dir,openldap)/libraries/libldap/.libs -L$(call gb_UnpackedTarball_get_dir,openldap)/libraries/liblber/.libs -L$(OUTDIR)/lib" \ EXTRA_LDAP_LIBS="-llber -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4" \ |