configure.ac | 5 +++--
scp2/source/ooo/file_library_ooo.scp | 8 +-------
2 files changed, 4 insertions(+), 9 deletions(-)
New commits:
commit e22be4a8e4da40dd6609147513aea36bc8f5cfb9
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Wed Nov 21 11:08:21 2012 +0100
scp2: more cairo fixes
Change-Id: Icaaf0c8355d992fcf652c275ea1ebff98f6d3d58
diff --git a/configure.ac b/configure.ac
index 4fb7e73..347f43b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11358,8 +11358,6 @@ else
fi
AC_SUBST(ENABLE_SILENT_MSI)
-AC_SUBST(SCPDEFS)
-
AC_MSG_CHECKING([whether and how to use Xinerama])
if test "$_os" = "Darwin"; then
USE_XINERAMA=YES
@@ -11473,6 +11471,7 @@ if test "$test_cairo" = "yes" ; then
CAIRO_TARBALL="f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz"
PIXMAN_TARBALL="c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2"
BUILD_TYPE="$BUILD_TYPE CAIRO"
+ SCPDEFS="$SCPDEFS -DNEED_CAIRO"
fi
fi
@@ -11825,6 +11824,8 @@ else
fi
AC_SUBST([DOXYGEN])
+AC_SUBST(SCPDEFS)
+
dnl ===================================================================
dnl Product version
dnl ===================================================================
diff --git a/scp2/source/ooo/file_library_ooo.scp
b/scp2/source/ooo/file_library_ooo.scp
index 19e7158..9df93a8 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -569,11 +569,7 @@ End
#endif
-#ifndef LIBO_HEADLESS
-
-#if !defined SYSTEM_CAIRO \
- && (defined ENABLE_CAIRO_CANVAS \
- || (defined WNT && !defined ENABLE_DIRECTX))
+#ifdef NEED_CAIRO
File gid_File_Lib_Cairo
LIB_FILE_BODY;
@@ -609,8 +605,6 @@ End
#endif
-#endif
-
STD_LIB_FILE( gid_File_Lib_Frm , frm)
SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fsstorage, fsstorage.uno )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
