| blob | 24c7d6bd26ae810f3a5fe540e7e7979239b7c1fb |
1 --- configure.in
2 +++ configure.in
3 @@ -75,6 +75,11 @@
4 distributions where AFM files or TrueType Fonts
5 are known to be available.
6 ],,)
7 +AC_ARG_WITH(agfa-monotype-fonts,
8 +[ --without-agfa-monotype-fonts Remove proprietary Agfa Monotype fonts
9 + (even if present) in the openoffice.org installation
10 + set.
11 +],,with_agfa_monotype_fonts="yes")
12 AC_ARG_ENABLE(epm,
13 [ --disable-epm OO.o includes self-packaging code, that requires
14 epm, however epm is useless for large scale
15 @@ -4317,6 +4322,18 @@
16 fi
17 AC_SUBST(WITH_FONTS)
19 +AC_MSG_CHECKING([whether to include Agfa Monotype fonts])
20 +if test "$with_agfa_monotype_fonts" != "no" -a -e ../agfa_monotype_fonts/download/agfa-monotype-fonts.tar.gz; then
21 + AC_MSG_RESULT([yes])
22 + WITH_AGFA_MONOTYPE_FONTS=YES
23 + SCPDEFS="$SCPDEFS -DWITH_AGFA_MONOTYPE_FONTS"
24 + BUILD_TYPE="$BUILD_TYPE AGFA_MONOTYPE_FONTS"
25 +else
26 + AC_MSG_RESULT([no])
27 + WITH_AGFA_MONOTYPE_FONTS=NO
28 +fi
29 +AC_SUBST(WITH_AGFA_MONOTYPE_FONTS)
30 +
31 dnl ===================================================================
32 dnl Test whether to include ppds
33 dnl ===================================================================
34 --- agfa_monotype_fonts/makefile.mk.OLD 1970-01-01 02:00:00.000000000 +0200
35 +++ agfa_monotype_fonts/makefile.mk 2005-11-23 05:07:41.015625000 +0200
36 @@ -0,0 +1,78 @@
37 +#*************************************************************************
38 +#
39 +# OpenOffice.org - a multi-platform office productivity suite
40 +#
41 +# $RCSfile$
42 +#
43 +# $Revision$
44 +#
45 +# last change: $Author$ $Date$
46 +#
47 +# The Contents of this file are made available subject to
48 +# the terms of GNU Lesser General Public License Version 2.1.
49 +#
50 +#
51 +# GNU Lesser General Public License Version 2.1
52 +# =============================================
53 +# Copyright 2005 by Sun Microsystems, Inc.
54 +# 901 San Antonio Road, Palo Alto, CA 94303, USA
55 +#
56 +# This library is free software; you can redistribute it and/or
57 +# modify it under the terms of the GNU Lesser General Public
58 +# License version 2.1, as published by the Free Software Foundation.
59 +#
60 +# This library is distributed in the hope that it will be useful,
61 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
62 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
63 +# Lesser General Public License for more details.
64 +#
65 +# You should have received a copy of the GNU Lesser General Public
66 +# License along with this library; if not, write to the Free Software
67 +# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
68 +# MA 02111-1307 USA
69 +#
70 +#*************************************************************************
71 +
72 +PRJ=.
73 +
74 +PRJNAME=agfa_monotype_fonts
75 +TARGET=agfa_monotype_fonts
76 +
77 +# --- Settings -----------------------------------------------------
78 +
79 +.INCLUDE : settings.mk
80 +
81 +# --- Files --------------------------------------------------------
82 +
83 +TARFILE_NAME=agfa-monotype-fonts
84 +TARFILE_ROOTDIR=agfa-monotype-fonts
85 +
86 +PATCH_FILE_NAME=
87 +
88 +
89 +CONFIGURE_DIR=
90 +CONFIGURE_ACTION=
91 +
92 +BUILD_DIR=
93 +BUILD_ACTION=
94 +BUILD_FLAGS=
95 +
96 +# --- Targets ------------------------------------------------------
97 +
98 +all: \
99 + $(MISC)$/remove_build.flag \
100 + ALLTAR
101 +
102 +.INCLUDE : set_ext.mk
103 +.INCLUDE : target.mk
104 +
105 +.IF "$(WITH_AGFA_MONOTYPE_FONTS)"!="NO"
106 +.INCLUDE : tg_ext.mk
107 +.ENDIF
108 +
109 +# Since you never know what will be in a patch (for example, it may already
110 +# patch at configure level), we remove the entire package directory if a patch
111 +# is newer.
112 +$(MISC)$/remove_build.flag : $(PATCH_FILE_NAME)
113 + $(REMOVE_PACKAGE_COMMAND)
114 + +$(TOUCH) $(MISC)$/remove_build.flag
115 --- agfa_monotype_fonts/prj/d.lst.OLD 1970-01-01 02:00:00.000000000 +0200
116 +++ agfa_monotype_fonts/prj/d.lst 2005-11-23 04:52:41.531250000 +0200
117 @@ -0,0 +1,2 @@
118 +mkdir: %_DEST%\pck%_EXT%
119 +..\%__SRC%\misc\build\agfa-monotype-fonts\*.ttf %_DEST%\pck%_EXT%\*.ttf
120 --- agfa_monotype_fonts/prj/build.lst.OLD 1970-01-01 02:00:00.000000000 +0200
121 +++ agfa_monotype_fonts/prj/build.lst 2005-11-22 12:05:42.843750000 +0200
122 @@ -0,0 +1,3 @@
123 +bs agfa_monotype_fonts : solenv NULL
124 +bs agfa_monotype_fonts usr1 - all amt_mkout NULL
125 +bs agfa_monotype_fonts nmake - all amt_fonts NULL
126 --- scp2/source/ooo/file_font_ooo.scp.OLD 2005-09-09 04:37:10.000000000 +0300
127 +++ scp2/source/ooo/file_font_ooo.scp 2005-11-23 05:08:35.375000000 +0200
128 @@ -151,3 +151,31 @@
129 STD_FONT_FILE( gid_File_Fnt_LiberationSerif_BoldItalic, LiberationSerif-BoldItalic.ttf, Liberation Serif Bold Italic)
130 #endif
131 #endif
132 +
133 +#ifdef WNT
134 +#ifdef WITH_AGFA_MONOTYPE_FONTS
135 +STD_FONTWIN_FILE( gid_File_Fnt_albw, albw.ttf, AlbanyAMT)
136 +STD_FONTWIN_FILE( gid_File_Fnt_albwb, albwb.ttf, AlbanyAMT Bold)
137 +STD_FONTWIN_FILE( gid_File_Fnt_albwbi, albwbi.ttf, AlbanyAMT Bold Italic)
138 +STD_FONTWIN_FILE( gid_File_Fnt_albwi, albwi.ttf, AlbanyAMT Italic)
139 +STD_FONTWIN_FILE( gid_File_Fnt_andybol, andybol_.ttf, AndyMT Bold)
140 +STD_FONTWIN_FILE( gid_File_Fnt_andyreg, andyreg_.ttf, AndyMT)
141 +STD_FONTWIN_FILE( gid_File_Fnt_ans, ans_____.ttf, Andale Sans)
142 +STD_FONTWIN_FILE( gid_File_Fnt_ansb, ansb____.ttf, Andale Sans Bold)
143 +STD_FONTWIN_FILE( gid_File_Fnt_ansbi, ansbi___.ttf, Andale Sans Bold Italic)
144 +STD_FONTWIN_FILE( gid_File_Fnt_ansi, ansi____.ttf, Andale Sans Italic)
145 +STD_FONTWIN_FILE( gid_File_Fnt_bl, bl______.ttf, BellMT)
146 +STD_FONTWIN_FILE( gid_File_Fnt_blb, blb_____.ttf, BellMT Bold)
147 +STD_FONTWIN_FILE( gid_File_Fnt_blbi, blbi____.ttf, BellMT Bold Italic)
148 +STD_FONTWIN_FILE( gid_File_Fnt_bli, bli_____.ttf, BellMT Italic)
149 +STD_FONTWIN_FILE( gid_File_Fnt_cumbwb, cumbwb__.ttf, CumberlandAMT Bold)
150 +STD_FONTWIN_FILE( gid_File_Fnt_cumbwbi, cumbwbi_.ttf, CumberlandAMT Bold Italic)
151 +STD_FONTWIN_FILE( gid_File_Fnt_cumbwi, cumbwi__.ttf, CumberlandAMT Italic)
152 +STD_FONTWIN_FILE( gid_File_Fnt_cumbwr, cumbwr__.ttf, CumberlandAMT)
153 +STD_FONTWIN_FILE( gid_File_Fnt_mtsorts, mtsorts_.ttf, Monotype Sorts)
154 +STD_FONTWIN_FILE( gid_File_Fnt_thowb, thowb___.ttf, ThorndaleAMT Bold)
155 +STD_FONTWIN_FILE( gid_File_Fnt_thowbi, thowbi__.ttf, ThorndaleAMT Bold Italic)
156 +STD_FONTWIN_FILE( gid_File_Fnt_thowi, thowi___.ttf, ThorndaleAMT Italic)
157 +STD_FONTWIN_FILE( gid_File_Fnt_thowr, thowr___.ttf, ThorndaleAMT)
158 +#endif
159 +#endif
160 --- postprocess/prj/build.lst 2005-11-23 05:56:34.703125000 +0200
161 +++ postprocess/prj/build.lst 2005-11-23 05:56:48.812500000 +0200
162 @@ -1,4 +1,4 @@
163 -po postprocess :: accessibility automation basctl bean fondu BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD MSFONTEXTRACT:msfontextract ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui 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 JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext writerfilter oox NULL
164 +po postprocess :: accessibility automation basctl bean fondu BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD MSFONTEXTRACT:msfontextract ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testshl2 testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts AGFA_MONOTYPE_FONTS:agfa_monotype_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext writerfilter oox NULL
165 po postprocess usr1 - all po_mkout NULL
166 po postprocess\checkxml nmake - all po_checkxml NULL
167 po postprocess\packconfig nmake - all po_packconfig po_checkxml NULL