--- config_office/configure.in.OLD	2005-11-21 02:16:33.437250000 +0200
+++ config_office/configure.in	2005-11-23 05:12:58.296875000 +0200
@@ -52,6 +52,11 @@
                           for specific distributions where the fonts are known 
                           to be already available
 ],,)
+AC_ARG_WITH(dejavu-fonts,
+[  --without-dejavu-fonts Remove DejaVu fonts
+                                (even if present) in the openoffice.org installation
+                                set.
+],,with_dejavu_fonts="yes")
 AC_ARG_ENABLE(epm,
 [  --disable-epm           OO.o includes self-packaging code, that requires
                           epm, however epm is useless for large scale
@@ -4094,6 +4099,18 @@
 fi
 AC_SUBST(WITH_FONTS)
 
+AC_MSG_CHECKING([whether to include DejaVu fonts])
+if test "$with_dejavu_fonts" != "no" -a -e ../dejavu_fonts/download/dejavu-ttf-20050914.tar.gz; then
+  AC_MSG_RESULT([yes])
+  WITH_DEJAVU_FONTS=YES
+  SCPDEFS="$SCPDEFS -DWITH_DEJAVU_FONTS"
+  BUILD_TYPE="$BUILD_TYPE DEJAVU_FONTS"
+else
+  AC_MSG_RESULT([no])
+  WITH_DEJAVU_FONTS=NO
+fi
+AC_SUBST(WITH_DEJAVU_FONTS)
+
 AC_SUBST(SCPDEFS)
 
 AC_MSG_CHECKING([whether and how to use Xinerama])
--- dejavu_fonts/makefile.mk.OLD	1970-01-01 02:00:00.000000000 +0200
+++ dejavu_fonts/makefile.mk	2005-11-23 05:07:41.015625000 +0200
@@ -0,0 +1,78 @@
+#*************************************************************************
+#
+#   OpenOffice.org - a multi-platform office productivity suite
+#
+#   $RCSfile: dejavu-fonts.diff,v $
+#
+#   $Revision: 1.2 $
+#
+#   last change: $Author: davidf $ $Date: 2006/01/10 09:36:10 $
+#
+#   The Contents of this file are made available subject to
+#   the terms of GNU Lesser General Public License Version 2.1.
+#
+#
+#     GNU Lesser General Public License Version 2.1
+#     =============================================
+#     Copyright 2005 by Sun Microsystems, Inc.
+#     901 San Antonio Road, Palo Alto, CA 94303, USA
+#
+#     This library is free software; you can redistribute it and/or
+#     modify it under the terms of the GNU Lesser General Public
+#     License version 2.1, as published by the Free Software Foundation.
+#
+#     This library is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#     Lesser General Public License for more details.
+#
+#     You should have received a copy of the GNU Lesser General Public
+#     License along with this library; if not, write to the Free Software
+#     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+#     MA  02111-1307  USA
+#
+#*************************************************************************
+
+PRJ=.
+
+PRJNAME=dejavu_fonts
+TARGET=dejavu_fonts
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :	settings.mk
+
+# --- Files --------------------------------------------------------
+
+TARFILE_NAME=dejavu-fonts
+TARFILE_ROOTDIR=dejavu-fonts
+
+PATCH_FILE_NAME=
+
+
+CONFIGURE_DIR=
+CONFIGURE_ACTION=
+
+BUILD_DIR=
+BUILD_ACTION=
+BUILD_FLAGS=
+
+# --- Targets ------------------------------------------------------
+
+all: \
+	$(MISC)$/remove_build.flag \
+	ALLTAR
+
+.INCLUDE : set_ext.mk
+.INCLUDE : target.mk
+
+.IF "$(WITH_DEJAVU_FONTS)"!="NO"
+.INCLUDE : tg_ext.mk
+.ENDIF
+
+# Since you never know what will be in a patch (for example, it may already
+# patch at configure level), we remove the entire package directory if a patch
+# is newer.
+$(MISC)$/remove_build.flag : $(PATCH_FILE_NAME)
+	$(REMOVE_PACKAGE_COMMAND)
+	+$(TOUCH) $(MISC)$/remove_build.flag
--- dejavu_fonts/prj/d.lst.OLD	1970-01-01 02:00:00.000000000 +0200
+++ dejavu_fonts/prj/d.lst	2005-11-23 04:52:41.531250000 +0200
@@ -0,0 +1,2 @@
+mkdir: %_DEST%\pck%_EXT%
+..\%__SRC%\misc\build\dejavu-fonts\*.ttf %_DEST%\pck%_EXT%\*.ttf
--- dejavu_fonts/prj/build.lst.OLD	1970-01-01 02:00:00.000000000 +0200
+++ dejavu_fonts/prj/build.lst	2005-11-22 12:05:42.843750000 +0200
@@ -0,0 +1,3 @@
+bs	dejavu_fonts : solenv NULL
+bs	dejavu_fonts		usr1	-	all	amt_mkout NULL
+bs	dejavu_fonts		nmake	-	all	amt_fonts NULL
--- scp2/source/ooo/file_font_ooo.scp.OLD	2005-09-09 04:37:10.000000000 +0300
+++ scp2/source/ooo/file_font_ooo.scp	2005-11-23 05:08:35.375000000 +0200
@@ -151,3 +151,28 @@
 STD_FONTWIN_FILE( gid_File_Fnt_Verasebd, VeraSeBd.ttf, Vera Serif Bold)
 #endif
 #endif
+
+#ifdef WNT
+#ifdef WITH_DEJAVU_FONTS
+STD_FONTWIN_FILE( gid_File_Fnt_DejaVuSansBoldOblique, DejaVuSans-BoldOblique.ttf, DejaVu Sans Bold Oblique)
+STD_FONTWIN_FILE( gid_File_Fnt_DejaVuSansBold, DejaVuSans-Bold.ttf, DejaVu Sans Bold)
+STD_FONTWIN_FILE( gid_File_Fnt_DejaVuSansCondensedBoldOblique, DejaVuSansCondensed-BoldOblique.ttf, DejaVu Sans Condensed Bold Oblique)
+STD_FONTWIN_FILE( gid_File_Fnt_DejaVuSansCondensedBold, DejaVuSansCondensed-Bold.ttf, DejaVu Sans Condensed Bold)
+STD_FONTWIN_FILE( gid_File_Fnt_DejaVuSansCondensedOblique, DejaVuSansCondensed-Oblique.ttf, DejaVu Sans Condensed Oblique)
+STD_FONTWIN_FILE( gid_File_Fnt_DejaVuSansCondensed, DejaVuSansCondensed.ttf, DejaVu Sans Condensed)
+STD_FONTWIN_FILE( gid_File_Fnt_DejaVuSansMonoBoldOb, DejaVuSansMono-BoldOb.ttf, DejaVu Sans Mono Bold Oblique)
+STD_FONTWIN_FILE( gid_File_Fnt_DejaVuSansMonoBold, DejaVuSansMono-Bold.ttf, DejaVu Sans Mono Bold)
+STD_FONTWIN_FILE( gid_File_Fnt_DejaVuSansMonoOblique, DejaVuSansMono-Oblique.ttf, DejaVu Sans Mono Oblique)
+STD_FONTWIN_FILE( gid_File_Fnt_DejaVuSansMonoRoman, DejaVuSansMono-Roman.ttf, DejaVu Sans Mono)
+STD_FONTWIN_FILE( gid_File_Fnt_DejaVuSansOblique, DejaVuSans-Oblique.ttf, DejaVu Sans Oblique)
+STD_FONTWIN_FILE( gid_File_Fnt_DejaVuSans, DejaVuSans.ttf, DejaVu Sans)
+STD_FONTWIN_FILE( gid_File_Fnt_DejaVuSerifBoldOblique, DejaVuSerif-BoldOblique.ttf, DejaVu Serif Bold Oblique)
+STD_FONTWIN_FILE( gid_File_Fnt_DejaVuSerifBold, DejaVuSerif-Bold.ttf, DejaVu Serif Bold)
+STD_FONTWIN_FILE( gid_File_Fnt_DejaVuSerifCondensedBoldOblique, DejaVuSerifCondensed-BoldOblique.ttf, DejaVu Serif Condensed Bold Oblique)
+STD_FONTWIN_FILE( gid_File_Fnt_DejaVuSerifCondensedBold, DejaVuSerifCondensed-Bold.ttf, DejaVu Serif Condensed Bold)
+STD_FONTWIN_FILE( gid_File_Fnt_DejaVuSerifCondensedOblique, DejaVuSerifCondensed-Oblique.ttf, DejaVu Serif Condensed Oblique)
+STD_FONTWIN_FILE( gid_File_Fnt_DejaVuSerifCondensed, DejaVuSerifCondensed.ttf, DejaVu Serif Condensed)
+STD_FONTWIN_FILE( gid_File_Fnt_DejaVuSerifOblique, DejaVuSerif-Oblique.ttf, DejaVu Serif Oblique)
+STD_FONTWIN_FILE( gid_File_Fnt_DejaVuSerifRoman, DejaVuSerif-Roman.ttf, DejaVu Serif)
+#endif
+#endif
--- postprocess/prj/build.lst	2005-11-23 05:56:34.703125000 +0200
+++ postprocess/prj/build.lst	2005-11-23 05:56:48.812500000 +0200
@@ -1,4 +1,4 @@
-po	postprocess	::	accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io lingucomponent MATHMLDTD:MathMLDTD MSFONTEXTRACT:msfontextract ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins scp2 scripting sd sdk_oo setup_native slideshow starmath sw sysui testshl testshl2 testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools NULL
+po	postprocess	::	accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io lingucomponent MATHMLDTD:MathMLDTD MSFONTEXTRACT:msfontextract ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins scp2 scripting sd sdk_oo setup_native slideshow starmath sw sysui testshl testshl2 testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DEJAVU_FONTS:dejavu_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools NULL
 po	postprocess			    	usr1	-	all	po_mkout NULL
 po	postprocess\checkxml		nmake	-	all	po_checkxml NULL
 po	postprocess\packconfig		nmake	-	all	po_packconfig po_checkxml NULL
