summaryrefslogtreecommitdiff
path: root/config_host.mk.in
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2016-11-02 14:13:54 +0100
committerMichael Stahl <mstahl@redhat.com>2016-11-02 20:04:23 +0000
commiteea709f67d91e271e3df37e6c6724b7b5870b1ee (patch)
tree170d8daf2c45e04f461556ede40699d3d6a4fc2c /config_host.mk.in
parent092261ffd497f752c342f1fbdca6e7267e312a21 (diff)
poppler: build against libjpeg
Albert Astals Cid points out that --disable-libjpeg causes poppler to use internal JPEG code instead, which is not actively maintained. Add LIBJPEG_CFLAGS / LIBJPEG_LIBS to config_host.mk and patch poppler to respect LIBJPEG_LIBS. Change-Id: Id19a62a9bd9dc41fee5e8e43e2798e515aacc299 Reviewed-on: https://gerrit.libreoffice.org/30496 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'config_host.mk.in')
-rw-r--r--config_host.mk.in2
1 files changed, 2 insertions, 0 deletions
diff --git a/config_host.mk.in b/config_host.mk.in
index 260acf7787c4..7eebae67d947 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -320,6 +320,8 @@ export LIBFONTS_JAR=@LIBFONTS_JAR@
export LIBFORMULA_JAR=@LIBFORMULA_JAR@
export LIBGCRYPT_CFLAGS=@LIBGCRYPT_CFLAGS@
export LIBGCRYPT_LIBS=@LIBGCRYPT_LIBS@
+export LIBJPEG_CFLAGS=$(gb_SPACE)@LIBJPEG_CFLAGS@
+export LIBJPEG_LIBS=$(gb_SPACE)@LIBJPEG_LIBS@
export LIBLANGTAG_CFLAGS=$(gb_SPACE)@LIBLANGTAG_CFLAGS@
export LIBLANGTAG_LIBS=$(gb_SPACE)@LIBLANGTAG_LIBS@
export LIBLAYOUT_JAR=@LIBLAYOUT_JAR@