diff options
| author | Andres Gomez <agomez@igalia.com> | 2013-04-11 10:32:54 +0300 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-04-13 10:49:46 +0000 |
| commit | 48d49759a4d43b5e5dd997b4a87555ce25ae2a04 (patch) | |
| tree | 738b34263b3c6c71a9cff99b60035b46dbf4a07d /config_host.mk.in | |
| parent | f3f9db6d1d1fe63a4323f43de91a13aae03b1228 (diff) | |
neon: honor --disable-openssl and use GNUTLS
On --disable-openssl, the bundled neon library
will link against GNUTLS + gcrypt instead of
OpenSSL.
Change-Id: I5b3f09cd1003aefde0478aaab026536c962212c4
Reviewed-on: https://gerrit.libreoffice.org/3330
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'config_host.mk.in')
| -rw-r--r-- | config_host.mk.in | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index d794d1633819..a0f4675739dc 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -182,6 +182,8 @@ export GIT_REFERENCE_SRC=@GIT_REFERENCE_SRC@ export GIT_NEEDED_SUBMODULES=@GIT_NEEDED_SUBMODULES@ export GNOMEVFS_CFLAGS=$(gb_SPACE)@GNOMEVFS_CFLAGS@ export GNOMEVFS_LIBS=$(gb_SPACE)@GNOMEVFS_LIBS@ +export GNUTLS_CFLAGS=$(gb_SPACE)@GNUTLS_CFLAGS@ +export GNUTLS_LIBS=$(gb_SPACE)@GNUTLS_LIBS@ export PARALLELISM?=@PARALLELISM@ @x_GNUCP@ export GNUCOPY=@GNUCP@ export GNUMAKE=@GNUMAKE@ @@ -289,6 +291,8 @@ export LIBEXTTEXTCAT_CFLAGS=$(gb_SPACE)@LIBEXTTEXTCAT_CFLAGS@ export LIBEXTTEXTCAT_LIBS=$(gb_SPACE)@LIBEXTTEXTCAT_LIBS@ export LIBFONTS_JAR=@LIBFONTS_JAR@ export LIBFORMULA_JAR=@LIBFORMULA_JAR@ +export LIBGCRYPT_CFLAGS=@LIBGCRYPT_CFLAGS@ +export LIBGCRYPT_LIBS=@LIBGCRYPT_LIBS@ export LIBLANGTAG_CFLAGS=$(gb_SPACE)@LIBLANGTAG_CFLAGS@ export LIBLANGTAG_LIBS=$(gb_SPACE)@LIBLANGTAG_LIBS@ export LIBLAYOUT_JAR=@LIBLAYOUT_JAR@ |