INTEGRATION: CWS cairoquartz01 (1.198.2); FILE MERGED

2008/03/25 19:40:50 mox 1.198.2.19: Refine comment
2008/03/25 19:35:28 mox 1.198.2.18: Three times the charm... On linux, default to system cairo
2008/03/17 19:18:59 mox 1.198.2.17: Revert duplicate code and revert configure -file to contain only CWS changes.
2008/03/17 15:23:53 thb 1.198.2.16: Forgot about the system-libs all-inclusive switch
2008/03/17 14:33:01 thb 1.198.2.15: Actually made the check work (for defaulting to system cairo)
2008/03/17 13:52:53 thb 1.198.2.14: Make system cairo the default on linux
2008/03/10 21:53:00 mox 1.198.2.13: Remove forced test builds.

This CWS is now ready for QA and integration.
2008/03/08 12:26:09 mox 1.198.2.12: RESYNC: (1.249-1.252); FILE MERGED
2008/03/01 08:45:41 mox 1.198.2.11: TESTING: force-enable cairo on supported platforms to get more build
testing on the CWS. Force system-cairo for Linux platform.
TO BE REMOVED when this CWS goes to integration.
2008/02/29 06:28:16 mox 1.198.2.10: TESTING: force-enable cairo on supported platforms to get more build
testing on the CWS. TO BE REMOVED when this CWS goes to integration.
2008/02/23 13:13:13 mox 1.198.2.9: RESYNC: (1.241-1.249); FILE MERGED
2008/01/16 19:18:31 mox 1.198.2.8: RESYNC: (1.232-1.241); FILE MERGED
2007/12/10 17:46:16 mox 1.198.2.7: RESYNC: (1.221-1.232); FILE MERGED
2007/10/14 19:16:18 mox 1.198.2.6: RESYNC: (1.216-1.221); FILE MERGED
2007/08/11 18:12:42 mox 1.198.2.5: RESYNC: (1.213-1.216); FILE MERGED
2007/07/11 18:15:03 mox 1.198.2.4: RESYNC: (1.208-1.213); FILE MERGED
2007/06/20 15:12:51 mox 1.198.2.3: RESYNC: (1.198-1.208); FILE MERGED
2007/06/01 18:04:43 thb 1.198.2.2: #i70519# The remainder from tml's wincairo patches - enable cairo support for Windows builds
2007/04/14 07:09:10 mox 1.198.2.1: Issue number:  #69066# update configure.in to support Cairo Quartz implementation

config_office/configure.in

@@ -3,7 +3,7 @@ dnl *     vi:set sw=3 ts=3 et:
 dnl *
 dnl * Name: configure.in
 dnl * Auth: Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems Ireland
-dnl * Date: $Date: 2008-03-18 16:09:23 $
+dnl * Date: $Date: 2008-04-02 09:48:48 $
 dnl *
 dnl * Desc: This file serves as input for the GNU autoconf package
 dnl *       in order to create a configure script.
@@ -12,7 +12,7 @@ dnl *       necessary to build OpenOffice.org
 dnl *
 dnl *
 dnl ******************************************************************/
-AC_REVISION( $Revision: 1.254 $ )
+AC_REVISION( $Revision: 1.255 $ )
 AC_PREREQ(2.50)
 AC_INIT()
 echo "$@" >config.parms
@@ -194,6 +194,9 @@ AC_ARG_ENABLE(cairo,
 [  --enable-cairo          Determines whether to use Cairo canvas backend on
                           platforms where Cairo is available.
 ],,enable_cairo=no)
+AC_ARG_WITH(system-cairo,
+[  --with-system-cairo      Use cairo libraries already on system
+],,)
 AC_ARG_ENABLE(opengl,
 [  --enable-opengl         Determines whether to use OpenGL (for 3D transitions)
                           This is built as an UNO extension and not deployed
@@ -833,12 +836,13 @@ case "$build_os" in
 		;;
 	cygwin*) # Windows
 		test_cups=no
+		build_cairo=yes
 		_os=WINNT
 		;;
 	darwin*) # Mac OS X
 		test_cups=yes
 		test_gtk=yes
-		build_cairo=no
+		build_cairo=yes
 		_os=Darwin
       if test "$enable_systray" = "yes" && test "$enable_gtk" != "no"; then
          AC_MSG_WARN([Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray])
@@ -4960,19 +4964,30 @@ dnl ===================================================================
 dnl Check whether the Cairo libraries are available.
 dnl ===================================================================
 
+dnl === Linux has no "internal cairo" (prebuilt or in OOo source). Default to system cairo on Linux. ===
+if test -z "$with_system_cairo" -a "$_os" = "Linux"; then
+   with_system_cairo="yes"
+fi
+
 ENABLE_CAIRO=""
+SYSTEM_CAIRO=""
 
 if test  "$build_cairo" = "yes"; then
 
-    AC_MSG_CHECKING([whether to enable the Cairo canvas backend])
+    AC_MSG_CHECKING([whether to enable the cairo canvas backend])
     if test "x$enable_cairo" != "xno" ; then
         ENABLE_CAIRO="TRUE"
-	     SYSTEM_CAIRO=YES
-	     AC_MSG_RESULT([yes])
-	     PKG_CHECK_MODULES( CAIRO, cairo >= 1.0.2 )
-        if test "$with_system_xrender_headers" = "yes"; then
-            AC_MSG_CHECKING([whether Xrender.h defines PictStandardA8])
-            AC_TRY_RUN([
+	AC_MSG_RESULT([yes])
+        AC_MSG_CHECKING([which cairo to use])
+        if test -n "$with_system_cairo" -o -n "$with_system_libs" && \
+           test "$with_system_cairo" != "no"; then
+           AC_MSG_RESULT([external])
+           SYSTEM_CAIRO=YES
+	   
+           PKG_CHECK_MODULES( CAIRO, cairo >= 1.0.2 )
+           if test "$with_system_xrender_headers" = "yes"; then
+              AC_MSG_CHECKING([whether Xrender.h defines PictStandardA8])
+              AC_TRY_RUN([
 #include <X11/extensions/Xrender.h>
 
 int main(int argc, char **argv) {
@@ -4982,10 +4997,14 @@ int main(int argc, char **argv) {
       return 1;
 #endif
 }
-            ], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([no, X headers too old.])])
+               ], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([no, X headers too old.])])
+           fi
+        else
+           BUILD_TYPE="$BUILD_TYPE CAIRO"
+           AC_MSG_RESULT([internal])
         fi
     else
-	     AC_MSG_RESULT([no])
+	   AC_MSG_RESULT([no])
     fi
 fi