fixed a serious proble is node-set was called on a nodeset fixed the rule

* libxslt/extra.c: fixed a serious proble is node-set was called
  on a nodeset
* tests//*/Makefile.am: fixed the rule to rebuild xsltproc
Daniel

diff --git a/ChangeLog b/ChangeLog
index e733f98..641078b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Jul 31 03:47:10 EDT 2001 Daniel Veillard <daniel@veillard.com>
+
+       * libxslt/extra.c: fixed a serious proble is node-set was called
+         on a nodeset
+       * tests//*/Makefile.am: fixed the rule to rebuild xsltproc
+
 Lun Jul 30 05:47:43 CEST 2001 Thomas Broyer <tbroyer@ltgt.net>
 
        * libexslt/functions.c: fixed memory leaks

diff --git a/libxslt/extra.c b/libxslt/extra.c
index 08102f2..282fc6c 100644 (file)
--- a/libxslt/extra.c
+++ b/libxslt/extra.c
@@ -132,8 +132,10 @@ xsltFunctionNodeSet(xmlXPathParserContextPtr ctxt, int nargs){
        ctxt->error = XPATH_INVALID_TYPE;
        return;
     }
-    ctxt->value->type = XPATH_NODESET;
-    ctxt->value->boolval = 1;
+    if (ctxt->value->type == XPATH_XSLT_TREE) {
+       ctxt->value->type = XPATH_NODESET;
+       ctxt->value->boolval = 1;
+    }
 }
 
 /**

diff --git a/tests/REC/Makefile.am b/tests/REC/Makefile.am
index eebd41e..5da83bb 100644 (file)
--- a/tests/REC/Makefile.am
+++ b/tests/REC/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 $(top_builddir)/xsltproc/xsltproc:
-       @(cd ../../libxslt ; make xsltproc)
+       @(cd ../../xsltproc ; make xsltproc)
 
 EXTRA_DIST =                                           \
     article.xsl bigfont.xsl                            \

diff --git a/tests/REC1/Makefile.am b/tests/REC1/Makefile.am
index 02ee4bd..5ec5219 100644 (file)
--- a/tests/REC1/Makefile.am
+++ b/tests/REC1/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 $(top_builddir)/xsltproc/xsltproc:
-       @(cd ../../libxslt ; make xsltproc)
+       @(cd ../../xsltproc ; make xsltproc)
 
 EXTRA_DIST = doc.xsl doc.xml doc.dtd result.xml
 

diff --git a/tests/REC2/Makefile.am b/tests/REC2/Makefile.am
index cfaf50f..6399063 100644 (file)
--- a/tests/REC2/Makefile.am
+++ b/tests/REC2/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 $(top_builddir)/xsltproc/xsltproc:
-       @(cd ../../libxslt ; make xsltproc)
+       @(cd ../../xsltproc ; make xsltproc)
 
 EXTRA_DIST = data.xml vrml.xsl vrml.xml svg.xsl svg.xml        html.xsl html.xml
 

diff --git a/tests/XSLTMark/Makefile.am b/tests/XSLTMark/Makefile.am
index 39abf20..31bd533 100644 (file)
--- a/tests/XSLTMark/Makefile.am
+++ b/tests/XSLTMark/Makefile.am
@@ -48,7 +48,7 @@ EXTRA_DIST = \
   xslbenchdream.xml
 
 $(top_builddir)/xsltproc/xsltproc:
-       @(cd ../../libxslt ; make xsltproc)
+       @(cd ../../xsltproc ; make xsltproc)
 
 all: alphabetize attsets avts axis backwards bottles breadth brutal chart \
   creation current dbonerow dbtail decoy depth encrypt functions game \

diff --git a/tests/docbook/Makefile.am b/tests/docbook/Makefile.am
index f1d5706..99d991a 100644 (file)
--- a/tests/docbook/Makefile.am
+++ b/tests/docbook/Makefile.am
@@ -3,7 +3,7 @@
 all: single xtchunk # Avoid doing the test in normal pass
 
 $(top_builddir)/xsltproc/xsltproc:
-       @(cd ../../libxslt ; make xsltproc)
+       @(cd ../../xsltproc ; make xsltproc)
 
 EXTRA_DIST = README VERSION
 

diff --git a/tests/documents/Makefile.am b/tests/documents/Makefile.am
index 008f6e9..7a4fc00 100644 (file)
--- a/tests/documents/Makefile.am
+++ b/tests/documents/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 $(top_builddir)/xsltproc/xsltproc:
-       @(cd ../../libxslt ; make xsltproc)
+       @(cd ../../xsltproc ; make xsltproc)
 
 EXTRA_DIST = bredfort.css index.xml system.xml \
              bredfort.xsl menu.xml worklog.xml \

diff --git a/tests/exslt/common/Makefile.am b/tests/exslt/common/Makefile.am
index a6b81e0..b0fb12b 100644 (file)
--- a/tests/exslt/common/Makefile.am
+++ b/tests/exslt/common/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 $(top_builddir)/xsltproc/xsltproc:
-       @(cd ../../../libxslt ; make xsltproc)
+       @(cd ../../../xsltproc ; make xsltproc)
 
 EXTRA_DIST =                                           \
        node-set.1.xml node-set.1.xsl node-set.1.out    \

diff --git a/tests/exslt/functions/Makefile.am b/tests/exslt/functions/Makefile.am
index bd1bdc0..c78ad70 100644 (file)
--- a/tests/exslt/functions/Makefile.am
+++ b/tests/exslt/functions/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 $(top_builddir)/xsltproc/xsltproc:
-       @(cd ../../../libxslt ; make xsltproc)
+       @(cd ../../../xsltproc ; make xsltproc)
 
 EXTRA_DIST =                                           \
        function.1.out  function.1.xml  function.1.xsl  \

diff --git a/tests/exslt/math/Makefile.am b/tests/exslt/math/Makefile.am
index bcd6e0d..6cbbf6e 100644 (file)
--- a/tests/exslt/math/Makefile.am
+++ b/tests/exslt/math/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 $(top_builddir)/xsltproc/xsltproc:
-       @(cd ../../../libxslt ; make xsltproc)
+       @(cd ../../../xsltproc ; make xsltproc)
 
 EXTRA_DIST =                                           \
        highest.1.out  highest.1.xml  highest.1.xsl     \

diff --git a/tests/exslt/sets/Makefile.am b/tests/exslt/sets/Makefile.am
index 4dffc82..223e2c7 100644 (file)
--- a/tests/exslt/sets/Makefile.am
+++ b/tests/exslt/sets/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 $(top_builddir)/xsltproc/xsltproc:
-       @(cd ../../../libxslt ; make xsltproc)
+       @(cd ../../../xsltproc ; make xsltproc)
 
 EXTRA_DIST =                                                   \
   difference.1.out     difference.1.xml     difference.1.xsl   \

diff --git a/tests/extensions/Makefile.am b/tests/extensions/Makefile.am
index 56aa74f..df0ed74 100644 (file)
--- a/tests/extensions/Makefile.am
+++ b/tests/extensions/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 $(top_builddir)/xsltproc/xsltproc:
-       @(cd ../../libxslt ; make xsltproc)
+       @(cd ../../xsltproc ; make xsltproc)
 
 EXTRA_DIST = \
     module.xml module.xsl module.out \

diff --git a/tests/general/Makefile.am b/tests/general/Makefile.am
index 3e0c598..3be88c7 100644 (file)
--- a/tests/general/Makefile.am
+++ b/tests/general/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 $(top_builddir)/xsltproc/xsltproc:
-       @(cd ../../libxslt ; make xsltproc)
+       @(cd ../../xsltproc ; make xsltproc)
 
 EXTRA_DIST = \
     bug-1-.out bug-1-.xsl \

diff --git a/tests/multiple/Makefile.am b/tests/multiple/Makefile.am
index 2cf906f..3e23d38 100644 (file)
--- a/tests/multiple/Makefile.am
+++ b/tests/multiple/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 $(top_builddir)/xsltproc/xsltproc:
-       @(cd ../../libxslt ; make xsltproc)
+       @(cd ../../xsltproc ; make xsltproc)
 
 EXTRA_DIST = dict.dtd  dict.xml  dict.xsl result.xml \
     out/lettera.orig out/letterb.orig \

diff --git a/tests/namespaces/Makefile.am b/tests/namespaces/Makefile.am
index 7040eac..8654924 100644 (file)
--- a/tests/namespaces/Makefile.am
+++ b/tests/namespaces/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 $(top_builddir)/xsltproc/xsltproc:
-       @(cd ../../libxslt ; make xsltproc)
+       @(cd ../../xsltproc ; make xsltproc)
 
 EXTRA_DIST = \
     tst.xml tst.xsl tst.out \

diff --git a/tests/numbers/Makefile.am b/tests/numbers/Makefile.am
index e53be59..6099185 100644 (file)
--- a/tests/numbers/Makefile.am
+++ b/tests/numbers/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 $(top_builddir)/xsltproc/xsltproc:
-       @(cd ../../libxslt ; make xsltproc)
+       @(cd ../../xsltproc ; make xsltproc)
 
 EXTRA_DIST = format-number.xsl format-number.xml format-number.out
 

diff --git a/tests/xmlspec/Makefile.am b/tests/xmlspec/Makefile.am
index 8bcbbcd..9e02e3b 100644 (file)
--- a/tests/xmlspec/Makefile.am
+++ b/tests/xmlspec/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 $(top_builddir)/xsltproc/xsltproc:
-       @(cd ../../libxslt ; make xsltproc)
+       @(cd ../../xsltproc ; make xsltproc)
 
 EXTRA_DIST = REC-xml-20001006.xml xmlspec-v21.dtd W3C-REC.css \
              logo-REC xmlspec.xsl REC-xml-2e.xsl diffspec.xsl \