Attachment #179587 for bug #253515





Tclexpat_SOURCES	=	\
		tclexpat.c	\
		xmltok.c	\
		xmlrole.c	\
		xmlwf.c		\
		xmlfile.c	\
		codepage.c	\
		hashtable.c	\
		$(FILEMAP).c	\
		xmlparse.c	\
		@EXTRA_SOURCES@

WIN_SOURCES	= 

RANLIB		= @RANLIB@
SHLIB_CFLAGS	= @SHLIB_CFLAGS@
SHLIB_LD	= @SHLIB_LD@
SHLIB_LDFLAGS	= @SHLIB_LDFLAGS@ $(LDFLAGS)
SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@ -lexpat
STLIB_LD	= @STLIB_LD@
TCL_DEFS	= @TCL_DEFS@
TCL_BIN_DIR	= @TCL_BIN_DIR@

install-libraries: libraries
	@mkdir -p $(DESTDIR)$(includedir)
	@echo "Installing header files in $(DESTDIR)$(includedir)"
	@for i in ; do \
	    echo "Installing $$i" ; \
	    $(INSTALL_DATA) $$i $(DESTDIR)$(includedir) ; \
	done;

Lines 33-39 Link Here

(-)a/expat/xmlwf/xmlfile.c (-1 / +1 lines)
33	#include <stddef.h>	33	#include <stddef.h>
34	#include <string.h>	34	#include <string.h>
35	#include <fcntl.h>	35	#include <fcntl.h>
36	#include "xmlparse.h"	36	#include <expat.h>
37	#include "xmlfile.h"	37	#include "xmlfile.h"
38	#include "xmltchar.h"	38	#include "xmltchar.h"
39	#include "filemap.h"	39	#include "filemap.h"

Lines 33-39 Link Here

(-)a/expat/xmlwf/xmlwf.c (-1 / +1 lines)
33	#include <stddef.h>	33	#include <stddef.h>
34	#include <string.h>	34	#include <string.h>
35		35
36	#include "xmlparse.h"	36	#include <expat.h>
37	#include "codepage.h"	37	#include "codepage.h"
38	#include "xmlfile.h"	38	#include "xmlfile.h"
39	#include "xmltchar.h"	39	#include "xmltchar.h"

Lines 20-26 Link Here

(-)a/tclexpat.c (-1 / +10 lines)
20		20
21	#include <tcl.h>	21	#include <tcl.h>
22	#include "tclxml.h"	22	#include "tclxml.h"
23	#include <xmlparse.h>	23	#include <expat.h>
24		24
25	#undef TCL_STORAGE_CLASS	25	#undef TCL_STORAGE_CLASS
26	#define TCL_STORAGE_CLASS DLLEXPORT	26	#define TCL_STORAGE_CLASS DLLEXPORT
Lines 467-473 Link Here
467	return TCL_ERROR;	467	return TCL_ERROR;
468	}	468	}
469		469
		470	/*
		471	* This method is not exported, so kludge around it by calling one of the
		472	* SetDefaultHandler* functions that also sets the variable to the desired
		473	* value.
470	XML_SetDefaultExpandInternalEntities(expat->parser, bool);	474	XML_SetDefaultExpandInternalEntities(expat->parser, bool);
		475	*/
		476	if (bool)
		477	XML_SetDefaultHandlerExpand(expat->parser, TclExpatDefaultHandler);
		478	else
		479	XML_SetDefaultHandler(expat->parser, TclExpatDefaultHandler);
471		480
472	break;	481	break;
473		482

Return to bug 253515

Lines 31-44 Link Here

(-)a/expat/Makefile.in (-7 / +3 lines)
31		31
32	Tclexpat_SOURCES = \	32	Tclexpat_SOURCES = \
33	tclexpat.c \	33	tclexpat.c \
34	xmltok.c \
35	xmlrole.c \
36	xmlwf.c \
37	xmlfile.c \	34	xmlfile.c \
38	codepage.c \	35	codepage.c \
39	hashtable.c \	36	hashtable.c \
40	$(FILEMAP).c \	37	$(FILEMAP).c \
41	xmlparse.c \
42	@EXTRA_SOURCES@	38	@EXTRA_SOURCES@
43		39
44	WIN_SOURCES =	40	WIN_SOURCES =
Lines 143-150 Link Here
143	RANLIB = @RANLIB@	139	RANLIB = @RANLIB@
144	SHLIB_CFLAGS = @SHLIB_CFLAGS@	140	SHLIB_CFLAGS = @SHLIB_CFLAGS@
145	SHLIB_LD = @SHLIB_LD@	141	SHLIB_LD = @SHLIB_LD@
146	SHLIB_LDFLAGS = @SHLIB_LDFLAGS@	142	SHLIB_LDFLAGS = @SHLIB_LDFLAGS@ $(LDFLAGS)
147	SHLIB_LD_LIBS = @SHLIB_LD_LIBS@	143	SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ -lexpat
148	STLIB_LD = @STLIB_LD@	144	STLIB_LD = @STLIB_LD@
149	TCL_DEFS = @TCL_DEFS@	145	TCL_DEFS = @TCL_DEFS@
150	TCL_BIN_DIR = @TCL_BIN_DIR@	146	TCL_BIN_DIR = @TCL_BIN_DIR@
Lines 230-236 Link Here
230	install-libraries: libraries	226	install-libraries: libraries
231	@mkdir -p $(DESTDIR)$(includedir)	227	@mkdir -p $(DESTDIR)$(includedir)
232	@echo "Installing header files in $(DESTDIR)$(includedir)"	228	@echo "Installing header files in $(DESTDIR)$(includedir)"
233	@for i in $(GENERIC_HDRS) ; do \	229	@for i in ; do \
234	echo "Installing $$i" ; \	230	echo "Installing $$i" ; \
235	$(INSTALL_DATA) $$i $(DESTDIR)$(includedir) ; \	231	$(INSTALL_DATA) $$i $(DESTDIR)$(includedir) ; \
236	done;	232	done;