[Libreoffice-commits] .: 4 commits - configure.in vcl/Library_vcl.mk vcl/unx

[Libreoffice Gerrit user]

 configure.in                          |    2 ++
 vcl/Library_vcl.mk                    |    5 +++++
 vcl/unx/generic/printer/ppdparser.cxx |    2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 00bc30789be6888903645cbbbf47974cd7109cad
Author: Riccardo Magliocchetti <riccardo.magliocchetti at gmail.com>
Date:   Thu Sep 6 09:05:27 2012 +0200

    vcl: Add missing graphite support to headless build
    
    Change-Id: I63966bac34678869dbd3ea177905896bbe8934f6

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 5a1dc36..0a7c807 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -310,6 +310,11 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
     vcl/generic/glyphs/graphite_serverfont \
 ))
 endif
+ifeq ($(GUIBASE),headless)
+$(eval $(call gb_Library_add_exception_objects,vcl,\
+    vcl/generic/glyphs/graphite_serverfont \
+))
+endif
 ifeq ($(OS),WNT)
 $(eval $(call gb_Library_use_libraries,vcl,\
     version \
commit 56c307824feb9175c0281a376f836955d810864b
Author: Riccardo Magliocchetti <riccardo.magliocchetti at gmail.com>
Date:   Wed Sep 5 20:43:40 2012 +0200

    configure: disable gnome-vfs with --enable-headless
    
    We are not interested in desktop stuff but thanks!
    
    Change-Id: I03d28ab0d3d2da5cafaebfce52c807bf0c956108

diff --git a/configure.in b/configure.in
index d2502c0..1c5e630 100644
--- a/configure.in
+++ b/configure.in
@@ -4064,6 +4064,7 @@ if test "$enable_headless" = "yes"; then
     test_unix_quickstarter=no
     test_cairo=no
     enable_librsvg=no
+    enable_gnome_vfs=no
 fi
 
 dnl check for cups support
commit 9d207b1158a88cb9b88b935392b61dce515a573d
Author: Riccardo Magliocchetti <riccardo.magliocchetti at gmail.com>
Date:   Wed Sep 5 20:35:24 2012 +0200

    configure: disable librsvg with --enable-headless
    
    librsvg have a long list of dependencies that requires at least
    gdk, so X. On debian the headers package depends on cairo too.
    Indeed not what we want.
    
    Since comments here says that impress depends on it will need to
    eventually disable build of impress.
    
    Change-Id: Ic88f90d03d0a80c1ada9f4224faed9deab2bed52

diff --git a/configure.in b/configure.in
index 7780ab5..d2502c0 100644
--- a/configure.in
+++ b/configure.in
@@ -4063,6 +4063,7 @@ if test "$enable_headless" = "yes"; then
     test_kde4=no
     test_unix_quickstarter=no
     test_cairo=no
+    enable_librsvg=no
 fi
 
 dnl check for cups support
commit 22f2e5f286d55cd5c1ead07fb82cd78027abf490
Author: Riccardo Magliocchetti <riccardo.magliocchetti at gmail.com>
Date:   Wed Sep 5 20:20:01 2012 +0200

    vcl: Fix cups ifdefery
    
    So ENABLE_CUPS is defined if we want CUPS but that does not
    guarantee that we actually have it installed. So use HAVE_CUPS_H
    that is defined only if the cups headers are found.
    
    Change-Id: I7c6c3659b368dbf9f8efab31ef457f41ac162160

diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index 42b05fc..baec393 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -655,7 +655,7 @@ const PPDParser* PPDParser::getParser( const String& rFile )
         PrinterInfoManager& rMgr = PrinterInfoManager::get();
         if( rMgr.getType() == PrinterInfoManager::CUPS )
         {
-#ifdef ENABLE_CUPS
+#ifdef HAVE_CUPS_H
             pNewParser = const_cast<PPDParser*>(static_cast<CUPSManager&>(rMgr).createCUPSParser( aFile ));
 #endif
         }