Attachment #79989 for bug #116567

View | Details | Raw Unified | Return to bug 116567 | Differences between

and this patch

Lines 19-24 Link Here

(-)pl-5.6.4.orig/packages/clib/configure.in (+1 lines)
19	AC_SUBST(TARGETS)	19	AC_SUBST(TARGETS)
20	AC_SUBST(PLTARGETS)	20	AC_SUBST(PLTARGETS)
21	AC_SUBST(CRYPTLIBS)	21	AC_SUBST(CRYPTLIBS)
		22	AC_SUBST(MT)
22		23
23	AC_ARG_ENABLE(mt, [ --enable-mt Enable Multi-threading],	24	AC_ARG_ENABLE(mt, [ --enable-mt Enable Multi-threading],
24	[ case "$enableval" in	25	[ case "$enableval" in

Lines 41-46 Link Here

(-)pl-5.6.4.orig/packages/clib/Makefile.in (-1 / +5 lines)
41	LD=@LD@	41	LD=@LD@
42	LDFLAGS=@LDSOFLAGS@	42	LDFLAGS=@LDSOFLAGS@
43		43
		44	CHECK_THREADS=@MT@
		45
44	INSTALL=@INSTALL@	46	INSTALL=@INSTALL@
45	INSTALL_PROGRAM=@INSTALL_PROGRAM@	47	INSTALL_PROGRAM=@INSTALL_PROGRAM@
46	INSTALL_DATA=@INSTALL_DATA@	48	INSTALL_DATA=@INSTALL_DATA@
Lines 123-129 Link Here
123	torture: torture-socket	125	torture: torture-socket
124		126
125	check-socket::	127	check-socket::
126	$(PL) -q -f testsocket.pl -F none -g tcp_test,halt -t 'halt(1)'	128	@if test "$(CHECK_THREADS)" = "yes" ; then \
		129	$(PL) -q -f testsocket.pl -F none -g tcp_test,halt -t 'halt(1)' ; \
		130	fi
127		131
128	torture-socket::	132	torture-socket::
129	$(PL) -q -f stresssocket.pl -F none -g test,halt -t 'halt(1)'	133	$(PL) -q -f stresssocket.pl -F none -g test,halt -t 'halt(1)'




AC_SUBST(SO)
AC_SUBST(LDSOFLAGS)
AC_SUBST(RUNTEX)
AC_SUBST(ENABLE_CHECKS)

AC_ARG_ENABLE(mt, [  --enable-mt		  Enable Multi-threading],
	      [case "$enableval" in
		   yes) AC_DEFINE([_REENTRANT], 1,
				  [Define to prepare for multi-threading])
			ENABLE_CHECKS="yes"
			;;
		   *)   ENABLE_CHECKS="no"
			;;
		   *)  ;;
	       esac])

if test -z "$PLINCL"; then

Lines 44-49 Link Here

(-)pl-5.6.4.orig/packages/semweb/Makefile.in (-1 / +5 lines)
44	LD=@LD@	44	LD=@LD@
45	LDFLAGS=@LDSOFLAGS@	45	LDFLAGS=@LDSOFLAGS@
46		46
		47	ENABLE_CHECKS=@ENABLE_CHECKS@
		48
47	INSTALL=@INSTALL@	49	INSTALL=@INSTALL@
48	INSTALL_PROGRAM=@INSTALL_PROGRAM@	50	INSTALL_PROGRAM=@INSTALL_PROGRAM@
49	INSTALL_DATA=@INSTALL_DATA@	51	INSTALL_DATA=@INSTALL_DATA@
Lines 127-133 Link Here
127	################################################################	129	################################################################
128		130
129	check::	131	check::
130	$(PL) -q -f rdf_db_test.pl -g test,halt -t 'halt(1)'	132	@if test "$(ENABLE_CHECKS)" = "yes" ; then \
		133	$(PL) -q -f rdf_db_test.pl -g test,halt -t 'halt(1)' ; \
		134	fi
131		135
132		136
133	################################################################	137	################################################################

Lines 55-60 Link Here

(-)pl-5.6.4.orig/packages/xpce/src/Makefile.in (-1 / +2 lines)
55	DESTDIR=	55	DESTDIR=
56		56
57	PCEHOME=@PCEHOME@	57	PCEHOME=@PCEHOME@
		58	PCEBUILD=$(PCEHOME)/src/xpce.sh
58	XINCLUDES=@XINCLUDES@	59	XINCLUDES=@XINCLUDES@
59	XLIB=@XLIB@	60	XLIB=@XLIB@
60		61
Lines 896-902 Link Here
896	################################################################	897	################################################################
897		898
898	check::	899	check::
899	$(PLBUILD) -q -g "['../src/test.pl'],test,halt" -t 'halt(1)'	900	$(PCEBUILD) -q -g "['../src/test.pl'],test,halt" -t 'halt(1)'
900		901
901		902
902	################################################################	903	################################################################

Lines 35-40 Link Here

(-)pl-5.6.4.orig/packages/xpce/src/test.pl (-13 / +14 lines)
35	?- test.	35	?- test.
36	- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */	36	- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
37		37
		38	:- asserta(library_directory('../prolog/lib')).
		39	:- use_module(library(pce)).
		40	:- use_module(library(pce_util)).
		41
38	:- get(@pce, version, V),	42	:- get(@pce, version, V),
39	format('XPCE/SWI-Prolog test suite. (XPCE version ~w)~n\	43	format('XPCE/SWI-Prolog test suite. (XPCE version ~w)~n\
40	To run all tests run ?- test.~n~n', [V]).	44	To run all tests run ?- test.~n~n', [V]).
Lines 163-174 Link Here
163	*******************************/	167	*******************************/
164		168
165	srcsink(contents-1) :-	169	srcsink(contents-1) :-
166	numlist(32, 1000, L),	170	numlist(32, 255, L),
167	tmp_file(test, Tmp),	171	tmp_file(test, Tmp),
168	open(Tmp, write, Out, [encoding(utf8)]),	172	open(Tmp, write, Out, [encoding(iso_latin_1)]),
169	maplist(put_code(Out), L),	173	maplist(put_code(Out), L),
170	close(Out),	174	close(Out),
171	new(File, file(Tmp, utf8)),	175	new(File, file(Tmp, iso_latin_1)),
172	get(File, contents, String),	176	get(File, contents, String),
173	delete_file(Tmp),	177	delete_file(Tmp),
174	get(String, value, Atom),	178	get(String, value, Atom),
Lines 193-199 Link Here
193	*******************************/	197	*******************************/
194		198
195	foreign(Name) :-	199	foreign(Name) :-
196	atom_codes(Name, [1087, 1083, 1072, 1090, 1085, 1072, 1103]).	200	atom_codes(Name, [102, 105, 108, 101, 110, 97, 109, 101]).
197		201
198	file(env-1) :-	202	file(env-1) :-
199	new(F, file('$PCEHOME/Defaults')),	203	new(F, file('$PCEHOME/Defaults')),
Lines 202-212 Link Here
202	get(F, name, PceName),	206	get(F, name, PceName),
203	same_file(PceName, PlName),	207	same_file(PceName, PlName),
204	send(F, same, PlName).	208	send(F, same, PlName).
205	file(home-1) :-
206	new(F, file('~/foobar')),
207	get(F, name, PceName),
208	expand_file_name('~/foobar', [PlName]),
209	same_file(PceName, PlName).
210	file(abs-1) :-	209	file(abs-1) :-
211	new(F, file(foobar)),	210	new(F, file(foobar)),
212	get(F, absolute_path, Abs),	211	get(F, absolute_path, Abs),
Lines 221-233 Link Here
221	-> send(file(F), exists)	220	-> send(file(F), exists)
222	; \+ send(file(F), exists)	221	; \+ send(file(F), exists)
223	)).	222	)).
224	file(utf8-1) :-	223	file(ascii-1) :-
225	foreign(Name),	224	foreign(Name),
226	new(F, file(Name)),	225	new(F, file(Name)),
		226	send(F, encoding, iso_latin_1),
