1 --- jade-1.2.1.orig/Makefile.lib.in
2 +++ jade-1.2.1/Makefile.lib.in
5 CLEANFILES=-r lib$(LIB).la $(OBJS) $(COBJS) $(LT_OBJS) core .libs Makefile.lt
7 +LIB_THREADS=@LIB_THREADS@
14 lib$(LIB).la: $(LT_OBJS)
15 $(LIBTOOL) --mode=link $(CC) -o lib$(LIB).la $(LT_OBJS) \
16 - -rpath $(libdir) -version-info $(LTVERSION)
17 + -rpath $(libdir) -version-info $(LTVERSION) $(DEPLIBS)
20 $(LIBTOOL) --mode=install $(INSTALL) lib$(LIB).la $(libdir)
21 --- jade-1.2.1.orig/config/configure.in
22 +++ jade-1.2.1/config/configure.in
25 CXXFLAGS="$CXXFLAGS -fno-implicit-templates"
31 -AC_CACHE_CHECK(for -ansi support,
32 - ac_cv_c_cmdline_ansi,
33 - AC_TRY_LINK([],[],ac_cv_c_cmdline_ansi=yes,
34 - ac_cv_c_cmdline_ansi=no))
35 -if test "$ac_cv_c_cmdline_ansi" = "yes"
37 - CXXFLAGS="$CXXFLAGS $CXsave"
43 dnl Checks for header files.
45 AC_CHECK_TYPE(sig_atomic_t,int)
49 +dnl the following tests require c++, not c; note that if you switch this
50 +dnl earlier, AC_C_CONST will fail, at least
54 AC_CACHE_CHECK(support for bool,
56 AC_TRY_LINK(,bool x; x=(false | true);,
58 AC_CHECK_FUNC(setlocale,AC_DEFINE(SP_HAVE_LOCALE))
59 AC_CHECK_LIB(intl,gettext,AC_DEFINE(SP_HAVE_GETTEXT) LIBS="$LIBS -lintl")
62 +dnl Check for thread support.
63 +AC_CHECK_LIB(threads,cthread_fork,LIB_THREADS="-lthreads",LIB_THREADS="")
64 +AC_SUBST(LIB_THREADS)
70 dnl Framemaker support
73 -[ --enable-mif bind in support for FrameMaker MIF output],
74 +[ --enable-mif include support for FrameMaker MIF output],
81 +dnl HTML backend support
84 +[ --enable-html include support for HTML output],
87 + AC_DEFINE(JADE_HTML)
91 --- jade-1.2.1.orig/grove/Makefile.sub
92 +++ jade-1.2.1/grove/Makefile.sub
97 --- jade-1.2.1.orig/include/config.h
98 +++ jade-1.2.1/include/config.h
100 #define SP_STAT_BLKSIZE
104 +#if (defined __MACH__) && (! defined __GNU__)
105 #define SP_MUTEX_MACH
108 --- jade-1.2.1.orig/jade/MifFOTBuilder_inst.cxx
109 +++ jade-1.2.1/jade/MifFOTBuilder_inst.cxx
114 +#if defined(__GNUC__) && __GNUC__ < 3 && __GNUC_MINOR__ < 95
116 #pragma define_template Vector<MifDoc::ElementSet::SgmlIdInfo*>
119 template class Vector<MifDoc::ElementSet::SgmlIdInfo*>;
121 typedef Vector<MifDoc::ElementSet::SgmlIdInfo*> Dummy_27;
126 --- jade-1.2.1.orig/jade/MifFOTBuilder_inst.m4
127 +++ jade-1.2.1/jade/MifFOTBuilder_inst.m4
129 __instantiate(Vector<MifDoc::Object*>)
130 __instantiate(Vector<MifDoc::T_XY>)
131 __instantiate(Vector<MifDoc::CrossRefInfo>)
132 +#if defined(__GNUC__) && __GNUC__ < 3 && __GNUC_MINOR__ < 95
133 __instantiate(Vector<MifDoc::ElementSet::SgmlIdInfo*>)
135 __instantiate(`PointerTable<MifDoc::Ruling*, String<char>, StringHash, MifDoc::Ruling>')
136 __instantiate(`PointerTableIter<MifDoc::Ruling*, String<char>, StringHash, MifDoc::Ruling>')
137 __instantiate(Vector<MifDoc::Ruling*>)
138 --- jade-1.2.1.orig/lib/Makefile.sub
139 +++ jade-1.2.1/lib/Makefile.sub
142 INCLUDE=-I$(srcdir)/../generic
145 COMMON_OBJS=Allocator.o Link.o IListBase.o TypeId.o assert.o
146 ENTMGR_OBJS=CharsetInfo.o EntityCatalog.o EntityDecl.o EntityManager.o \
147 --- jade-1.2.1.orig/lib/entmgr_inst.cxx
148 +++ jade-1.2.1/lib/entmgr_inst.cxx
153 +#if defined(__GNUC__) && __GNUC__ < 3 && __GNUC_MINOR__ < 95
155 #pragma define_template Vector<String<EquivCode> >
163 #pragma define_template Owner<ExternalInfo>
169 +#if defined(__GNUC__) && __GNUC__ < 3 && __GNUC_MINOR__ < 95
171 #pragma define_template SharedXcharMap<unsigned char>
179 #pragma define_template SharedXcharMap<EquivCode>
185 +#if defined(__GNUC__) && __GNUC__ < 3 && __GNUC_MINOR__ < 95
187 #pragma define_template String<EquivCode>
195 #pragma define_template String<SyntaxChar>
201 +#if defined(__GNUC__) && __GNUC__ < 3 && __GNUC_MINOR__ < 95
203 #pragma define_template XcharMap<unsigned char>
211 #pragma define_template XcharMap<EquivCode>
217 +#if defined(__GNUC__) && __GNUC__ < 3 && __GNUC_MINOR__ < 95
219 #pragma define_template Vector<PackedBoolean>
222 template class SubstTable<Char>;
224 typedef SubstTable<Char> Dummy_49;
229 --- jade-1.2.1.orig/lib/entmgr_inst.m4
230 +++ jade-1.2.1/lib/entmgr_inst.m4
232 __instantiate(`RangeMap<WideChar,UnivChar>')
233 __instantiate(Vector<InputSourceOriginNamedCharRef>)
234 __instantiate(Vector<StringC>)
235 +#if defined(__GNUC__) && __GNUC__ < 3 && __GNUC_MINOR__ < 95
236 __instantiate(Vector<String<EquivCode> >)
238 __instantiate(Owner<ExternalInfo>)
239 __instantiate(ISet<Char>)
240 __instantiate(Vector<ISetRange<Char> >)
242 __instantiate(Vector<ISetRange<WideChar> >)
243 __instantiate(SubstTable<Char>)
244 __instantiate(SharedXcharMap<PackedBoolean>)
245 +#if defined(__GNUC__) && __GNUC__ < 3 && __GNUC_MINOR__ < 95
246 __instantiate(SharedXcharMap<unsigned char>)
248 __instantiate(SharedXcharMap<EquivCode>)
249 +#if defined(__GNUC__) && __GNUC__ < 3 && __GNUC_MINOR__ < 95
250 __instantiate(String<EquivCode>)
252 __instantiate(String<SyntaxChar>)
253 __instantiate(XcharMap<PackedBoolean>)
254 +#if defined(__GNUC__) && __GNUC__ < 3 && __GNUC_MINOR__ < 95
255 __instantiate(XcharMap<unsigned char>)
257 __instantiate(XcharMap<EquivCode>)
258 __instantiate(Vector<char>)
259 +#if defined(__GNUC__) && __GNUC__ < 3 && __GNUC_MINOR__ < 95
260 __instantiate(Vector<PackedBoolean>)
261 __instantiate(SubstTable<Char>)
263 __instantiate(CharMap<Unsigned32>)
265 __instantiate(CharMapPage<Unsigned32>)
266 --- jade-1.2.1.orig/lib/parser_inst.cxx
267 +++ jade-1.2.1/lib/parser_inst.cxx
268 @@ -1337,6 +1337,7 @@
272 +#if defined(__GNUC__) && __GNUC__ < 3 && __GNUC_MINOR__ < 95
274 #pragma define_template Vector<unsigned int>
276 @@ -1347,6 +1348,7 @@
277 template class Vector<unsigned int>;
279 typedef Vector<unsigned int> Dummy_97;
284 --- jade-1.2.1.orig/lib/parser_inst.m4
285 +++ jade-1.2.1/lib/parser_inst.m4
287 __instantiate(Vector<Transition>)
288 __instantiate(Vector<LeafContentToken*>)
289 __instantiate(Vector<size_t>)
290 +#if defined(__GNUC__) && __GNUC__ < 3 && __GNUC_MINOR__ < 95
291 __instantiate(Vector<unsigned int>)
294 __instantiate(NamedTable<Id>)
295 __instantiate(NamedTableIter<Id>)
296 --- jade-1.2.1.orig/spgrove/Makefile.sub
297 +++ jade-1.2.1/spgrove/Makefile.sub
300 INCLUDE=-I$(srcdir)/../grove
301 +DEPLIBS=-lm -L$(TOP)/grove/.libs -lgrove -L$(TOP)/lib/.libs -lsp $(LIB_THREADS)
302 OBJS=GroveApp.o GroveBuilder.o SdNode.o
303 GENSRCS=grove_inst.cxx
305 --- jade-1.2.1.orig/spgrove/threads.h
306 +++ jade-1.2.1/spgrove/threads.h
309 #endif /* _MSC_VER && _MT */
312 +#if (defined __MACH__) || (defined __GNU__)
314 // For Mach, using C Threads. May or may not work as-is on your Mach-based OS.
315 // Written by Raf Schietekat <RfSchtkt@maze.ruca.ua.ac.be> on 1996-11-10.
318 // don't want ASSERT to clash with ASSERT in SP's macros.h
320 +#elif defined __GNU__
321 +// catch is a reserved word in C++, it's only used to declare a struct member
322 +#define catch catch22
323 +#include <cthreads.h>
325 +// don't want ASSERT to clash with ASSERT in SP's macros.h
328 // Change to whatever works for you, and tell James Clark (or me).
329 // catch is a reserved word in C++, it's only used to declare a struct member
332 #endif /* SP_NO_BLOCK */
334 -#endif /* __MACH__ */
335 +#endif /* __MACH__ || __GNU__ */
337 #ifdef SP_USE_PTHREADS
339 --- jade-1.2.1.orig/style/Makefile.sub
340 +++ jade-1.2.1/style/Makefile.sub
343 +DEPLIBS=-lm -L$(TOP)/grove/.libs -lgrove -L$(TOP)/lib/.libs -lsp \
344 + -L$(TOP)/spgrove/.libs -lspgrove
347 DssslSpecEventHandler.o \