fixing the equivalent of #75779 Daniel

* python/Makefile.am: fixing the equivalent of #75779
Daniel

diff --git a/ChangeLog b/ChangeLog
index 62351c4..8204772 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Apr 15 15:57:28 CEST 2002 Daniel Veillard <daniel@veillard.com>
+
+       * python/Makefile.am: fixing the equivalent of #75779
+
 Mon Apr 15 14:00:12 CEST 2002 Daniel Veillard <daniel@veillard.com>
 
        * libxslt/keys.c: fixed bug #78735

diff --git a/doc/libxslt-api.xml b/doc/libxslt-api.xml
index 667f28a..0558883 100644 (file)
--- a/doc/libxslt-api.xml
+++ b/doc/libxslt-api.xml
@@ -96,6 +96,7 @@
      <exports symbol='xsltParseStylesheetAttributeSet'/>
      <exports symbol='xsltFreeAttributeSetsHashes'/>
      <exports symbol='xsltApplyAttributeSet'/>
+     <exports symbol='xsltResolveStylesheetAttributeSet'/>
     </file>
     <file name='xsltInternals'>
      <exports symbol='XSLT_MAX_SORT'/>
@@ -1370,6 +1371,11 @@
       <info>Registers the test module</info>
       <return type='void'/>
     </function>
+    <function name='xsltResolveStylesheetAttributeSet' file='attributes'>
+      <info>resolve the references between attribute sets.</info>
+      <return type='void'/>
+      <arg name='style' type='xsltStylesheetPtr' info='the XSLT stylesheet '/>
+    </function>
     <function name='xsltRunStylesheet' file='transform'>
       <info>Apply the stylesheet to the document and generate the output according to output SAX and IObuf. It&apos;s an error to specify both SAX and IObuf. </info>
       <return type='int' info='the number of by written to the main resource or -1 in case of error. '/>

diff --git a/doc/libxslt-decl.txt b/doc/libxslt-decl.txt
index 04e3345..c88996a 100644 (file)
--- a/doc/libxslt-decl.txt
+++ b/doc/libxslt-decl.txt
@@ -1,14 +1,14 @@
 <MACRO>
 <NAME>LIBXSLT_DOTTED_VERSION</NAME>
-#define LIBXSLT_DOTTED_VERSION "1.0.14"
+#define LIBXSLT_DOTTED_VERSION "1.0.15"
 </MACRO>
 <MACRO>
 <NAME>LIBXSLT_VERSION</NAME>
-#define LIBXSLT_VERSION 10014
+#define LIBXSLT_VERSION 10015
 </MACRO>
 <MACRO>
 <NAME>LIBXSLT_VERSION_STRING</NAME>
-#define LIBXSLT_VERSION_STRING "10014"
+#define LIBXSLT_VERSION_STRING "10015"
 </MACRO>
 <MACRO>
 <NAME>WITH_XSLT_DEBUG</NAME>
@@ -1558,15 +1558,15 @@ void
 </FUNCTION>
 <MACRO>
 <NAME>LIBXSLT_DOTTED_VERSION</NAME>
-#define LIBXSLT_DOTTED_VERSION "1.0.14"
+#define LIBXSLT_DOTTED_VERSION "1.0.15"
 </MACRO>
 <MACRO>
 <NAME>LIBXSLT_VERSION</NAME>
-#define LIBXSLT_VERSION 10014
+#define LIBXSLT_VERSION 10015
 </MACRO>
 <MACRO>
 <NAME>LIBXSLT_VERSION_STRING</NAME>
-#define LIBXSLT_VERSION_STRING "10014"
+#define LIBXSLT_VERSION_STRING "10015"
 </MACRO>
 <MACRO>
 <NAME>WITH_XSLT_DEBUG</NAME>

diff --git a/doc/libxslt-refs.xml b/doc/libxslt-refs.xml
index 6ec98b8..237e4cd 100644 (file)
--- a/doc/libxslt-refs.xml
+++ b/doc/libxslt-refs.xml
@@ -192,6 +192,7 @@
     <reference name='xsltRegisterExtPrefix' href='html/libxslt-extensions.html#XSLTREGISTEREXTPREFIX'/>
     <reference name='xsltRegisterExtras' href='html/libxslt-extra.html#XSLTREGISTEREXTRAS'/>
     <reference name='xsltRegisterTestModule' href='html/libxslt-extensions.html#XSLTREGISTERTESTMODULE'/>
+    <reference name='xsltResolveStylesheetAttributeSet' href='html/libxslt-attributes.html#XSLTRESOLVESTYLESHEETATTRIBUTESET'/>
     <reference name='xsltRunStylesheet' href='html/libxslt-transform.html#XSLTRUNSTYLESHEET'/>
     <reference name='xsltRuntimeExtra' href='html/libxslt-xsltinternals.html#XSLTRUNTIMEEXTRA'/>
     <reference name='xsltRuntimeExtraPtr' href='html/libxslt-xsltinternals.html#XSLTRUNTIMEEXTRAPTR'/>
@@ -448,6 +449,7 @@
     <ref name='xsltRegisterExtPrefix'/>
     <ref name='xsltRegisterExtras'/>
     <ref name='xsltRegisterTestModule'/>
+    <ref name='xsltResolveStylesheetAttributeSet'/>
     <ref name='xsltRunStylesheet'/>
     <ref name='xsltRuntimeExtra'/>
     <ref name='xsltRuntimeExtraPtr'/>
@@ -957,6 +959,7 @@
     <type name='xsltStylesheetPtr'>
       <ref name='xsltParseStylesheetAttributeSet'/>
       <ref name='xsltFreeAttributeSetsHashes'/>
+      <ref name='xsltResolveStylesheetAttributeSet'/>
       <ref name='xsltLoadStyleDocument'/>
       <ref name='xsltNewStyleDocument'/>
       <ref name='xsltFreeStyleDocuments'/>
@@ -1113,6 +1116,7 @@
       <ref name='xsltParseStylesheetAttributeSet'/>
       <ref name='xsltFreeAttributeSetsHashes'/>
       <ref name='xsltApplyAttributeSet'/>
+      <ref name='xsltResolveStylesheetAttributeSet'/>
     </file>
     <file name='documents'>
       <ref name='xsltNewDocument'/>
@@ -2106,6 +2110,7 @@
           <ref name='xsltEvalStaticAttrValueTemplate'/>
           <ref name='xsltFreeAttributeSetsHashes'/>
           <ref name='xsltGetNsProp'/>
+          <ref name='xsltResolveStylesheetAttributeSet'/>
           <ref name='xsltTemplateProcess'/>
         </word>
         <word name='attributes'>
@@ -2143,6 +2148,9 @@
           <ref name='xsltPrintErrorContext'/>
           <ref name='xsltSetXIncludeDefault'/>
         </word>
+        <word name='between'>
+          <ref name='xsltResolveStylesheetAttributeSet'/>
+        </word>
         <word name='blank'>
           <ref name='xsltParseTemplateContent'/>
         </word>
@@ -3763,6 +3771,9 @@
           <ref name='xsltParseStylesheetParam'/>
           <ref name='xsltParseStylesheetVariable'/>
         </word>
+        <word name='references'>
+          <ref name='xsltResolveStylesheetAttributeSet'/>
+        </word>
         <word name='referencing'>
           <ref name='xsltLoadStylesheetPI'/>
         </word>
@@ -3806,6 +3817,9 @@
           <ref name='xsltSetGenericDebugFunc'/>
           <ref name='xsltSetGenericErrorFunc'/>
         </word>
+        <word name='resolve'>
+          <ref name='xsltResolveStylesheetAttributeSet'/>
+        </word>
         <word name='resource'>
           <ref name='xsltRunStylesheet'/>
         </word>
@@ -3906,6 +3920,7 @@
         </word>
         <word name='sets'>
           <ref name='xsltFreeAttributeSetsHashes'/>
+          <ref name='xsltResolveStylesheetAttributeSet'/>
         </word>
         <word name='setting'>
           <ref name='xsltGetQNameURI'/>

diff --git a/python/Makefile.am b/python/Makefile.am
index 88f30b0..0d651ed 100644 (file)
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -22,14 +22,15 @@ EXTRA_DIST =                        \
        libxslt-python-api.xml  \
        $(DOCS)
 
-libxsltmod_la_LDFLAGS = -module -avoid-version
+libxsltmod_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/libxslt/.libs \
+                        -L$(top_builddir)/libexslt/.libs
 
 if WITH_PYTHON
 mylibs = \
        $(top_builddir)/libxslt/libxslt.la \
        $(top_builddir)/libexslt/libexslt.la
 
-all: libxslt.py
+all: libxslt.py libxsltmod.la
 
 pythondir = $(prefix)/lib/python${PYTHON_VERSION}/site-packages
 python_LTLIBRARIES = libxsltmod.la

diff --git a/python/libxsltclass.txt b/python/libxsltclass.txt
index 158f8ef..fb32016 100644 (file)
--- a/python/libxsltclass.txt
+++ b/python/libxsltclass.txt
@@ -148,6 +148,7 @@ Class stylesheet()
     # functions from module attributes
     freeAttributeSetsHashes()
     parseStylesheetAttributeSet()
+    resolveStylesheetAttributeSet()
 
     # functions from module documents
     freeStyleDocuments()