diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-02-28 09:41:27 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-02-28 09:41:27 +0000 |
| commit | f4866f7855671e8722e979197d019d53f7452fca (patch) | |
| tree | 5f6620a3a304b666141db0066b1e874f2edf613d /config_office | |
| parent | 4c866ae8a24c9d528b372aa4bf49bf8a29f7e47f (diff) | |
INTEGRATION: CWS cairocanvas (1.139.8); FILE MERGED
2006/01/27 12:12:55 thb 1.139.8.2: RESYNC: (1.139-1.150); FILE MERGED
2005/11/09 15:42:25 radekdoulik 1.139.8.1: Issue number: #51657
Submitted by: radekdoulik
Reviewed by: radekdoulik
checks for cairo library (with version >= 1.0.2)
Diffstat (limited to 'config_office')
| -rw-r--r-- | config_office/configure.in | 37 |
1 files changed, 35 insertions, 2 deletions
diff --git a/config_office/configure.in b/config_office/configure.in index f33738d82f57..8446f5cd2d69 100644 --- a/config_office/configure.in +++ b/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: 2006-02-17 09:21:36 $ +dnl * Date: $Date: 2006-02-28 10:41:27 $ 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.157 $ ) +AC_REVISION( $Revision: 1.158 $ ) AC_PREREQ(2.50) AC_INIT() echo "$@" >config.parms @@ -158,6 +158,10 @@ AC_ARG_ENABLE(gtk, [ --disable-gtk Determines whether to use Gtk+ vclplug on platforms where Gtk+ is available. ],,enable_gtk=yes) +AC_ARG_ENABLE(cairo, +[ --enable-cairo Determines whether to use Cairo canvas backend on platforms + where Cairo is available. +],,) AC_ARG_ENABLE(gnome-vfs, [ --disable-gnome-vfs Determines whether to use the Gnome Virtual Filing System on platforms where that VFS is available @@ -616,6 +620,7 @@ case "$build_os" in solaris*) test_x=yes test_gtk=yes + build_cairo=yes test_kde=yes test_cups=yes _os=SunOS @@ -642,6 +647,7 @@ case "$build_os" in linux-gnu) test_x=yes test_gtk=yes + build_cairo=yes test_kde=yes test_cups=yes if getconf GNU_LIBPTHREAD_VERSION |grep -q NPTL; then @@ -663,11 +669,13 @@ case "$build_os" in test_x=no test_cups=no test_gtk=no + build_cairo=no _os=Darwin ;; freebsd*) test_x=yes test_gtk=yes + build_cairo=yes test_kde=yes test_cups=yes AC_MSG_CHECKING([the FreeBSD operating system release]) @@ -699,6 +707,7 @@ case "$build_os" in netbsd) test_x=yes test_gtk=yes + build_cairo=yes test_kde=yes test_cups=no PTHREAD_CFLAGS="-pthread" @@ -3937,6 +3946,30 @@ AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) dnl =================================================================== +dnl Check whether the Cairo libraries are available. +dnl =================================================================== + +ENABLE_CAIRO="" + +if test "$build_cairo" = "yes"; then + + AC_MSG_CHECKING([whether to enable the Cairo canvas backend]) + if test "x$enable_cairo" != "xno" ; then + ENABLE_CAIRO="TRUE" + SYSTEM_CAIRO=YES + PKG_CHECK_MODULES( CAIRO, cairo >= 1.0.2 ) + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi +fi + +AC_SUBST(ENABLE_CAIRO) +AC_SUBST(SYSTEM_CAIRO) +AC_SUBST(CAIRO_CFLAGS) +AC_SUBST(CAIRO_LIBS) + +dnl =================================================================== dnl Check whether the Qt and KDE libraries are available. dnl =================================================================== |