[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - configure.ac

[Riccardo Magliocchetti]

 configure.ac |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit c3302a23d3539070103584816d554c871b0792b7
Author: Riccardo Magliocchetti <riccardo.magliocchetti at gmail.com>
Date:   Mon May 6 22:20:49 2013 +0200

    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
    Reviewed-on: https://gerrit.libreoffice.org/3802
    Reviewed-by: Jan Holesovsky <kendy at suse.cz>
    Tested-by: Jan Holesovsky <kendy at suse.cz>

diff --git a/configure.ac b/configure.ac
index b196fe9..89feb7f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4353,7 +4353,7 @@ if test "$enable_headless" = "yes"; then
     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 @@ AC_SUBST(TELEPATHY_LIBS)
 
 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)