|
Line
Link Here
|
| 0 |
-- config_office/configure.in |
0 |
++ config_office/configure.in |
|
Lines 780-785
Link Here
|
| 780 |
cygwin*) # Windows |
780 |
cygwin*) # Windows |
| 781 |
test_x=no |
781 |
test_x=no |
| 782 |
test_cups=no |
782 |
test_cups=no |
|
|
783 |
build_cairo=yes |
| 783 |
_os=WINNT |
784 |
_os=WINNT |
| 784 |
;; |
785 |
;; |
| 785 |
darwin*) # Mac OS X |
786 |
darwin*) # Mac OS X |
|
Lines 4641-4652
Link Here
|
| 4641 |
|
4641 |
|
| 4642 |
if test "$build_cairo" = "yes"; then |
4642 |
if test "$build_cairo" = "yes"; then |
| 4643 |
|
4643 |
|
| 4644 |
AC_MSG_CHECKING([whether to enable the Cairo canvas backend]) |
4644 |
AC_MSG_CHECKING([whether to enable the cairo canvas backend]) |
| 4645 |
if test "x$enable_cairo" != "xno" ; then |
4645 |
if test "x$enable_cairo" != "xno" ; then |
| 4646 |
ENABLE_CAIRO="TRUE" |
4646 |
ENABLE_CAIRO="TRUE" |
|
|
4647 |
AC_MSG_RESULT([yes]) |
| 4648 |
AC_MSG_CHECKING([whether to use system cairo]) |
| 4649 |
if test "$_os" != "WINNT"; then |
| 4647 |
SYSTEM_CAIRO=YES |
4650 |
SYSTEM_CAIRO=YES |
| 4648 |
AC_MSG_RESULT([yes]) |
4651 |
AC_MSG_RESULT([yes]) |
| 4649 |
PKG_CHECK_MODULES( CAIRO, cairo >= 1.0.2 ) |
4652 |
PKG_CHECK_MODULES( CAIRO, cairo >= 1.0.2 ) |
|
|
4653 |
else |
| 4654 |
BUILD_TYPE="$BUILD_TYPE CAIRO" |
| 4655 |
AC_MSG_RESULT([no]) |
| 4656 |
fi |
| 4650 |
if test "$with_system_xrender_headers" = "yes"; then |
4657 |
if test "$with_system_xrender_headers" = "yes"; then |
| 4651 |
AC_MSG_CHECKING([whether Xrender.h defines PictStandardA8]) |
4658 |
AC_MSG_CHECKING([whether Xrender.h defines PictStandardA8]) |
| 4652 |
AC_TRY_RUN([ |
4659 |
AC_TRY_RUN([ |