diff options
| author | Andrew Udvare <audvare@gmail.com> | 2019-01-08 04:53:51 -0500 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2019-02-10 07:56:14 +0100 |
| commit | 6776c53b7ce2e431d8636f4e5a755f50f787ec8f (patch) | |
| tree | 7b44ae5238a3cdaa9e1e6a7eb95d46aa27f9a96b /external/postgresql | |
| parent | 47d3f4fcf861d5a24899bf78296da50a07d58a8c (diff) | |
Make LDAP support optional
Change-Id: Ifbd3903494a81e7b155bf6468f6ca2c50b3370a4
Reviewed-on: https://gerrit.libreoffice.org/65958
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'external/postgresql')
| -rw-r--r-- | external/postgresql/ExternalProject_postgresql.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/external/postgresql/ExternalProject_postgresql.mk b/external/postgresql/ExternalProject_postgresql.mk index f6617e52fcd8..fc4342c60f93 100644 --- a/external/postgresql/ExternalProject_postgresql.mk +++ b/external/postgresql/ExternalProject_postgresql.mk @@ -10,7 +10,7 @@ $(eval $(call gb_ExternalProject_ExternalProject,postgresql)) $(eval $(call gb_ExternalProject_use_externals,postgresql,\ - openldap \ + $(if $(ENABLE_LDAP),openldap) \ openssl \ zlib \ )) @@ -64,9 +64,10 @@ $(call gb_ExternalProject_get_state_target,postgresql,build) : $(if $(DISABLE_OPENSSL),,--with-openssl \ $(if $(WITH_KRB5), --with-krb5) \ $(if $(WITH_GSSAPI),--with-gssapi)) \ + $(if $(ENABLE_LDAP),,--with-ldap=no) \ CPPFLAGS="$(postgresql_CPPFLAGS)" \ LDFLAGS="$(postgresql_LDFLAGS)" \ - EXTRA_LDAP_LIBS="-llber -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4" \ + $(if $(ENABLE_LDAP),EXTRA_LDAP_LIBS="-llber -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4") \ && cd src/interfaces/libpq \ && MAKEFLAGS= && $(MAKE) all-static-lib) |