[Libreoffice] [RFC] cairo-less build, misc build patches

Hello,

i'm poking again with X11 / cairo / whatever less build and i've found 
that cairo is required even if cairo canvas is disabled. I can expect it 
will break the case without cairo cainvas but with librsvg, should i 
prevent the case?

With this patch the build is failing with missing X11 headers and then 
with this that looks like a missing -Ifreetype2/ somewhere:

In file included from /home/rm/src/libo/vcl/inc/generic/glyphcache.hxx:64:0,
                 from 
/home/rm/src/libo/vcl/generic/print/genpspgraphics.cxx:42:
/usr/include/ft2build.h:56:38: fatal error: freetype/config/ftheader.h: 
No such file or directory

Any hint?

Also while analyzing some build failures :) it looks to me that 
tools/inc/tools/prex.h should close the extern C block. Patch attached.

Finally vcl/unx/generic/printer/cupsmgr.cxx probably want also to be 
enclosed in HAVE_CUPS_H. Patch attached too.

Please note that I'm diffing against an old master because of 
anongit.fd.o problems.

Statement about license of my contributions here [1]

Please review :)

[1] 
http://lists.freedesktop.org/archives/libreoffice/2012-February/025156.html

--
Riccardo Magliocchetti

diff --git a/configure.in b/configure.in
index 6ab110d..0e718ad 100644
--- a/configure.in
+++ b/configure.in
@@ -9466,7 +9466,7 @@ SYSTEM_CAIRO=""
 
 AC_MSG_CHECKING([whether to use the system cairo])
 
-if test "$with_system_cairo" = "yes"; then
+if test "$enable_cairo_canvas" = "yes" -a "$with_system_cairo" = "yes"; then
     SYSTEM_CAIRO=YES
     AC_MSG_RESULT([yes])
 
@@ -9497,7 +9497,9 @@ else
             BUILD_TYPE="$BUILD_TYPE CAIRO"
         fi
     else
-        BUILD_TYPE="$BUILD_TYPE CAIRO"
+        if test "$enable_cairo_canvas" = "yes"; then
+            BUILD_TYPE="$BUILD_TYPE CAIRO"
+        fi
     fi
 fi
 

diff --git a/tools/inc/tools/prex.h b/tools/inc/tools/prex.h
index e1e11f2..3b59908 100644
--- a/tools/inc/tools/prex.h
+++ b/tools/inc/tools/prex.h
@@ -63,6 +63,10 @@ typedef unsigned long Pixel;
 
 #define __Ol_OlXlibExt_h__
 
+#if defined __cplusplus
+}
+#endif
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx
index 85c2e74..6929bb0 100644
--- a/vcl/unx/generic/printer/cupsmgr.cxx
+++ b/vcl/unx/generic/printer/cupsmgr.cxx
@@ -26,6 +26,7 @@
  *
  ************************************************************************/
 
+#ifdef HAVE_CUPS_H
 
 #include <cups/cups.h>
 #include <cups/http.h>
@@ -1177,4 +1178,6 @@ const char* CUPSManager::authenticateUser( const char* /*pIn*/ )
     return pRet;
 }
 
+#endif
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */