Attachment #533614 for bug #653078

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

and this patch




++ /Makefile.am

DIST_SUBDIRS = libxslt libexslt xsltproc python doc tests

confexecdir=$(libdir)
confexec_DATA = xsltCataloglessConf.sh

bin_SCRIPTS = xslt-catalogless-config

dist-hook: cleanup libxslt.spec
	touch $(distdir)/doc/*.xml

	     win32/libxslt/libxslt_so.dsp win32/libxslt/xsltproc.dsp \
	     $(CVS_EXTRA_DIST)

## We create xsltCataloglessConf.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).

xsltCataloglessConf.sh: xsltConf.sh.in Makefile
## Use sed and then mv to avoid problems if the user interrupts.
	sed -e 's?\@XSLT_LIBDIR\@?$(XSLT_LIBDIR)?g' \
	    -e 's?\@XSLT_INCLUDEDIR\@?$(XSLT_INCLUDEDIR)?g' \
	    -e 's?\@VERSION\@?$(VERSION)?g' \
	    -e 's?\@XSLT_LIBS\@?$(XSLT_LIBS) $(EXTRA_LIBS)?g' \
	       < $(srcdir)/xsltConf.sh.in > xsltConf.tmp \
	&& mv xsltConf.tmp xsltCataloglessConf.sh

CLEANFILES = xsltCataloglessConf.sh

check-local: tests




pkgconfigdir=$(libdir)/pkgconfig
pkgconfig_DATA = libxslt-catalogless.pc libexslt-catalogless.pc

m4datadir = $(datadir)/aclocal
m4data_DATA = libxslt.m4
++ /configure.ac

AC_SUBST(LIBXML_SRC)

dnl
dnl where is xml2-catalogless-config
dnl

AC_SUBST(LIBXML_REQUIRED_VERSION)
if test "x$LIBXML_CONFIG_PREFIX" != "x"
then
	AC_PATH_TOOL([XML_CONFIG], [xml2-catalogless-config], [false], [${LIBXML_CONFIG_PREFIX}/bin])
else
	AC_PATH_TOOL([XML_CONFIG], [xml2-catalogless-config], [false])
fi

dnl

	if cd $LIBXML_SRC
	then
		LIBXML_SRC=`pwd`
		XML_CONFIG="${LIBXML_SRC}/xml2-catalogless-config"
		LIBXML_CFLAGS="-I${LIBXML_SRC}/include"
		LIBXML_LIBS="-L${LIBXML_SRC} `$XML_CONFIG --libs`"
                WITH_MODULES="`$XML_CONFIG --modules`"


if test "x$LIBXML_CONFIG_PREFIX" = "x" -a "x$LIBXML_LIBS" = "x"
then
	PKG_CHECK_MODULES([LIBXML], [libxml-2.0-catalogless >= $LIBXML_REQUIRED_VERSION], [
		WITH_MODULES="`$PKG_CONFIG --variable=modules libxml-2.0-catalogless`"
	], [ ])
fi

dnl
dnl make sure xml2-catalogless-config is executable,
dnl test version and init our variables
dnl



XSLT_LIBDIR='-L${libdir}'
XSLT_INCLUDEDIR='-I${includedir}'
XSLT_LIBS="-lxslt-catalogless $LIBXML_LIBS $M_LIBS"
AC_SUBST(XSLT_LIBDIR)
AC_SUBST(XSLT_INCLUDEDIR)
AC_SUBST(XSLT_LIBS)

EXSLT_LIBDIR='-L${libdir}'
EXSLT_INCLUDEDIR='-I${includedir}'
EXSLT_LIBS="-lexslt-catalogless $XSLT_LIBS $LIBGCRYPT_LIBS"
AC_SUBST(EXSLT_LIBDIR)
AC_SUBST(EXSLT_INCLUDEDIR)
AC_SUBST(EXSLT_LIBS)


AC_CONFIG_FILES([
Makefile
libxslt-catalogless.pc:libxslt.pc.in
libexslt-catalogless.pc:libexslt.pc.in
libxslt/Makefile
libxslt/xsltconfig.h
libxslt/xsltwin32config.h

tests/exslt/crypto/Makefile
tests/plugins/Makefile
doc/Makefile
xslt-catalogless-config:xslt-config.in
libxslt.spec
])

++ /doc/syms.xsl

# Versions here are *fixed* to match the libxslt version
# at which the symbol was introduced. This ensures that
# a new client app requiring symbol foo() can't accidentally
# run with old libxslt-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 {
    local:
  *;
};
</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:apply-templates select="."/>
    </xsl:for-each>

    <xsl:if test="not($prev)">
      <xsl:text>
  local:
    *;
</xsl:text>
    </xsl:if>

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


AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBXML_CFLAGS)

lib_LTLIBRARIES = libexslt-catalogless.la

exsltincdir = $(includedir)/libexslt


nodist_exsltinc_HEADERS =               \
	exsltconfig.h

libexslt_catalogless_la_SOURCES =       \
	exslt.c				\
	common.c			\
	crypto.c			\

	libexslt.h			\
	dynamic.c

libexslt_catalogless_la_LIBADD = $(top_builddir)/libxslt/libxslt-catalogless.la $(EXTRA_LIBS) $(LIBGCRYPT_LIBS) $(M_LIBS)
libexslt_catalogless_la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS) -version-info $(LIBEXSLT_VERSION_INFO)

man_MANS = libexslt.3

++ /libexslt.pc.in

includedir=@includedir@


Name: libexslt-catalogless
Version: @LIBEXSLT_VERSION@
Description: EXSLT Extension library using libXML library version 2 without Catalog support
Requires: libxml-2.0-catalogless
Libs: @EXSLT_LIBDIR@ @EXSLT_LIBS@
Cflags: @EXSLT_INCLUDEDIR@
++ /libxslt/Makefile.am


AM_CFLAGS = $(LIBXML_CFLAGS)

lib_LTLIBRARIES = libxslt-catalogless.la

xsltincdir = $(includedir)/libxslt


nodist_xsltinc_HEADERS = 		\
	xsltconfig.h

libxslt_catalogless_la_SOURCES = 	\
	attrvt.c			\
	xslt.c				\
	xsltlocale.c			\

	win32config.h			\
	xsltwin32config.h.in		\
	libxslt.h
nodist_libxslt_catalogless_la_SOURCES =	\
	xsltwin32config.h

if USE_VERSION_SCRIPT

LIBXSLT_VERSION_SCRIPT =
endif

libxslt_catalogless_la_LIBADD = $(LIBXML_LIBS) $(EXTRA_LIBS) $(M_LIBS)
libxslt_catalogless_la_LDFLAGS =			\
		$(WIN32_EXTRA_LDFLAGS)			\
		$(LIBXSLT_VERSION_SCRIPT)		\
		-version-info $(LIBXSLT_VERSION_INFO)
++ /libxslt.pc.in

includedir=@includedir@


Name: libxslt-catalogless
Version: @VERSION@
Description: XSLT library version 2 using libXML library version 2 without Catalog support.
Requires: libxml-2.0-catalogless
Libs: @XSLT_LIBDIR@ @XSLT_LIBS@ @EXTRA_LIBS@
Cflags: @XSLT_INCLUDEDIR@
++ /python/Makefile.am


if WITH_PYTHON
mylibs = \
	$(top_builddir)/libxslt/libxslt-catalogless.la \
	$(top_builddir)/libexslt/libexslt-catalogless.la

all-local: libxslt.py

++ /tests/plugins/Makefile.am


xmlsoft_org_xslt_testplugin_la_CFLAGS = -DMODULE_COMPILE $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS)
xmlsoft_org_xslt_testplugin_la_SOURCES = testplugin.c
xmlsoft_org_xslt_testplugin_la_LIBADD = $(top_builddir)/libxslt/libxslt-catalogless.la $(EXTRA_LIBS)
xmlsoft_org_xslt_testplugin_la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS) -module -avoid-version -rpath $(plugindir)

test-logall:
++ /xslt-config.in

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

Known values for OPTION are:

++ /xsltproc/Makefile.am

	      -I$(top_builddir)/libexslt

EXTRA_PROGRAMS=
noinst_PROGRAMS = xsltproc $(XSLTPROCDV)

noinst_PROGRAMS += testThreads

AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBXML_CFLAGS)


testThreads_DEPENDENCIES = $(DEPS)
testThreads_LDADD=  $(THREAD_LIBS) $(LDADDS)

DEPS = $(top_builddir)/libxslt/libxslt-catalogless.la \
	$(top_builddir)/libexslt/libexslt-catalogless.la 

LDADDS = $(top_builddir)/libxslt/libxslt-catalogless.la \
         $(top_builddir)/libexslt/libexslt-catalogless.la \
	$(LIBXML_LIBS) $(EXTRA_LIBS) $(M_LIBS) $(WIN32_EXTRA_LIBADD)

xsltproc_LDADD = $(LIBGCRYPT_LIBS) $(LDADDS)

CLEANFILES = .memdump

$(top_builddir)/libxslt/libxslt-catalogless.la:
	cd $(top_builddir)/libxslt && $(MAKE) libxslt-catalogless.la

$(top_builddir)/libexslt/libexslt-catalogless.la: $(top_builddir)/libxslt/libxslt-catalogless.la
	cd $(top_builddir)/libexslt && $(MAKE) libexslt-catalogless.la

xsltproc.dv: xsltproc.o
	$(CC) $(CFLAGS) -o xsltproc xsltproc.o ../libexslt/.libs/libexslt-catalogless.a ../libxslt/.libs/libxslt-cataloless.a $(LIBXML_LIBS) $(EXTRA_LIBS) $(LIBGCRYPT_LIBS)

tests: testThreads
	@echo > .memdump

Return to bug 653078

Line Link Here

(-)file_not_specified_in_diff (-70 / +68 lines)
0	-- /Makefile.am	0	++ /Makefile.am
Lines 9-17 Link Here
9	DIST_SUBDIRS = libxslt libexslt xsltproc python doc tests	9	DIST_SUBDIRS = libxslt libexslt xsltproc python doc tests
10		10
11	confexecdir=$(libdir)	11	confexecdir=$(libdir)
12	confexec_DATA = xsltConf.sh	12	confexec_DATA = xsltCataloglessConf.sh
13		13
14	bin_SCRIPTS = xslt-config	14	bin_SCRIPTS = xslt-catalogless-config
15		15
16	dist-hook: cleanup libxslt.spec	16	dist-hook: cleanup libxslt.spec
17	touch $(distdir)/doc/*.xml	17	touch $(distdir)/doc/*.xml
Lines 27-47 Link Here
27	win32/libxslt/libxslt_so.dsp win32/libxslt/xsltproc.dsp \	27	win32/libxslt/libxslt_so.dsp win32/libxslt/xsltproc.dsp \
28	$(CVS_EXTRA_DIST)	28	$(CVS_EXTRA_DIST)
29		29
30	## We create xsltConf.sh here and not from configure because we want	30	## We create xsltCataloglessConf.sh here and not from configure because we want
31	## to get the paths expanded correctly. Macros like srcdir are given	31	## to get the paths expanded correctly. Macros like srcdir are given
32	## the value NONE in configure if the user doesn't specify them (this	32	## the value NONE in configure if the user doesn't specify them (this
33	## is an autoconf feature, not a bug).	33	## is an autoconf feature, not a bug).
34		34
35	xsltConf.sh: xsltConf.sh.in Makefile	35	xsltCataloglessConf.sh: xsltConf.sh.in Makefile
36	## Use sed and then mv to avoid problems if the user interrupts.	36	## Use sed and then mv to avoid problems if the user interrupts.
37	sed -e 's?\@XSLT_LIBDIR\@?$(XSLT_LIBDIR)?g' \	37	sed -e 's?\@XSLT_LIBDIR\@?$(XSLT_LIBDIR)?g' \
38	-e 's?\@XSLT_INCLUDEDIR\@?$(XSLT_INCLUDEDIR)?g' \	38	-e 's?\@XSLT_INCLUDEDIR\@?$(XSLT_INCLUDEDIR)?g' \
39	-e 's?\@VERSION\@?$(VERSION)?g' \	39	-e 's?\@VERSION\@?$(VERSION)?g' \
40	-e 's?\@XSLT_LIBS\@?$(XSLT_LIBS) $(EXTRA_LIBS)?g' \	40	-e 's?\@XSLT_LIBS\@?$(XSLT_LIBS) $(EXTRA_LIBS)?g' \
41	< $(srcdir)/xsltConf.sh.in > xsltConf.tmp \	41	< $(srcdir)/xsltConf.sh.in > xsltConf.tmp \
42	&& mv xsltConf.tmp xsltConf.sh	42	&& mv xsltConf.tmp xsltCataloglessConf.sh
43		43
44	CLEANFILES = xsltConf.sh	44	CLEANFILES = xsltCataloglessConf.sh
45		45
46	check-local: tests	46	check-local: tests
47		47
Lines 70-76 Link Here
70		70
71		71
72	pkgconfigdir=$(libdir)/pkgconfig	72	pkgconfigdir=$(libdir)/pkgconfig
73	pkgconfig_DATA = libxslt.pc libexslt.pc	73	pkgconfig_DATA = libxslt-catalogless.pc libexslt-catalogless.pc
74		74
75	m4datadir = $(datadir)/aclocal	75	m4datadir = $(datadir)/aclocal
76	m4data_DATA = libxslt.m4	76	m4data_DATA = libxslt.m4
77	-- /configure.ac	77	++ /configure.ac
Lines 436-450 Link Here
436	AC_SUBST(LIBXML_SRC)	436	AC_SUBST(LIBXML_SRC)
437		437
438	dnl	438	dnl
439	dnl where is xml2-config	439	dnl where is xml2-catalogless-config
440	dnl	440	dnl
441		441
442	AC_SUBST(LIBXML_REQUIRED_VERSION)	442	AC_SUBST(LIBXML_REQUIRED_VERSION)
443	if test "x$LIBXML_CONFIG_PREFIX" != "x"	443	if test "x$LIBXML_CONFIG_PREFIX" != "x"
444	then	444	then
445	AC_PATH_TOOL([XML_CONFIG], [xml2-config], [false], [${LIBXML_CONFIG_PREFIX}/bin])	445	AC_PATH_TOOL([XML_CONFIG], [xml2-catalogless-config], [false], [${LIBXML_CONFIG_PREFIX}/bin])
446	else	446	else
447	AC_PATH_TOOL([XML_CONFIG], [xml2-config], [false])	447	AC_PATH_TOOL([XML_CONFIG], [xml2-catalogless-config], [false])
448	fi	448	fi
449		449
450	dnl	450	dnl
Lines 481-487 Link Here
481	if cd $LIBXML_SRC	481	if cd $LIBXML_SRC
482	then	482	then
483	LIBXML_SRC=`pwd`	483	LIBXML_SRC=`pwd`
484	XML_CONFIG="${LIBXML_SRC}/xml2-config"	484	XML_CONFIG="${LIBXML_SRC}/xml2-catalogless-config"
485	LIBXML_CFLAGS="-I${LIBXML_SRC}/include"	485	LIBXML_CFLAGS="-I${LIBXML_SRC}/include"
486	LIBXML_LIBS="-L${LIBXML_SRC} `$XML_CONFIG --libs`"	486	LIBXML_LIBS="-L${LIBXML_SRC} `$XML_CONFIG --libs`"
487	WITH_MODULES="`$XML_CONFIG --modules`"	487	WITH_MODULES="`$XML_CONFIG --modules`"
Lines 497-509 Link Here
497		497
498	if test "x$LIBXML_CONFIG_PREFIX" = "x" -a "x$LIBXML_LIBS" = "x"	498	if test "x$LIBXML_CONFIG_PREFIX" = "x" -a "x$LIBXML_LIBS" = "x"
499	then	499	then
500	PKG_CHECK_MODULES([LIBXML], [libxml-2.0 >= $LIBXML_REQUIRED_VERSION], [	500	PKG_CHECK_MODULES([LIBXML], [libxml-2.0-catalogless >= $LIBXML_REQUIRED_VERSION], [
501	WITH_MODULES="`$PKG_CONFIG --variable=modules libxml-2.0`"	501	WITH_MODULES="`$PKG_CONFIG --variable=modules libxml-2.0-catalogless`"
502	], [ ])	502	], [ ])
503	fi	503	fi
504		504
505	dnl	505	dnl
506	dnl make sure xml2-config is executable,	506	dnl make sure xml2-catalogless-config is executable,
507	dnl test version and init our variables	507	dnl test version and init our variables
508	dnl	508	dnl
509		509
Lines 609-622 Link Here
609		609
610	XSLT_LIBDIR='-L${libdir}'	610	XSLT_LIBDIR='-L${libdir}'
611	XSLT_INCLUDEDIR='-I${includedir}'	611	XSLT_INCLUDEDIR='-I${includedir}'
612	XSLT_LIBS="-lxslt $LIBXML_LIBS $M_LIBS"	612	XSLT_LIBS="-lxslt-catalogless $LIBXML_LIBS $M_LIBS"
613	AC_SUBST(XSLT_LIBDIR)	613	AC_SUBST(XSLT_LIBDIR)
614	AC_SUBST(XSLT_INCLUDEDIR)	614	AC_SUBST(XSLT_INCLUDEDIR)
615	AC_SUBST(XSLT_LIBS)	615	AC_SUBST(XSLT_LIBS)
616		616
617	EXSLT_LIBDIR='-L${libdir}'	617	EXSLT_LIBDIR='-L${libdir}'
618	EXSLT_INCLUDEDIR='-I${includedir}'	618	EXSLT_INCLUDEDIR='-I${includedir}'
619	EXSLT_LIBS="-lexslt $XSLT_LIBS $LIBGCRYPT_LIBS"	619	EXSLT_LIBS="-lexslt-catalogless $XSLT_LIBS $LIBGCRYPT_LIBS"
620	AC_SUBST(EXSLT_LIBDIR)	620	AC_SUBST(EXSLT_LIBDIR)
621	AC_SUBST(EXSLT_INCLUDEDIR)	621	AC_SUBST(EXSLT_INCLUDEDIR)
622	AC_SUBST(EXSLT_LIBS)	622	AC_SUBST(EXSLT_LIBS)
Lines 634-641 Link Here
634		634
635	AC_CONFIG_FILES([	635	AC_CONFIG_FILES([
636	Makefile	636	Makefile
637	libxslt.pc	637	libxslt-catalogless.pc:libxslt.pc.in
638	libexslt.pc	638	libexslt-catalogless.pc:libexslt.pc.in
639	libxslt/Makefile	639	libxslt/Makefile
640	libxslt/xsltconfig.h	640	libxslt/xsltconfig.h
641	libxslt/xsltwin32config.h	641	libxslt/xsltwin32config.h
Lines 673-679 Link Here
673	tests/exslt/crypto/Makefile	673	tests/exslt/crypto/Makefile
674	tests/plugins/Makefile	674	tests/plugins/Makefile
675	doc/Makefile	675	doc/Makefile
676	xslt-config	676	xslt-catalogless-config:xslt-config.in
677	libxslt.spec	677	libxslt.spec
678	])	678	])
679		679
680	-- /doc/syms.xsl	680	++ /doc/syms.xsl
Lines 15-33 Link Here
15	# Versions here are fixed to match the libxslt version	15	# Versions here are fixed to match the libxslt 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 libxslt.so not providing foo() - the global	18	# run with old libxslt-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	local:
		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 44-59 Link Here
44	<xsl:apply-templates select="."/>	49	<xsl:apply-templates select="."/>
45	</xsl:for-each>	50	</xsl:for-each>
46		51
47	<xsl:if test="not($prev)">
48	<xsl:text>
49	local:
50	*;
51	</xsl:text>
52	</xsl:if>
53
54	<xsl:text>} </xsl:text>	52	<xsl:text>} </xsl:text>
55	<xsl:if test="$prev">	53	<xsl:if test="$prev">
56	<xsl:text>LIBXML2_</xsl:text>	54	<xsl:text>LIBXML2_CATALOGLESS_</xsl:text>
57	<xsl:value-of select="$prev/@version"/>	55	<xsl:value-of select="$prev/@version"/>
58	</xsl:if>	56	</xsl:if>
59	<xsl:text>;	57	<xsl:text>;
60	-- /libexslt/Makefile.am	58	++ /libexslt/Makefile.am
Lines 4-10 Link Here
4		4
5	AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBXML_CFLAGS)	5	AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBXML_CFLAGS)
6		6
7	lib_LTLIBRARIES = libexslt.la	7	lib_LTLIBRARIES = libexslt-catalogless.la
8		8
9	exsltincdir = $(includedir)/libexslt	9	exsltincdir = $(includedir)/libexslt
10		10
Lines 14-20 Link Here
14	nodist_exsltinc_HEADERS = \	14	nodist_exsltinc_HEADERS = \
15	exsltconfig.h	15	exsltconfig.h
16		16
17	libexslt_la_SOURCES = \	17	libexslt_catalogless_la_SOURCES = \
18	exslt.c \	18	exslt.c \
19	common.c \	19	common.c \
20	crypto.c \	20	crypto.c \
Lines 27-34 Link Here
27	libexslt.h \	27	libexslt.h \
28	dynamic.c	28	dynamic.c
29		29
30	libexslt_la_LIBADD = $(top_builddir)/libxslt/libxslt.la $(EXTRA_LIBS) $(LIBGCRYPT_LIBS) $(M_LIBS)	30	libexslt_catalogless_la_LIBADD = $(top_builddir)/libxslt/libxslt-catalogless.la $(EXTRA_LIBS) $(LIBGCRYPT_LIBS) $(M_LIBS)
31	libexslt_la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS) -version-info $(LIBEXSLT_VERSION_INFO)	31	libexslt_catalogless_la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS) -version-info $(LIBEXSLT_VERSION_INFO)
32		32
33	man_MANS = libexslt.3	33	man_MANS = libexslt.3
34		34
35	-- /libexslt.pc.in	35	++ /libexslt.pc.in
Lines 4-12 Link Here
4	includedir=@includedir@	4	includedir=@includedir@
5		5
6		6
7	Name: libexslt	7	Name: libexslt-catalogless
8	Version: @LIBEXSLT_VERSION@	8	Version: @LIBEXSLT_VERSION@
9	Description: EXSLT Extension library	9	Description: EXSLT Extension library using libXML library version 2 without Catalog support
10	Requires: libxml-2.0	10	Requires: libxml-2.0-catalogless
11	Libs: @EXSLT_LIBDIR@ @EXSLT_LIBS@	11	Libs: @EXSLT_LIBDIR@ @EXSLT_LIBS@
12	Cflags: @EXSLT_INCLUDEDIR@	12	Cflags: @EXSLT_INCLUDEDIR@
13	-- /libxslt/Makefile.am	13	++ /libxslt/Makefile.am
Lines 2-8 Link Here
2		2
3	AM_CFLAGS = $(LIBXML_CFLAGS)	3	AM_CFLAGS = $(LIBXML_CFLAGS)
4		4
5	lib_LTLIBRARIES = libxslt.la	5	lib_LTLIBRARIES = libxslt-catalogless.la
6		6
7	xsltincdir = $(includedir)/libxslt	7	xsltincdir = $(includedir)/libxslt
8		8
Lines 30-36 Link Here
30	nodist_xsltinc_HEADERS = \	30	nodist_xsltinc_HEADERS = \
31	xsltconfig.h	31	xsltconfig.h
32		32
33	libxslt_la_SOURCES = \	33	libxslt_catalogless_la_SOURCES = \
34	attrvt.c \	34	attrvt.c \
35	xslt.c \	35	xslt.c \
36	xsltlocale.c \	36	xsltlocale.c \
Lines 53-59 Link Here
53	win32config.h \	53	win32config.h \
54	xsltwin32config.h.in \	54	xsltwin32config.h.in \
55	libxslt.h	55	libxslt.h
56	nodist_libxslt_la_SOURCES = \	56	nodist_libxslt_catalogless_la_SOURCES = \
57	xsltwin32config.h	57	xsltwin32config.h
58		58
59	if USE_VERSION_SCRIPT	59	if USE_VERSION_SCRIPT
Lines 62-69 Link Here
62	LIBXSLT_VERSION_SCRIPT =	62	LIBXSLT_VERSION_SCRIPT =
63	endif	63	endif
64		64
65	libxslt_la_LIBADD = $(LIBXML_LIBS) $(EXTRA_LIBS) $(M_LIBS)	65	libxslt_catalogless_la_LIBADD = $(LIBXML_LIBS) $(EXTRA_LIBS) $(M_LIBS)
66	libxslt_la_LDFLAGS = \	66	libxslt_catalogless_la_LDFLAGS = \
67	$(WIN32_EXTRA_LDFLAGS) \	67	$(WIN32_EXTRA_LDFLAGS) \
68	$(LIBXSLT_VERSION_SCRIPT) \	68	$(LIBXSLT_VERSION_SCRIPT) \
69	-version-info $(LIBXSLT_VERSION_INFO)	69	-version-info $(LIBXSLT_VERSION_INFO)
70	-- /libxslt.pc.in	70	++ /libxslt.pc.in
Lines 4-12 Link Here
4	includedir=@includedir@	4	includedir=@includedir@
5		5
6		6
7	Name: libxslt	7	Name: libxslt-catalogless
8	Version: @VERSION@	8	Version: @VERSION@
9	Description: XSLT library version 2.	9	Description: XSLT library version 2 using libXML library version 2 without Catalog support.
10	Requires: libxml-2.0	10	Requires: libxml-2.0-catalogless
11	Libs: @XSLT_LIBDIR@ @XSLT_LIBS@ @EXTRA_LIBS@	11	Libs: @XSLT_LIBDIR@ @XSLT_LIBS@ @EXTRA_LIBS@
12	Cflags: @XSLT_INCLUDEDIR@	12	Cflags: @XSLT_INCLUDEDIR@
13	-- /python/Makefile.am	13	++ /python/Makefile.am
Lines 23-30 Link Here
23		23
24	if WITH_PYTHON	24	if WITH_PYTHON
25	mylibs = \	25	mylibs = \
26	$(top_builddir)/libxslt/libxslt.la \	26	$(top_builddir)/libxslt/libxslt-catalogless.la \
27	$(top_builddir)/libexslt/libexslt.la	27	$(top_builddir)/libexslt/libexslt-catalogless.la
28		28
29	all-local: libxslt.py	29	all-local: libxslt.py
30		30
31	-- /tests/plugins/Makefile.am	31	++ /tests/plugins/Makefile.am
Lines 20-26 Link Here
20		20
21	xmlsoft_org_xslt_testplugin_la_CFLAGS = -DMODULE_COMPILE $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS)	21	xmlsoft_org_xslt_testplugin_la_CFLAGS = -DMODULE_COMPILE $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS)
22	xmlsoft_org_xslt_testplugin_la_SOURCES = testplugin.c	22	xmlsoft_org_xslt_testplugin_la_SOURCES = testplugin.c
23	xmlsoft_org_xslt_testplugin_la_LIBADD = $(top_builddir)/libxslt/libxslt.la $(EXTRA_LIBS)	23	xmlsoft_org_xslt_testplugin_la_LIBADD = $(top_builddir)/libxslt/libxslt-catalogless.la $(EXTRA_LIBS)
24	xmlsoft_org_xslt_testplugin_la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS) -module -avoid-version -rpath $(plugindir)	24	xmlsoft_org_xslt_testplugin_la_LDFLAGS = $(WIN32_EXTRA_LDFLAGS) -module -avoid-version -rpath $(plugindir)
25		25
26	test-logall:	26	test-logall:
27	-- /xslt-config.in	27	++ /xslt-config.in
Lines 9-15 Link Here
9	usage()	9	usage()
10	{	10	{
11	cat <<EOF	11	cat <<EOF
12	Usage: xslt-config [OPTION]...	12	Usage: xslt-catalogless-config [OPTION]...
13		13
14	Known values for OPTION are:	14	Known values for OPTION are:
15		15
16	-- /xsltproc/Makefile.am	16	++ /xsltproc/Makefile.am
Lines 3-11 Link Here
3	-I$(top_builddir)/libexslt	3	-I$(top_builddir)/libexslt
4		4
5	EXTRA_PROGRAMS=	5	EXTRA_PROGRAMS=
6	bin_PROGRAMS = xsltproc $(XSLTPROCDV)	6	noinst_PROGRAMS = xsltproc $(XSLTPROCDV)
7		7
8	noinst_PROGRAMS=testThreads	8	noinst_PROGRAMS += testThreads
9		9
10	AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBXML_CFLAGS)	10	AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBXML_CFLAGS)
11		11
Lines 18-42 Link Here
18	testThreads_DEPENDENCIES = $(DEPS)	18	testThreads_DEPENDENCIES = $(DEPS)
19	testThreads_LDADD= $(THREAD_LIBS) $(LDADDS)	19	testThreads_LDADD= $(THREAD_LIBS) $(LDADDS)
20		20
21	DEPS = $(top_builddir)/libxslt/libxslt.la \	21	DEPS = $(top_builddir)/libxslt/libxslt-catalogless.la \
22	$(top_builddir)/libexslt/libexslt.la	22	$(top_builddir)/libexslt/libexslt-catalogless.la
23		23
24	LDADDS = $(top_builddir)/libxslt/libxslt.la \	24	LDADDS = $(top_builddir)/libxslt/libxslt-catalogless.la \
25	$(top_builddir)/libexslt/libexslt.la \	25	$(top_builddir)/libexslt/libexslt-catalogless.la \
26	$(LIBXML_LIBS) $(EXTRA_LIBS) $(M_LIBS) $(WIN32_EXTRA_LIBADD)	26	$(LIBXML_LIBS) $(EXTRA_LIBS) $(M_LIBS) $(WIN32_EXTRA_LIBADD)
27		27
28	xsltproc_LDADD = $(LIBGCRYPT_LIBS) $(LDADDS)	28	xsltproc_LDADD = $(LIBGCRYPT_LIBS) $(LDADDS)
29		29
30	CLEANFILES = .memdump	30	CLEANFILES = .memdump
31		31
32	$(top_builddir)/libxslt/libxslt.la:	32	$(top_builddir)/libxslt/libxslt-catalogless.la:
33	cd $(top_builddir)/libxslt && $(MAKE) libxslt.la	33	cd $(top_builddir)/libxslt && $(MAKE) libxslt-catalogless.la
34		34
35	$(top_builddir)/libexslt/libexslt.la: $(top_builddir)/libxslt/libxslt.la	35	$(top_builddir)/libexslt/libexslt-catalogless.la: $(top_builddir)/libxslt/libxslt-catalogless.la
36	cd $(top_builddir)/libexslt && $(MAKE) libexslt.la	36	cd $(top_builddir)/libexslt && $(MAKE) libexslt-catalogless.la
37		37
38	xsltproc.dv: xsltproc.o	38	xsltproc.dv: xsltproc.o
39	$(CC) $(CFLAGS) -o xsltproc xsltproc.o ../libexslt/.libs/libexslt.a ../libxslt/.libs/libxslt.a $(LIBXML_LIBS) $(EXTRA_LIBS) $(LIBGCRYPT_LIBS)	39	$(CC) $(CFLAGS) -o xsltproc xsltproc.o ../libexslt/.libs/libexslt-catalogless.a ../libxslt/.libs/libxslt-cataloless.a $(LIBXML_LIBS) $(EXTRA_LIBS) $(LIBGCRYPT_LIBS)
40		40
41	tests: testThreads	41	tests: testThreads
42	@echo > .memdump	42	@echo > .memdump