[PATCH libreoffice-4-0] fdo#61092: force ENABLE_QUICKSTART_LIBPNG to None with --ena...

[Riccardo Magliocchetti (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3802

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/02/3802/1

fdo#61092: force ENABLE_QUICKSTART_LIBPNG to None with --enable-headless

Fixes compile issues with --enable-headless if png headers are installed.
Backport of 37690fe74c4c585564c67c1ff7b8be353cf68033

Change-Id: Ia16b38ae61f485ba62cd2b802a2e1239697be088
---
M configure.ac
1 file changed, 7 insertions(+), 2 deletions(-)



diff --git a/configure.ac b/configure.ac
index b196fe9..89feb7f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4353,7 +4353,7 @@
     test_tde=no
     test_kde=no
     test_kde4=no
-    test_unix_quickstarter=no
+    enable_unix_qstart_libpng=no
     enable_cairo_canvas=no
     enable_gnome_vfs=no
 fi
@@ -9446,7 +9446,12 @@
 
 dnl ===================================================================
 
-PKG_CHECK_MODULES( LIBPNG, libpng, ENABLE_QUICKSTART_LIBPNG="TRUE", ENABLE_QUICKSTART_LIBPNG="" )
+if test "$enable_headless" != "yes"; then
+    PKG_CHECK_MODULES( LIBPNG, libpng, ENABLE_QUICKSTART_LIBPNG="TRUE", ENABLE_QUICKSTART_LIBPNG="" )
+else
+    LIBPNG_LIBS=''
+    LIBPNG_CFLAGS=''
+fi
 AC_SUBST(LIBPNG_LIBS)
 AC_SUBST(LIBPNG_CFLAGS)
 

-- 
To view, visit https://gerrit.libreoffice.org/3802
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia16b38ae61f485ba62cd2b802a2e1239697be088
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Riccardo Magliocchetti <riccardo.magliocchetti at gmail.com>