summaryrefslogtreecommitdiff
path: root/config_office
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2005-06-09 13:14:33 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2005-06-09 13:14:33 +0000
commitba42ec73cad4abb6fec8ca55e31c3e5e703274da (patch)
tree73dfaab3db749053a265f5aa64005bb363fd745f /config_office
parent3d9c5f95068c5fbd897dc96aac84c49935c023b4 (diff)
INTEGRATION: CWS evoab202 (1.114.2); FILE MERGED
2005/04/15 21:20:03 mmeeks 1.114.2.1: i#34909# mmeeks Configure options for evo2 integration
Diffstat (limited to 'config_office')
-rw-r--r--config_office/configure.in24
1 files changed, 22 insertions, 2 deletions
diff --git a/config_office/configure.in b/config_office/configure.in
index 666b135500d7..5ee53e67c1e1 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: 2005-05-31 17:03:12 $
+dnl * Date: $Date: 2005-06-09 14:14:33 $
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.119 $ )
+AC_REVISION( $Revision: 1.120 $ )
AC_PREREQ(2.50)
AC_INIT()
echo "$@" >config.parms
@@ -57,6 +57,10 @@ AC_ARG_ENABLE(fontooo,
[ --disable-fontooo disable FontOOo
(useful for distributions using fontconfig for OOo)
],,enable_fontooo="yes")
+AC_ARG_ENABLE(evolution2,
+[ --enable-evolution2 Allows the built-in evolution 2 addressbook connectivity
+ build to be enabled.
+],,)
AC_ARG_WITH(system-stdlibs,
[ --with-system-stdlibs use libstdc++/libgcc_s already on system
],,)
@@ -3621,6 +3625,22 @@ AC_SUBST(LIBSN_CFLAGS)
AC_SUBST(LIBSN_LIBS)
dnl ===================================================================
+dnl Test whether to include Evolution 2 support
+dnl ===================================================================
+AC_MSG_CHECKING([whether to enable evolution 2 support])
+if test "$enable_evolution2" = "yes" -o "$enable_evolution2" = "TRUE"; then
+ AC_MSG_RESULT([yes])
+ PKG_CHECK_MODULES(GOBJECT, gobject-2.0)
+ ENABLE_EVOAB2="TRUE"
+else
+ ENABLE_EVOAB2=""
+ AC_MSG_RESULT([no])
+fi
+AC_SUBST(ENABLE_EVOAB2)
+AC_SUBST(GOBJECT_CFLAGS)
+AC_SUBST(GOBJECT_LIBS)
+
+dnl ===================================================================
dnl Test whether to include FontOOo
dnl ===================================================================
AC_MSG_CHECKING([whether to include FontOOo])