summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2006-02-28 09:41:43 +0000
committerKurt Zenker <kz@openoffice.org>2006-02-28 09:41:43 +0000
commit6e93bedad4d3a761eab1a16dd0e5677d3b71f82b (patch)
treedfff4b2610f651cfeac32d3f87d6df29ad4754f8
parentf4866f7855671e8722e979197d019d53f7452fca (diff)
INTEGRATION: CWS cairocanvas (1.78.8); FILE MERGED
2006/01/27 12:13:17 thb 1.78.8.2: RESYNC: (1.78-1.86); FILE MERGED 2005/11/09 15:42:26 radekdoulik 1.78.8.1: Issue number: #51657 Submitted by: radekdoulik Reviewed by: radekdoulik checks for cairo library (with version >= 1.0.2)
-rw-r--r--config_office/set_soenv.in8
1 files changed, 6 insertions, 2 deletions
diff --git a/config_office/set_soenv.in b/config_office/set_soenv.in
index ddcc60755de5..5f0e3a01b3e2 100644
--- a/config_office/set_soenv.in
+++ b/config_office/set_soenv.in
@@ -1,8 +1,8 @@
#!@PERL@ -w
#
# Program: set_soenv.in
-# Version: $Revision: 1.91 $
-# Date: $Date: 2006-02-10 11:32:58 $
+# Version: $Revision: 1.92 $
+# Date: $Date: 2006-02-28 10:41:43 $
# Author: Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems, Ireland.
#
#---------------------------------------------------------------------------
@@ -1528,6 +1528,7 @@ ToFile( "ENABLE_GTK", "@ENABLE_GTK@", "e" );
ToFile( "GTK_CFLAGS", "@GTK_CFLAGS@", "e" );
ToFile( "GTK_LIBS", "@GTK_LIBS@", "e" );
ToFile( "ENABLE_STATIC_GTK", "@ENABLE_STATIC_GTK@", "e" );
+ToFile( "ENABLE_CAIRO", "@ENABLE_CAIRO@", "e" );
ToFile( "ENABLE_GNOMEVFS", "@ENABLE_GNOMEVFS@", "e" );
ToFile( "ENABLE_KDE", "@ENABLE_KDE@", "e" );
ToFile( "KDE_CFLAGS", "@KDE_CFLAGS@", "e" );
@@ -1774,6 +1775,9 @@ ToFile( "SYSTEM_JPEG", "@SYSTEM_JPEG@", "e" );
ToFile( "SYSTEM_FREETYPE", "@SYSTEM_FREETYPE@", "e" );
ToFile( "FREETYPE_CFLAGS", "@FREETYPE_CFLAGS@", "e" );
ToFile( "FREETYPE_LIBS", "@FREETYPE_LIBS@", "e" );
+ToFile( "SYSTEM_CAIRO", "@SYSTEM_CAIRO@", "e" );
+ToFile( "CAIRO_CFLAGS", "@CAIRO_CFLAGS@", "e" );
+ToFile( "CAIRO_LIBS", "@CAIRO_LIBS@", "e" );
ToFile( "SYSTEM_LIBWPD", "@SYSTEM_LIBWPD@", "e" );
ToFile( "LIBWPD_CFLAGS", "@LIBWPD_CFLAGS@", "e" );
ToFile( "LIBWPD_LIBS", "@LIBWPD_LIBS@", "e" );