diff options
| author | Andres Gomez <agomez@igalia.com> | 2013-04-10 11:22:05 +0300 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-04-13 10:48:54 +0000 |
| commit | f3f9db6d1d1fe63a4323f43de91a13aae03b1228 (patch) | |
| tree | 99052f8b4b432b7256bc656443cf0b827552da32 /postgresql | |
| parent | 3aa14b5a2f8d815ada281b69e9b8600e759fc5de (diff) | |
postgresql: honor --disable-openssl flag
On --disable-openssl, let's avoid linking the
bundled postgresql to OpenSSL by not passing down
--with-openssl to its configure script.
Also, configure stage will fail if krb5 or gssapi
are enabled as they need OpenSSL and, in any
case, --with-krb5 and --with-gssapi will not be
passed down to postgresql configure script.
Change-Id: Iaf7e944d1d8f6a018e949ece56f6d3881f1e8c46
Reviewed-on: https://gerrit.libreoffice.org/3333
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'postgresql')
| -rw-r--r-- | postgresql/ExternalProject_postgresql.mk | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/postgresql/ExternalProject_postgresql.mk b/postgresql/ExternalProject_postgresql.mk index 19c10e313c57..63aa9434a2b0 100644 --- a/postgresql/ExternalProject_postgresql.mk +++ b/postgresql/ExternalProject_postgresql.mk @@ -31,13 +31,14 @@ else $(call gb_ExternalProject_get_state_target,postgresql,build) : $(call gb_ExternalProject_run,build,\ ./configure \ - --without-readline --disable-shared --with-openssl --with-ldap \ + --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 $(filter YES,$(WITH_KRB5)),--with-krb5) \ - $(if $(filter YES,$(WITH_GSSAPI)),--with-gssapi) \ + $(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) \ CPPFLAGS="$(if $(filter NO,$(SYSTEM_OPENLDAP)),\ -I$(call gb_UnpackedTarball_get_dir,openldap/include)) \ - $(if $(filter NO,$(SYSTEM_OPENSSL)),\ + $(if $(and $(filter NO,$(SYSTEM_OPENSSL)), $(filter-out YES,$(DISABLE_OPENSSL))),\ -I$(call gb_UnpackedTarball_get_dir,openssl/include))" \ $(if $(filter NO,$(SYSTEM_OPENLDAP)), \ LDFLAGS="-L$(OUTDIR)/lib" \ |