Attachment #533606 for bug #653078

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

and this patch




++ /Makefile.am

               testReader testapi testModule runtest runsuite testchar \
	       testdict runxmlconf testrecurse testlimits

noinst_PROGRAMS = xmllint

bin_SCRIPTS=xml2-catalogless-config

lib_LTLIBRARIES = libxml2-catalogless.la
libxml2_catalogless_la_LIBADD = $(ICU_LIBS) $(THREAD_LIBS) $(Z_LIBS) $(LZMA_LIBS) $(ICONV_LIBS) $(M_LIBS) $(WIN32_EXTRA_LIBADD)

if USE_VERSION_SCRIPT
LIBXML2_VERSION_SCRIPT = $(VERSION_SCRIPT_FLAGS)$(srcdir)/libxml2.syms

LIBXML2_VERSION_SCRIPT =
endif

libxml2_catalogless_la_LDFLAGS = $(CYGWIN_EXTRA_LDFLAGS) $(WIN32_EXTRA_LDFLAGS) \
		     $(LIBXML2_VERSION_SCRIPT) \
		     -version-info $(LIBXML_VERSION_INFO) \
		     $(MODULE_PLATFORM_LIBS)

trio_sources =
endif

libxml2_catalogless_la_SOURCES = SAX.c entities.c encoding.c error.c parserInternals.c  \
		parser.c tree.c hash.c list.c xmlIO.c xmlmemory.c uri.c  \
		valid.c xlink.c HTMLparser.c HTMLtree.c debugXML.c xpath.c  \
		xpointer.c xinclude.c nanohttp.c nanoftp.c \

		xmlwriter.c legacy.c chvalid.c pattern.c xmlsave.c \
		xmlmodule.c schematron.c xzlib.c

DEPS = $(top_builddir)/libxml2-catalogless.la
LDADDS = $(STATIC_BINARIES) $(top_builddir)/libxml2-catalogless.la $(THREAD_LIBS) $(Z_LIBS) $(LZMA_LIBS) $(ICONV_LIBS) $(M_LIBS) $(WIN32_EXTRA_LIBADD)


man_MANS = xml2-config.1 libxml.3

testHTML_DEPENDENCIES = $(DEPS)
testHTML_LDADD= $(LDADDS)

xmlcatalog_SOURCES=xmlcatalog.c
xmlcatalog_LDFLAGS = 
xmlcatalog_DEPENDENCIES = $(DEPS)
xmlcatalog_LDADD = $(RDL_LIBS) $(LDADDS)

testXPath_SOURCES=testXPath.c
testXPath_LDFLAGS = 
testXPath_DEPENDENCIES = $(DEPS)

	      rm result.$$name result.$$name.err ; \
	  fi ; fi ; done)

