diff options
-rw-r--r-- | configure.in | 39 | ||||
-rw-r--r-- | scp2/source/ooo/shortcut_ooo.scp | 22 | ||||
-rw-r--r-- | set_soenv.in | 4 | ||||
-rw-r--r-- | solenv/config/sdev300.ini | 1 | ||||
-rw-r--r-- | solenv/inc/tg_ext.mk | 4 |
5 files changed, 68 insertions, 2 deletions
diff --git a/configure.in b/configure.in index 0fa4670b0d48..5cb5c0f61097 100644 --- a/configure.in +++ b/configure.in @@ -29,6 +29,12 @@ AC_ARG_WITH(gpc, [ --without-gpc Use the internal polygon clipping code instead of the external GPC polygon clipping library. ],,if test ! -e ./external/gpc/gpc.c && test ! -e ./external/gpc/gpc.h; then without_gpc=yes; fi) +AC_ARG_ENABLE(graphite, +[ --enable-graphite Enables the compilation of Graphite smart font rendering +],,) +AC_ARG_WITH(system-graphite, +[ --with-system-graphite use graphite library already installed on system +],,) AC_ARG_ENABLE(ldap, [ --disable-ldap Disables the use of LDAP backend via Netscape/Mozilla or OpenLDAP LDAP SDK @@ -4345,6 +4351,39 @@ AC_SUBST(SYSTEM_GENCCODE) AC_SUBST(SYSTEM_GENCMN) dnl =================================================================== +dnl Graphite +dnl =================================================================== + +AC_MSG_CHECKING([whether to enable graphite support]) +if test "$_os" = "WINNT" -o "$_os" = "Linux" && test "z$enable_graphite" == "z" -o "$enable_graphite" != "no" ; then + AC_MSG_RESULT([yes]) + ENABLE_GRAPHITE="TRUE" + AC_MSG_CHECKING([which graphite to use]) + if test -n "$with_system_graphite" -o -n "$with_system_libs" && \ + test "$with_system_graphite" != "no"; then + AC_MSG_RESULT([external]) + SYSTEM_GRAPHITE=YES + PKG_CHECK_MODULES( GRAPHITE, silgraphite ) + AC_MSG_CHECKING([STL compatibility]) + if test "$WITH_STLPORT" != "no"; then + AC_MSG_ERROR([to use system graphite you need to use --without-stlport]) + else + AC_MSG_RESULT([OK]) + fi + else + AC_MSG_RESULT([internal]) + SYSTEM_GRAPHITE=NO + BUILD_TYPE="$BUILD_TYPE GRAPHITE" + fi +else + AC_MSG_RESULT([no]) +fi +AC_SUBST(ENABLE_GRAPHITE) +AC_SUBST(SYSTEM_GRAPHITE) +AC_SUBST(GRAPHITE_LIBS) +AC_SUBST(GRAPHITE_CFLAGS) + +dnl =================================================================== dnl Checks for libraries. dnl =================================================================== dnl Check for Mac OS X native GUI, which may is now required; the X11 build is no longer supported diff --git a/scp2/source/ooo/shortcut_ooo.scp b/scp2/source/ooo/shortcut_ooo.scp index 2740fe563b69..357f976771b3 100644 --- a/scp2/source/ooo/shortcut_ooo.scp +++ b/scp2/source/ooo/shortcut_ooo.scp @@ -62,6 +62,28 @@ Shortcut gid_Shortcut_Lib_Icuuc End #endif + +Shortcut gid_Shortcut_Lib_Graphite_0 + FileID = gid_File_Lib_Graphite; + Dir = gid_Dir_Program; + Name = STRING(CONCAT2(libgraphite,UNXSUFFIX)); + Styles = (NETWORK,RELATIVE); +End + +Shortcut gid_Shortcut_Lib_Graphite_1 + FileID = gid_File_Lib_Graphite; + Dir = gid_Dir_Program; + Name = STRING(CONCAT4(libgraphite,UNXSUFFIX,.,3)); + Styles = (NETWORK,RELATIVE); +End + +Shortcut gid_Shortcut_Lib_Graphite_2 + FileID = gid_File_Lib_Graphite; + Dir = gid_Dir_Program; + Name = STRING(CONCAT4(libgraphite,UNXSUFFIX,.,3.0)); + Styles = (NETWORK,RELATIVE); +End + #endif #ifdef MACOSX diff --git a/set_soenv.in b/set_soenv.in index c02b3ff603d7..22b0a5707f4d 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -1819,6 +1819,10 @@ ToFile( "ENABLE_DIRECTX", "@ENABLE_DIRECTX@", "e" ); ToFile( "ENABLE_LAYOUT", "@ENABLE_LAYOUT@", "e" ); ToFile( "ENABLE_PCH", "@ENABLE_PCH@", "e" ); ToFile( "NO_HIDS", "@NO_HIDS@", "e" ); +ToFile( "ENABLE_GRAPHITE", "@ENABLE_GRAPHITE@", "e"); +ToFile( "SYSTEM_GRAPHITE", "@SYSTEM_GRAPHITE@", "e"); +ToFile( "GRAPHITE_LIBS", "@GRAPHITE_LIBS@", "e"); +ToFile( "GRAPHITE_CFLAGS", "@GRAPHITE_CFLAGS@", "e"); ToFile( "VC_STANDARD", "@VC_STANDARD@", "e" ); ToFile( "WITH_GPC", "@WITH_GPC@", "e" ); ToFile( "WITH_MYSPELL_DICTS","@WITH_MYSPELL_DICTS@","e"); diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini index c331c2f8f7c9..743110beec24 100644 --- a/solenv/config/sdev300.ini +++ b/solenv/config/sdev300.ini @@ -26,6 +26,7 @@ common ENABLE_GCONF TRUE ENABLE_GNOMEVFS TRUE ENABLE_GTK TRUE + ENABLE_GRAPHITE TRUE ENABLE_MEDIAWIKI YES ENABLE_MINIMIZER YES ENABLE_RANDR TRUE diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk index f000775b2279..058dfadcc608 100644 --- a/solenv/inc/tg_ext.mk +++ b/solenv/inc/tg_ext.mk @@ -34,9 +34,9 @@ # setup INCLUDE variable for use by VC++ .IF "$(GUI)$(COM)"=="WNTMSC" .IF "$(EXT_USE_STLPORT)"=="" -INCLUDE!:=$(subst,$/stl, $(SOLARINC)) +INCLUDE!:=. $(subst,$/stl, $(SOLARINC)) .ELSE # "$(EXT_USE_STLPORT)"=="" -INCLUDE!:=$(SOLARINC) +INCLUDE!:=. $(SOLARINC) .ENDIF # "$(EXT_USE_STLPORT)"=="" INCLUDE!:=$(INCLUDE:s/ -I/;/) .EXPORT : INCLUDE |