[Libreoffice-commits] core.git: configure.ac

[Riccardo Magliocchetti]

 configure.ac |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 37690fe74c4c585564c67c1ff7b8be353cf68033
Author: Riccardo Magliocchetti <riccardo.magliocchetti at gmail.com>
Date:   Mon May 6 22:10:25 2013 +0200

    configure: force ENABLE_QUICKSTART_LIBPNG to None with --enable-headless
    
    Change-Id: I7ab931bb7c4f0d83dd7701650ec0d6a1ef83fda2

diff --git a/configure.ac b/configure.ac
index cda53d4..8ec5b84 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4330,7 +4330,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
@@ -9536,7 +9536,9 @@ 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="" )
+fi
 AC_SUBST(LIBPNG_LIBS)
 AC_SUBST(LIBPNG_CFLAGS)