Catatests :
	@echo "## Catalog support disabled"
	@false
	@(echo > .memdump)
	@echo "## Catalog regression tests"
	-@(for i in $(srcdir)/test/catalogs/*.script ; do \

rpm: cleanup cleantar
	@(unset CDPATH ; $(MAKE) dist-source dist && rpmbuild -ta $(distdir).tar.gz)

## We create xml2CataloglessConf.sh here and not from configure because we want
## to get the paths expanded correctly.  Macros like srcdir are given
## the value NONE in configure if the user doesn't specify them (this
## is an autoconf feature, not a bug).

xml2CataloglessConf.sh: xml2Conf.sh.in Makefile
## Use sed and then mv to avoid problems if the user interrupts.
	sed -e 's?\@XML_LIBDIR\@?$(XML_LIBDIR)?g' \
	    -e 's?\@XML_INCLUDEDIR\@?$(XML_INCLUDEDIR)?g' \
	    -e 's?\@VERSION\@?$(VERSION)?g' \
	    -e 's?\@XML_LIBS\@?$(XML_LIBS)?g' \
	       < $(srcdir)/xml2Conf.sh.in > xml2Conf.tmp \
	&& mv xml2Conf.tmp xml2CataloglessConf.sh

CLEANFILES = runxmlconf.log test.out xml2CataloglessConf.sh *.gcda *.gcno *.res
DISTCLEANFILES = COPYING missing.lst

confexecdir=$(libdir)
confexec_DATA = xml2CataloglessConf.sh
CVS_EXTRA_DIST=
EXTRA_DIST = xml2-config.in xml2Conf.sh.in libxml.spec.in libxml2.spec \
             libxml.m4 Copyright check-xml-test-suite.py gentest.py \



pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libxml-2.0-catalogless.pc

cmakedir = $(libdir)/cmake/libxml2-catalogless
cmake_DATA = libxml2-catalogless-config.cmake

#
# Install the tests program sources as examples 

	rm -rf $(DESTDIR)$(BASE_DIR)/$(DOC_MODULE)

tst: tst.c
	$(CC) $(CFLAGS) -Iinclude -o tst tst.c .libs/libxml2-catalogless.a -lpthread -lm -lz -llzma

sparse: clean
	$(MAKE) CC=cgcc
++ /configure.ac


AC_ARG_WITH(c14n,
[  --with-c14n             add the Canonicalization support (on)])
AC_ARG_WITH(catalog,
[  --with-catalog          add the Catalog support (on)])
AC_ARG_WITH(debug,
[  --with-debug            add the debugging module (on)])
AC_ARG_WITH(docbook,

    then
      with_c14n=no
    fi
    if test "$with_catalog" = ""
    then
      with_catalog=no
    fi
    echo So far so good!
    if test "$with_debug" = ""
    then

  [AC_DEFINE([HAVE_ISINF], [], [Define if isinf is there])]))

XML_LIBDIR='-L${libdir}'
XML_INCLUDEDIR='-I${includedir}/libxml2-catalogless'

dnl
dnl Extra flags

AC_SUBST(TEST_VALID)
AC_SUBST(TEST_VTIME)

echo Disabling Catalog support
WITH_CATALOG=0
CATALOG_OBJ=
TEST_CATALOG=
    TEST_CATALOG=
else    
    WITH_CATALOG=1
    CATALOG_OBJ="catalog.o"
    TEST_CATALOG=Catatests
fi
AC_SUBST(WITH_CATALOG)
AC_SUBST(CATALOG_OBJ)
AC_SUBST(TEST_CATALOG)

        WITH_ICU=1
    fi
fi
XML_LIBS="-lxml2-catalogless $Z_LIBS $LZMA_LIBS $THREAD_LIBS $ICONV_LIBS $ICU_LIBS $M_LIBS $LIBS"
XML_LIBTOOLLIBS="libxml2-catalogless.la"
AC_SUBST(WITH_ICU)

WITH_ISO8859X=1

ln -s $srcdir/Copyright COPYING

# keep on one line for cygwin c.f. #130896
AC_CONFIG_FILES([libxml2.spec:libxml.spec.in Makefile include/Makefile include/libxml/Makefile doc/Makefile doc/examples/Makefile doc/devhelp/Makefile example/Makefile python/Makefile python/tests/Makefile xstc/Makefile include/libxml/xmlversion.h libxml-2.0-catalogless.pc:libxml-2.0.pc.in libxml-2.0-catalogless-uninstalled.pc:libxml-2.0-uninstalled.pc.in libxml2-catalogless-config.cmake:libxml2-config.cmake.in])
AC_CONFIG_FILES([python/setup.py], [chmod +x python/setup.py])
AC_CONFIG_FILES([xml2-catalogless-config:xml2-config.in], [chmod +x xml2-catalogless-config])
AC_OUTPUT

echo Done configuring
++ /doc/examples/Makefile.am


AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(srcdir)/include
AM_CFLAGS = $(THREAD_CFLAGS) $(Z_CFLAGS)
LDADD = $(RDL_LIBS) $(STATIC_BINARIES) $(top_builddir)/libxml2-catalogless.la $(THREAD_LIBS) $(Z_LIBS) $(ICONV_LIBS) -lm $(WIN32_EXTRA_LIBADD)

CLEANFILES = *.tmp

++ /doc/examples/index.py


AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(srcdir)/include
AM_CFLAGS = $(THREAD_CFLAGS) $(Z_CFLAGS)
LDADD = $(RDL_LIBS) $(STATIC_BINARIES) $(top_builddir)/libxml2-catalogless.la $(THREAD_LIBS) $(Z_LIBS) $(ICONV_LIBS) -lm $(WIN32_EXTRA_LIBADD)

CLEANFILES = *.tmp

++ /doc/syms.xsl

  <xsl:template match="/">
    <xsl:text>#
# Officially exported symbols, for which header
# file definitions are installed in /usr/include/libxml2-catalogless
#
# Automatically generated from symbols.xml and syms.xsl
#
# Versions here are *fixed* to match the libxml2 version
# at which the symbol was introduced. This ensures that
# a new client app requiring symbol foo() can't accidentally
# run with old libxml2-catalogless.so not providing foo() - the global
# soname version info can't enforce this since we never
# change the soname
#

</xsl:text>
    <xsl:apply-templates select="/symbols/release"/>
    <xsl:text>LIBXML2_CATALOGLESS {
    global:
  *;
};
</xsl:text>
  </xsl:template>

  <xsl:template match="release">
    <xsl:variable name="prev"
                  select="preceding-sibling::release[position()=1]"/>
    <xsl:text>LIBXML2_CATALOGLESS_</xsl:text>
    <xsl:value-of select="string(@version)"/>
    <xsl:text> {
    global:


    <xsl:text>} </xsl:text>
    <xsl:if test="$prev">
      <xsl:text>LIBXML2_CATALOGLESS_</xsl:text>
      <xsl:value-of select="$prev/@version"/>
    </xsl:if>
    <xsl:text>;
++ /example/Makefile.am


AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(srcdir)/include
AM_CFLAGS = $(THREAD_CFLAGS) $(Z_CFLAGS)
LDADD = $(RDL_LIBS) $(STATIC_BINARIES) $(top_builddir)/libxml2-catalogless.la $(THREAD_LIBS) $(Z_LIBS) $(ICONV_LIBS) -lm $(WIN32_EXTRA_LIBADD)

gjobread_SOURCES=gjobread.c
++ /include/libxml/Makefile.am

## Process this file with automake to produce Makefile.in

xmlincdir = $(includedir)/libxml2-catalogless/libxml

xmlinc_HEADERS = \
		SAX.h \
++ /libxml-2.0-uninstalled.pc.in

includedir=${pcfiledir}/include


Name: libXML-catalogless
Version: @VERSION@
Description: libXML library version2 without Catalog support.
Requires:
Libs: -L${libdir} -lxml2-catalogless @ICU_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @LZMA_LIBS@ @ICONV_LIBS@ @M_LIBS@ @LIBS@
Cflags: -I${includedir} @XML_INCLUDEDIR@ @XML_CFLAGS@
++ /libxml-2.0.pc.in

includedir=@includedir@
modules=@WITH_MODULES@

Name: libXML-catalogless
Version: @VERSION@
Description: libXML library version2 without Catalog support.
Requires:
Libs: -L${libdir} -lxml2-catalogless
Libs.private: @ICU_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @LZMA_LIBS@ @ICONV_LIBS@ @M_LIBS@ @WIN32_EXTRA_LIBADD@ @LIBS@
Cflags: @XML_INCLUDEDIR@ @XML_CFLAGS@
++ /libxml2-config.cmake.in

# libxml2-catalogless-config.cmake
# --------------------
#
# Libxml2-catalogless cmake module.
# THis module sets the following variables:
#
# ::

set(LIBXML2_VERSION_MICRO  @LIBXML_MICRO_VERSION@)
set(LIBXML2_VERSION_STRING "@VERSION@")
set(LIBXML2_INSTALL_PREFIX ${_libxml2_rootdir})
set(LIBXML2_INCLUDE_DIRS   ${_libxml2_rootdir}/include ${_libxml2_rootdir}/include/libxml2-catalogless)
set(LIBXML2_LIBRARY_DIR    ${_libxml2_rootdir}/lib)
set(LIBXML2_LIBRARIES      -L${LIBXML2_LIBRARY_DIR} -lxml2-catalogless)

if(@WITH_THREADS@)
  find_package(Threads REQUIRED)
++ /python/Makefile.am


libxml2mod_la_SOURCES = libxml.c libxml_wrap.h libxml2-py.h libxml2-py.c types.c
libxml2mod_la_LDFLAGS = $(CYGWIN_EXTRA_LDFLAGS) $(WIN32_EXTRA_LDFLAGS) -module -avoid-version \
        $(top_builddir)/libxml2-catalogless.la $(CYGWIN_EXTRA_PYTHON_LIBADD) $(WIN32_EXTRA_PYTHON_LIBADD) $(PYTHON_LIBS)

BUILT_SOURCES = libxml2-export.c libxml2-py.h libxml2-py.c

++ /xml2-config.in

usage()
{
    cat <<EOF
Usage: xml2-catalogless-config [OPTION]

Known values for OPTION are:


Return to bug 653078

Line Link Here

(-)file_not_specified_in_diff (-76 / +66 lines)
0	-- /Makefile.am	0	++ /Makefile.am
Lines 15-26 Link Here
15	testReader testapi testModule runtest runsuite testchar \	15	testReader testapi testModule runtest runsuite testchar \
16	testdict runxmlconf testrecurse testlimits	16	testdict runxmlconf testrecurse testlimits
17		17
18	bin_PROGRAMS = xmllint xmlcatalog	18	noinst_PROGRAMS = xmllint
19		19
20	bin_SCRIPTS=xml2-config	20	bin_SCRIPTS=xml2-catalogless-config
21		21
22	lib_LTLIBRARIES = libxml2.la	22	lib_LTLIBRARIES = libxml2-catalogless.la
23	libxml2_la_LIBADD = $(ICU_LIBS) $(THREAD_LIBS) $(Z_LIBS) $(LZMA_LIBS) $(ICONV_LIBS) $(M_LIBS) $(WIN32_EXTRA_LIBADD)	23	libxml2_catalogless_la_LIBADD = $(ICU_LIBS) $(THREAD_LIBS) $(Z_LIBS) $(LZMA_LIBS) $(ICONV_LIBS) $(M_LIBS) $(WIN32_EXTRA_LIBADD)
24		24
25	if USE_VERSION_SCRIPT	25	if USE_VERSION_SCRIPT
26	LIBXML2_VERSION_SCRIPT = $(VERSION_SCRIPT_FLAGS)$(srcdir)/libxml2.syms	26	LIBXML2_VERSION_SCRIPT = $(VERSION_SCRIPT_FLAGS)$(srcdir)/libxml2.syms
Lines 28-34 Link Here
28	LIBXML2_VERSION_SCRIPT =	28	LIBXML2_VERSION_SCRIPT =
29	endif	29	endif
30		30
31	libxml2_la_LDFLAGS = $(CYGWIN_EXTRA_LDFLAGS) $(WIN32_EXTRA_LDFLAGS) \	31	libxml2_catalogless_la_LDFLAGS = $(CYGWIN_EXTRA_LDFLAGS) $(WIN32_EXTRA_LDFLAGS) \
32	$(LIBXML2_VERSION_SCRIPT) \	32	$(LIBXML2_VERSION_SCRIPT) \
33	-version-info $(LIBXML_VERSION_INFO) \	33	-version-info $(LIBXML_VERSION_INFO) \
34	$(MODULE_PLATFORM_LIBS)	34	$(MODULE_PLATFORM_LIBS)
Lines 45-51 Link Here
45	trio_sources =	45	trio_sources =
46	endif	46	endif
47		47
48	libxml2_la_SOURCES = SAX.c entities.c encoding.c error.c parserInternals.c \	48	libxml2_catalogless_la_SOURCES = SAX.c entities.c encoding.c error.c parserInternals.c \
49	parser.c tree.c hash.c list.c xmlIO.c xmlmemory.c uri.c \	49	parser.c tree.c hash.c list.c xmlIO.c xmlmemory.c uri.c \
50	valid.c xlink.c HTMLparser.c HTMLtree.c debugXML.c xpath.c \	50	valid.c xlink.c HTMLparser.c HTMLtree.c debugXML.c xpath.c \
51	xpointer.c xinclude.c nanohttp.c nanoftp.c \	51	xpointer.c xinclude.c nanohttp.c nanoftp.c \
Lines 57-64 Link Here
57	xmlwriter.c legacy.c chvalid.c pattern.c xmlsave.c \	57	xmlwriter.c legacy.c chvalid.c pattern.c xmlsave.c \
58	xmlmodule.c schematron.c xzlib.c	58	xmlmodule.c schematron.c xzlib.c
59		59
60	DEPS = $(top_builddir)/libxml2.la	60	DEPS = $(top_builddir)/libxml2-catalogless.la
61	LDADDS = $(STATIC_BINARIES) $(top_builddir)/libxml2.la $(THREAD_LIBS) $(Z_LIBS) $(LZMA_LIBS) $(ICONV_LIBS) $(M_LIBS) $(WIN32_EXTRA_LIBADD)	61	LDADDS = $(STATIC_BINARIES) $(top_builddir)/libxml2-catalogless.la $(THREAD_LIBS) $(Z_LIBS) $(LZMA_LIBS) $(ICONV_LIBS) $(M_LIBS) $(WIN32_EXTRA_LIBADD)
62		62
63		63
64	man_MANS = xml2-config.1 libxml.3	64	man_MANS = xml2-config.1 libxml.3
Lines 111-121 Link Here
111	testHTML_DEPENDENCIES = $(DEPS)	111	testHTML_DEPENDENCIES = $(DEPS)
112	testHTML_LDADD= $(LDADDS)	112	testHTML_LDADD= $(LDADDS)
113		113
114	xmlcatalog_SOURCES=xmlcatalog.c
115	xmlcatalog_LDFLAGS =
116	xmlcatalog_DEPENDENCIES = $(DEPS)
117	xmlcatalog_LDADD = $(RDL_LIBS) $(LDADDS)
118
119	testXPath_SOURCES=testXPath.c	114	testXPath_SOURCES=testXPath.c
120	testXPath_LDFLAGS =	115	testXPath_LDFLAGS =
121	testXPath_DEPENDENCIES = $(DEPS)	116	testXPath_DEPENDENCIES = $(DEPS)
Lines 668-674 Link Here
668	rm result.$$name result.$$name.err ; \	663	rm result.$$name result.$$name.err ; \
669	fi ; fi ; done)	664	fi ; fi ; done)
670		665
671	Catatests : xmlcatalog$(EXEEXT)	666	Catatests :
		667	@echo "## Catalog support disabled"
		668	@false
672	@(echo > .memdump)	669	@(echo > .memdump)
673	@echo "## Catalog regression tests"	670	@echo "## Catalog regression tests"
674	-@(for i in $(srcdir)/test/catalogs/*.script ; do \	671	-@(for i in $(srcdir)/test/catalogs/*.script ; do \
Lines 1224-1248 Link Here
1224	rpm: cleanup cleantar	1221	rpm: cleanup cleantar
1225	@(unset CDPATH ; $(MAKE) dist-source dist && rpmbuild -ta $(distdir).tar.gz)	1222	@(unset CDPATH ; $(MAKE) dist-source dist && rpmbuild -ta $(distdir).tar.gz)
1226		1223
1227	## We create xml2Conf.sh here and not from configure because we want	1224	## We create xml2CataloglessConf.sh here and not from configure because we want
1228	## to get the paths expanded correctly. Macros like srcdir are given	1225	## to get the paths expanded correctly. Macros like srcdir are given
1229	## the value NONE in configure if the user doesn't specify them (this	1226	## the value NONE in configure if the user doesn't specify them (this
1230	## is an autoconf feature, not a bug).	1227	## is an autoconf feature, not a bug).
1231		1228
1232	xml2Conf.sh: xml2Conf.sh.in Makefile	1229	xml2CataloglessConf.sh: xml2Conf.sh.in Makefile
1233	## Use sed and then mv to avoid problems if the user interrupts.	1230	## Use sed and then mv to avoid problems if the user interrupts.
1234	sed -e 's?\@XML_LIBDIR\@?$(XML_LIBDIR)?g' \	1231	sed -e 's?\@XML_LIBDIR\@?$(XML_LIBDIR)?g' \
1235	-e 's?\@XML_INCLUDEDIR\@?$(XML_INCLUDEDIR)?g' \	1232	-e 's?\@XML_INCLUDEDIR\@?$(XML_INCLUDEDIR)?g' \
1236	-e 's?\@VERSION\@?$(VERSION)?g' \	1233	-e 's?\@VERSION\@?$(VERSION)?g' \
1237	-e 's?\@XML_LIBS\@?$(XML_LIBS)?g' \	1234	-e 's?\@XML_LIBS\@?$(XML_LIBS)?g' \
1238	< $(srcdir)/xml2Conf.sh.in > xml2Conf.tmp \	1235	< $(srcdir)/xml2Conf.sh.in > xml2Conf.tmp \
1239	&& mv xml2Conf.tmp xml2Conf.sh	1236	&& mv xml2Conf.tmp xml2CataloglessConf.sh
1240		1237
1241	CLEANFILES = runxmlconf.log test.out xml2Conf.sh .gcda .gcno *.res	1238	CLEANFILES = runxmlconf.log test.out xml2CataloglessConf.sh .gcda .gcno *.res
1242	DISTCLEANFILES = COPYING missing.lst	1239	DISTCLEANFILES = COPYING missing.lst
1243		1240
1244	confexecdir=$(libdir)	1241	confexecdir=$(libdir)
1245	confexec_DATA = xml2Conf.sh	1242	confexec_DATA = xml2CataloglessConf.sh
1246	CVS_EXTRA_DIST=	1243	CVS_EXTRA_DIST=
1247	EXTRA_DIST = xml2-config.in xml2Conf.sh.in libxml.spec.in libxml2.spec \	1244	EXTRA_DIST = xml2-config.in xml2Conf.sh.in libxml.spec.in libxml2.spec \
1248	libxml.m4 Copyright check-xml-test-suite.py gentest.py \	1245	libxml.m4 Copyright check-xml-test-suite.py gentest.py \
Lines 1261-1270 Link Here
1261		1258
1262		1259
1263	pkgconfigdir = $(libdir)/pkgconfig	1260	pkgconfigdir = $(libdir)/pkgconfig
1264	pkgconfig_DATA = libxml-2.0.pc	1261	pkgconfig_DATA = libxml-2.0-catalogless.pc
1265		1262
1266	cmakedir = $(libdir)/cmake/libxml2	1263	cmakedir = $(libdir)/cmake/libxml2-catalogless
1267	cmake_DATA = libxml2-config.cmake	1264	cmake_DATA = libxml2-catalogless-config.cmake
1268		1265
1269	#	1266	#
1270	# Install the tests program sources as examples	1267	# Install the tests program sources as examples
Lines 1292-1298 Link Here
1292	rm -rf $(DESTDIR)$(BASE_DIR)/$(DOC_MODULE)	1289	rm -rf $(DESTDIR)$(BASE_DIR)/$(DOC_MODULE)
1293		1290
1294	tst: tst.c	1291	tst: tst.c
1295	$(CC) $(CFLAGS) -Iinclude -o tst tst.c .libs/libxml2.a -lpthread -lm -lz -llzma	1292	$(CC) $(CFLAGS) -Iinclude -o tst tst.c .libs/libxml2-catalogless.a -lpthread -lm -lz -llzma
1296		1293
1297	sparse: clean	1294	sparse: clean
1298	$(MAKE) CC=cgcc	1295	$(MAKE) CC=cgcc
1299	-- /configure.ac	1296	++ /configure.ac
Lines 103-110 Link Here
103		103
104	AC_ARG_WITH(c14n,	104	AC_ARG_WITH(c14n,
105	[ --with-c14n add the Canonicalization support (on)])	105	[ --with-c14n add the Canonicalization support (on)])
106	AC_ARG_WITH(catalog,
107	[ --with-catalog add the Catalog support (on)])
108	AC_ARG_WITH(debug,	106	AC_ARG_WITH(debug,
109	[ --with-debug add the debugging module (on)])	107	[ --with-debug add the debugging module (on)])
110	AC_ARG_WITH(docbook,	108	AC_ARG_WITH(docbook,
Lines 248-257 Link Here
248	then	246	then
249	with_c14n=no	247	with_c14n=no
250	fi	248	fi
251	if test "$with_catalog" = ""
252	then
253	with_catalog=no
254	fi
255	echo So far so good!	249	echo So far so good!
256	if test "$with_debug" = ""	250	if test "$with_debug" = ""
257	then	251	then
Lines 733-739 Link Here
733	[AC_DEFINE([HAVE_ISINF], [], [Define if isinf is there])]))	727	[AC_DEFINE([HAVE_ISINF], [], [Define if isinf is there])]))
734		728
735	XML_LIBDIR='-L${libdir}'	729	XML_LIBDIR='-L${libdir}'
736	XML_INCLUDEDIR='-I${includedir}/libxml2'	730	XML_INCLUDEDIR='-I${includedir}/libxml2-catalogless'
737		731
738	dnl	732	dnl
739	dnl Extra flags	733	dnl Extra flags
Lines 1269-1284 Link Here
1269	AC_SUBST(TEST_VALID)	1263	AC_SUBST(TEST_VALID)
1270	AC_SUBST(TEST_VTIME)	1264	AC_SUBST(TEST_VTIME)
1271		1265
1272	if test "$with_catalog" = "no" ; then	1266	echo Disabling Catalog support
1273	echo Disabling Catalog support	1267	WITH_CATALOG=0
1274	WITH_CATALOG=0	1268	CATALOG_OBJ=
1275	CATALOG_OBJ=	1269	TEST_CATALOG=
1276	TEST_CATALOG=
1277	else
1278	WITH_CATALOG=1
1279	CATALOG_OBJ="catalog.o"
1280	TEST_CATALOG=Catatests
1281	fi
1282	AC_SUBST(WITH_CATALOG)	1270	AC_SUBST(WITH_CATALOG)
1283	AC_SUBST(CATALOG_OBJ)	1271	AC_SUBST(CATALOG_OBJ)
1284	AC_SUBST(TEST_CATALOG)	1272	AC_SUBST(TEST_CATALOG)
Lines 1533-1540 Link Here
1533	WITH_ICU=1	1521	WITH_ICU=1
1534	fi	1522	fi
1535	fi	1523	fi
1536	XML_LIBS="-lxml2 $Z_LIBS $LZMA_LIBS $THREAD_LIBS $ICONV_LIBS $ICU_LIBS $M_LIBS $LIBS"	1524	XML_LIBS="-lxml2-catalogless $Z_LIBS $LZMA_LIBS $THREAD_LIBS $ICONV_LIBS $ICU_LIBS $M_LIBS $LIBS"
1537	XML_LIBTOOLLIBS="libxml2.la"	1525	XML_LIBTOOLLIBS="libxml2-catalogless.la"
1538	AC_SUBST(WITH_ICU)	1526	AC_SUBST(WITH_ICU)
1539		1527
1540	WITH_ISO8859X=1	1528	WITH_ISO8859X=1
Lines 1695-1703 Link Here
1695	ln -s $srcdir/Copyright COPYING	1683	ln -s $srcdir/Copyright COPYING
1696		1684
1697	# keep on one line for cygwin c.f. #130896	1685	# keep on one line for cygwin c.f. #130896
1698	AC_CONFIG_FILES([libxml2.spec:libxml.spec.in Makefile include/Makefile include/libxml/Makefile doc/Makefile doc/examples/Makefile doc/devhelp/Makefile example/Makefile python/Makefile python/tests/Makefile xstc/Makefile include/libxml/xmlversion.h libxml-2.0.pc libxml-2.0-uninstalled.pc libxml2-config.cmake])	1686	AC_CONFIG_FILES([libxml2.spec:libxml.spec.in Makefile include/Makefile include/libxml/Makefile doc/Makefile doc/examples/Makefile doc/devhelp/Makefile example/Makefile python/Makefile python/tests/Makefile xstc/Makefile include/libxml/xmlversion.h libxml-2.0-catalogless.pc:libxml-2.0.pc.in libxml-2.0-catalogless-uninstalled.pc:libxml-2.0-uninstalled.pc.in libxml2-catalogless-config.cmake:libxml2-config.cmake.in])
1699	AC_CONFIG_FILES([python/setup.py], [chmod +x python/setup.py])	1687	AC_CONFIG_FILES([python/setup.py], [chmod +x python/setup.py])
1700	AC_CONFIG_FILES([xml2-config], [chmod +x xml2-config])	1688	AC_CONFIG_FILES([xml2-catalogless-config:xml2-config.in], [chmod +x xml2-catalogless-config])
1701	AC_OUTPUT	1689	AC_OUTPUT
1702		1690
1703	echo Done configuring	1691	echo Done configuring
1704	-- /doc/examples/Makefile.am	1692	++ /doc/examples/Makefile.am
Lines 5-11 Link Here
5		5
6	AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(srcdir)/include	6	AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(srcdir)/include
7	AM_CFLAGS = $(THREAD_CFLAGS) $(Z_CFLAGS)	7	AM_CFLAGS = $(THREAD_CFLAGS) $(Z_CFLAGS)
8	LDADD = $(RDL_LIBS) $(STATIC_BINARIES) $(top_builddir)/libxml2.la $(THREAD_LIBS) $(Z_LIBS) $(ICONV_LIBS) -lm $(WIN32_EXTRA_LIBADD)	8	LDADD = $(RDL_LIBS) $(STATIC_BINARIES) $(top_builddir)/libxml2-catalogless.la $(THREAD_LIBS) $(Z_LIBS) $(ICONV_LIBS) -lm $(WIN32_EXTRA_LIBADD)
9		9
10	CLEANFILES = *.tmp	10	CLEANFILES = *.tmp
11		11
12	-- /doc/examples/index.py	12	++ /doc/examples/index.py
Lines 227-233 Link Here
227		227
228	AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(srcdir)/include	228	AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(srcdir)/include
229	AM_CFLAGS = $(THREAD_CFLAGS) $(Z_CFLAGS)	229	AM_CFLAGS = $(THREAD_CFLAGS) $(Z_CFLAGS)
230	LDADD = $(RDL_LIBS) $(STATIC_BINARIES) $(top_builddir)/libxml2.la $(THREAD_LIBS) $(Z_LIBS) $(ICONV_LIBS) -lm $(WIN32_EXTRA_LIBADD)	230	LDADD = $(RDL_LIBS) $(STATIC_BINARIES) $(top_builddir)/libxml2-catalogless.la $(THREAD_LIBS) $(Z_LIBS) $(ICONV_LIBS) -lm $(WIN32_EXTRA_LIBADD)
231		231
232	CLEANFILES = *.tmp	232	CLEANFILES = *.tmp
233		233
234	-- /doc/syms.xsl	234	++ /doc/syms.xsl
Lines 8-33 Link Here
8	<xsl:template match="/">	8	<xsl:template match="/">
9	<xsl:text>#	9	<xsl:text>#
10	# Officially exported symbols, for which header	10	# Officially exported symbols, for which header
11	# file definitions are installed in /usr/include/libxml2	11	# file definitions are installed in /usr/include/libxml2-catalogless
12	#	12	#
13	# Automatically generated from symbols.xml and syms.xsl	13	# Automatically generated from symbols.xml and syms.xsl
14	#	14	#
15	# Versions here are fixed to match the libxml2 version	15	# Versions here are fixed to match the libxml2 version
16	# at which the symbol was introduced. This ensures that	16	# at which the symbol was introduced. This ensures that
17	# a new client app requiring symbol foo() can't accidentally	17	# a new client app requiring symbol foo() can't accidentally
18	# run with old libxml2.so not providing foo() - the global	18	# run with old libxml2-catalogless.so not providing foo() - the global
19	# soname version info can't enforce this since we never	19	# soname version info can't enforce this since we never
20	# change the soname	20	# change the soname
21	#	21	#
22		22
23	</xsl:text>	23	</xsl:text>
24	<xsl:apply-templates select="/symbols/release"/>	24	<xsl:apply-templates select="/symbols/release"/>
		25	<xsl:text>LIBXML2_CATALOGLESS {
		26	global:
		27	*;
		28	};
		29	</xsl:text>
25	</xsl:template>	30	</xsl:template>
26		31
27	<xsl:template match="release">	32	<xsl:template match="release">
28	<xsl:variable name="prev"	33	<xsl:variable name="prev"
29	select="preceding-sibling::release[position()=1]"/>	34	select="preceding-sibling::release[position()=1]"/>
30	<xsl:text>LIBXML2_</xsl:text>	35	<xsl:text>LIBXML2_CATALOGLESS_</xsl:text>
31	<xsl:value-of select="string(@version)"/>	36	<xsl:value-of select="string(@version)"/>
32	<xsl:text> {	37	<xsl:text> {
33	global:	38	global:
Lines 46-52 Link Here
46		51
47	<xsl:text>} </xsl:text>	52	<xsl:text>} </xsl:text>
48	<xsl:if test="$prev">	53	<xsl:if test="$prev">
49	<xsl:text>LIBXML2_</xsl:text>	54	<xsl:text>LIBXML2_CATALOGLESS_</xsl:text>
50	<xsl:value-of select="$prev/@version"/>	55	<xsl:value-of select="$prev/@version"/>
51	</xsl:if>	56	</xsl:if>
52	<xsl:text>;	57	<xsl:text>;
53	-- /example/Makefile.am	58	++ /example/Makefile.am
Lines 2-7 Link Here
2		2
3	AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(srcdir)/include	3	AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(srcdir)/include
4	AM_CFLAGS = $(THREAD_CFLAGS) $(Z_CFLAGS)	4	AM_CFLAGS = $(THREAD_CFLAGS) $(Z_CFLAGS)
5	LDADD = $(RDL_LIBS) $(STATIC_BINARIES) $(top_builddir)/libxml2.la $(THREAD_LIBS) $(Z_LIBS) $(ICONV_LIBS) -lm $(WIN32_EXTRA_LIBADD)	5	LDADD = $(RDL_LIBS) $(STATIC_BINARIES) $(top_builddir)/libxml2-catalogless.la $(THREAD_LIBS) $(Z_LIBS) $(ICONV_LIBS) -lm $(WIN32_EXTRA_LIBADD)
6		6
7	gjobread_SOURCES=gjobread.c	7	gjobread_SOURCES=gjobread.c
8	-- /include/libxml/Makefile.am	8	++ /include/libxml/Makefile.am
Lines 1-6 Link Here
1	## Process this file with automake to produce Makefile.in	1	## Process this file with automake to produce Makefile.in
2		2
3	xmlincdir = $(includedir)/libxml2/libxml	3	xmlincdir = $(includedir)/libxml2-catalogless/libxml
4		4
5	xmlinc_HEADERS = \	5	xmlinc_HEADERS = \
6	SAX.h \	6	SAX.h \
7	-- /libxml-2.0-uninstalled.pc.in	7	++ /libxml-2.0-uninstalled.pc.in
Lines 4-12 Link Here
4	includedir=${pcfiledir}/include	4	includedir=${pcfiledir}/include
5		5
6		6
7	Name: libXML	7	Name: libXML-catalogless
8	Version: @VERSION@	8	Version: @VERSION@
9	Description: libXML library version2.	9	Description: libXML library version2 without Catalog support.
10	Requires:	10	Requires:
11	Libs: -L${libdir} -lxml2 @ICU_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @LZMA_LIBS@ @ICONV_LIBS@ @M_LIBS@ @LIBS@	11	Libs: -L${libdir} -lxml2-catalogless @ICU_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @LZMA_LIBS@ @ICONV_LIBS@ @M_LIBS@ @LIBS@
12	Cflags: -I${includedir} @XML_INCLUDEDIR@ @XML_CFLAGS@	12	Cflags: -I${includedir} @XML_INCLUDEDIR@ @XML_CFLAGS@
13	-- /libxml-2.0.pc.in	13	++ /libxml-2.0.pc.in
Lines 4-13 Link Here
4	includedir=@includedir@	4	includedir=@includedir@
5	modules=@WITH_MODULES@	5	modules=@WITH_MODULES@
6		6
7	Name: libXML	7	Name: libXML-catalogless
8	Version: @VERSION@	8	Version: @VERSION@
9	Description: libXML library version2.	9	Description: libXML library version2 without Catalog support.
10	Requires:	10	Requires:
11	Libs: -L${libdir} -lxml2	11	Libs: -L${libdir} -lxml2-catalogless
12	Libs.private: @ICU_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @LZMA_LIBS@ @ICONV_LIBS@ @M_LIBS@ @WIN32_EXTRA_LIBADD@ @LIBS@	12	Libs.private: @ICU_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @LZMA_LIBS@ @ICONV_LIBS@ @M_LIBS@ @WIN32_EXTRA_LIBADD@ @LIBS@
13	Cflags: @XML_INCLUDEDIR@ @XML_CFLAGS@	13	Cflags: @XML_INCLUDEDIR@ @XML_CFLAGS@
14	-- /libxml2-config.cmake.in	14	++ /libxml2-config.cmake.in
Lines 1-7 Link Here
1	# libxml2-config.cmake	1	# libxml2-catalogless-config.cmake
2	# --------------------	2	# --------------------
3	#	3	#
4	# Libxml2 cmake module.	4	# Libxml2-catalogless cmake module.
5	# THis module sets the following variables:	5	# THis module sets the following variables:
6	#	6	#
7	# ::	7	# ::
Lines 21-29 Link Here
21	set(LIBXML2_VERSION_MICRO @LIBXML_MICRO_VERSION@)	21	set(LIBXML2_VERSION_MICRO @LIBXML_MICRO_VERSION@)
22	set(LIBXML2_VERSION_STRING "@VERSION@")	22	set(LIBXML2_VERSION_STRING "@VERSION@")
23	set(LIBXML2_INSTALL_PREFIX ${_libxml2_rootdir})	23	set(LIBXML2_INSTALL_PREFIX ${_libxml2_rootdir})
24	set(LIBXML2_INCLUDE_DIRS ${_libxml2_rootdir}/include ${_libxml2_rootdir}/include/libxml2)	24	set(LIBXML2_INCLUDE_DIRS ${_libxml2_rootdir}/include ${_libxml2_rootdir}/include/libxml2-catalogless)
25	set(LIBXML2_LIBRARY_DIR ${_libxml2_rootdir}/lib)	25	set(LIBXML2_LIBRARY_DIR ${_libxml2_rootdir}/lib)
26	set(LIBXML2_LIBRARIES -L${LIBXML2_LIBRARY_DIR} -lxml2)	26	set(LIBXML2_LIBRARIES -L${LIBXML2_LIBRARY_DIR} -lxml2-catalogless)
27		27
28	if(@WITH_THREADS@)	28	if(@WITH_THREADS@)
29	find_package(Threads REQUIRED)	29	find_package(Threads REQUIRED)
30	-- /python/Makefile.am	30	++ /python/Makefile.am
Lines 25-31 Link Here
25		25
26	libxml2mod_la_SOURCES = libxml.c libxml_wrap.h libxml2-py.h libxml2-py.c types.c	26	libxml2mod_la_SOURCES = libxml.c libxml_wrap.h libxml2-py.h libxml2-py.c types.c
27	libxml2mod_la_LDFLAGS = $(CYGWIN_EXTRA_LDFLAGS) $(WIN32_EXTRA_LDFLAGS) -module -avoid-version \	27	libxml2mod_la_LDFLAGS = $(CYGWIN_EXTRA_LDFLAGS) $(WIN32_EXTRA_LDFLAGS) -module -avoid-version \
28	$(top_builddir)/libxml2.la $(CYGWIN_EXTRA_PYTHON_LIBADD) $(WIN32_EXTRA_PYTHON_LIBADD) $(PYTHON_LIBS)	28	$(top_builddir)/libxml2-catalogless.la $(CYGWIN_EXTRA_PYTHON_LIBADD) $(WIN32_EXTRA_PYTHON_LIBADD) $(PYTHON_LIBS)
29		29
30	BUILT_SOURCES = libxml2-export.c libxml2-py.h libxml2-py.c	30	BUILT_SOURCES = libxml2-export.c libxml2-py.h libxml2-py.c
31		31
32	-- /xml2-config.in	32	++ /xml2-config.in
Lines 8-14 Link Here
8	usage()	8	usage()
9	{	9	{
10	cat <<EOF	10	cat <<EOF
11	Usage: xml2-config [OPTION]	11	Usage: xml2-catalogless-config [OPTION]
12		12
13	Known values for OPTION are:	13	Known values for OPTION are:
14		14