summaryrefslogtreecommitdiff
path: root/config_office/configure.in
diff options
context:
space:
mode:
Diffstat (limited to 'config_office/configure.in')
-rw-r--r--config_office/configure.in81
1 files changed, 39 insertions, 42 deletions
diff --git a/config_office/configure.in b/config_office/configure.in
index 4240461afb91..efe5cf0c7135 100644
--- a/config_office/configure.in
+++ b/config_office/configure.in
@@ -197,11 +197,11 @@ AC_ARG_ENABLE(systray,
[ --disable-systray Determines whether to build the systray quickstarter.
],,enable_systray=yes)
AC_ARG_ENABLE(cairo,
-[ --enable-cairo Determines whether to use Cairo canvas backend on
+[ --enable-cairo Determines whether to use Cairo library on
platforms where Cairo is available.
],,enable_cairo=no)
AC_ARG_WITH(system-cairo,
-[ --with-system-cairo Use cairo libraries already on system
+[ --with-system-cairo Use Cairo libraries already on system
],,)
AC_ARG_ENABLE(opengl,
[ --enable-opengl Determines whether to use OpenGL (for 3D transitions)
@@ -872,7 +872,7 @@ dnl ===================================================================
case "$build_os" in
solaris*)
test_gtk=yes
- build_cairo=yes
+ test_cairo=yes
test_kde=yes
test_cups=yes
test_randr=yes
@@ -900,7 +900,7 @@ case "$build_os" in
;;
linux-gnu*)
test_gtk=yes
- build_cairo=yes
+ test_cairo=yes
test_kde=yes
test_cups=yes
test_randr=yes
@@ -916,14 +916,14 @@ case "$build_os" in
;;
cygwin*) # Windows
test_cups=no
- build_cairo=yes
+ test_cairo=yes
test_freetype=no
_os=WINNT
;;
darwin*) # Mac OS X
test_cups=yes
test_gtk=yes
- build_cairo=yes
+ test_cairo=yes
test_randr=no
test_freetype=no
_os=Darwin
@@ -943,7 +943,7 @@ case "$build_os" in
;;
freebsd*)
test_gtk=yes
- build_cairo=yes
+ test_cairo=yes
test_kde=yes
test_cups=yes
test_randr=yes
@@ -976,7 +976,7 @@ case "$build_os" in
;;
netbsd)
test_gtk=yes
- build_cairo=yes
+ test_cairo=yes
test_kde=yes
test_cups=no
test_randr=yes
@@ -5238,21 +5238,32 @@ AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
dnl ===================================================================
-dnl dnl Check whether to enable the cairo canvas backend.
+dnl Check whether the Cairo libraries are available.
dnl ===================================================================
ENABLE_CAIRO=""
+BUILD_PIXMAN=""
+SYSTEM_CAIRO=""
-if test "$build_cairo" = "yes"; then
+if test "$test_cairo" = "yes"; then
- AC_MSG_CHECKING([whether to enable the cairo canvas backend])
+ AC_MSG_CHECKING([whether to use cairo])
if test "x$enable_cairo" != "xno" ; then
- AC_MSG_RESULT([yes])
- ENABLE_CAIRO="TRUE"
- if test "$_os" != "WINNT"; then
- if test "$with_system_xrender_headers" = "yes"; then
- AC_MSG_CHECKING([whether Xrender.h defines PictStandardA8])
- AC_TRY_RUN([
+ ENABLE_CAIRO="TRUE"
+ 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 "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$ENABLE_FONTCONFIG" != "TRUE" ; then
+ AC_MSG_ERROR([Cairo library requires fontconfig.])
+ fi
+ 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) {
@@ -5263,36 +5274,22 @@ int main(int argc, char **argv) {
#endif
}
], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([no, X headers too old.])])
- fi
- fi
- else
- AC_MSG_RESULT([no])
- fi
-fi
-
-dnl ===================================================================
-dnl Check for system cairo
-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
-
-if test "$ENABLE_CAIRO" = "TRUE"; then
- AC_MSG_CHECKING([which cairo to use])
- if test "$with_system_cairo" != "yes" && test "$_os" = "Linux"; then
- BUILD_TYPE="$BUILD_TYPE CAIRO"
- AC_MSG_RESULT([internal])
- SYSTEM_CAIRO=NO
+ fi
+ else
+ BUILD_TYPE="$BUILD_TYPE CAIRO"
+ dnl === compiler fails on pixman with 64bit architectures...===
+ if test "$build_cpu" != "x86_64"; then
+ BUILD_PIXMAN=YES
+ fi
+ AC_MSG_RESULT([internal])
+ fi
else
- AC_MSG_RESULT([external])
- SYSTEM_CAIRO=YES
- PKG_CHECK_MODULES( CAIRO, cairo >= 1.0.2 )
+ AC_MSG_RESULT([no])
fi
fi
AC_SUBST(ENABLE_CAIRO)
+AC_SUBST(BUILD_PIXMAN)
AC_SUBST(SYSTEM_CAIRO)
AC_SUBST(CAIRO_CFLAGS)
AC_SUBST(CAIRO_LIBS)