configure.ac | 7 +++++++
postgresql/ExternalProject_postgresql.mk | 9 +++++----
2 files changed, 12 insertions(+), 4 deletions(-)
New commits:
commit f3f9db6d1d1fe63a4323f43de91a13aae03b1228
Author: Andres Gomez <ago...@igalia.com>
Date: Wed Apr 10 11:22:05 2013 +0300
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 <ger...@libreoffice.org>
Reviewed-by: David Tardon <dtar...@redhat.com>
Tested-by: David Tardon <dtar...@redhat.com>
diff --git a/configure.ac b/configure.ac
index 7c5169e..75e149f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7731,6 +7731,13 @@ dnl
===================================================================
if test "x$enable_postgresql_sdbc" != "xno"; then
SCPDEFS="$SCPDEFS -DWITH_POSTGRESQL_SDBC"
+ if test "$with_krb5" = "yes" -a "$enable_openssl" = "no"; then
+ AC_MSG_ERROR([krb5 needs OpenSSL, but --disable-openssl was given.])
+ fi
+ if test "$with_gssapi" = "yes" -a "$enable_openssl" = "no"; then
+ AC_MSG_ERROR([GSSAPI needs OpenSSL, but --disable-openssl was given.])
+ fi
+
AC_MSG_CHECKING([PostgreSQL C interface])
if test "$with_system_postgresql" = "yes"; then
AC_MSG_RESULT([external PostgreSQL])
diff --git a/postgresql/ExternalProject_postgresql.mk
b/postgresql/ExternalProject_postgresql.mk
index 19c10e3..63aa943 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" \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