227	send(F, open, write),	227	send(F, open, write),
228	send(F, append, 'Hello world\n'),	228	send(F, append, 'Hello world\n'),
229	send(F, close),	229	send(F, close),
230	new(F2, file(Name)),	230	new(F2, file(Name)),
		231	send(F2, encoding, iso_latin_1),
231	exists_file(Name),	232	exists_file(Name),
232	send(F2, exists),	233	send(F2, exists),
233	get(F2, contents, string('Hello world\n')),	234	get(F2, contents, string('Hello world\n')),
Lines 312-323 Link Here
312	atom_concat(hello, Wide, New).	313	atom_concat(hello, Wide, New).
313	textbuffer(file-1) :-	314	textbuffer(file-1) :-
314	new(TB, text_buffer),	315	new(TB, text_buffer),
315	numlist(32, 1000, L),	316	numlist(32, 255, L),
316	atom_codes(WAtom, L),	317	atom_codes(WAtom, L),
317	send(TB, append, WAtom),	318	send(TB, append, WAtom),
318	tmp_file(test, Tmp),	319	tmp_file(test, Tmp),
319	send(TB, save, file(Tmp, utf8)),	320	send(TB, save, file(Tmp, iso_latin_1)),
320	get(file(Tmp, utf8), contents, string(Copy)),	321	get(file(Tmp, iso_latin_1), contents, string(Copy)),
321	delete_file(Tmp),	322	delete_file(Tmp),
322	Copy == WAtom.	323	Copy == WAtom.
323	textbuffer(store-1) :-	324	textbuffer(store-1) :-

Return to bug 116567

Lines 17-29 Link Here

(-)pl-5.6.4.orig/packages/semweb/configure.in (-1 / +4 lines)
17	AC_SUBST(SO)	17	AC_SUBST(SO)
18	AC_SUBST(LDSOFLAGS)	18	AC_SUBST(LDSOFLAGS)
19	AC_SUBST(RUNTEX)	19	AC_SUBST(RUNTEX)
		20	AC_SUBST(ENABLE_CHECKS)
20		21
21	AC_ARG_ENABLE(mt, [ --enable-mt Enable Multi-threading],	22	AC_ARG_ENABLE(mt, [ --enable-mt Enable Multi-threading],
22	[case "$enableval" in	23	[case "$enableval" in
23	yes) AC_DEFINE([_REENTRANT], 1,	24	yes) AC_DEFINE([_REENTRANT], 1,
24	[Define to prepare for multi-threading])	25	[Define to prepare for multi-threading])
		26	ENABLE_CHECKS="yes"
		27	;;
		28	*) ENABLE_CHECKS="no"
25	;;	29	;;
26	*) ;;
27	esac])	30	esac])
28		31
29	if test -z "$PLINCL"; then	32	if test -z "$PLINCL"; then