Imported Upstream version 1.1.31upstream/1.1.31

Change-Id: I5c79882d43bcfea6c94944bed9bdddb76c516afd
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

6 files changed, 123 insertions, 115 deletions

diff --git a/doc/libxslt.xsa b/doc/libxslt.xsa
index edaec376..53748721 100644
--- a/doc/libxslt.xsa
+++ b/doc/libxslt.xsa
@@ -8,112 +8,92 @@
   </vendor>
   <product id="libxslt">
     <name>libxslt</name>
-    <version>1.1.29</version>
-    <last-release> May 24 2016</last-release>
+    <version>v1.1.30</version>
+    <last-release> Sep 04 2017</last-release>
     <info-url>http://xmlsoft.org/XSLT/</info-url>
-    <changes>   - Security:
-  CVE-2015-7995 Fix for type confusion in preprocessing attributes (Daniel Veillard)
-  
-   - Documentation:
+    <changes>   - Documentation:
+  Misc doc fixes (Nick Wellnhofer)
   
    - Portability:
-  Fix a portibility problem with previous commit (Eduard Sanou),
-  Fix MingW build (Nick Wellnhofer),
-  Correctly emulate snprintf on older MSVC versions (Nick Wellnhofer),
-  Add Python script to run some tests on Windows (Nick Wellnhofer),
-  Remove /OPT:NOWIN98 option (Nick Wellnhofer),
-  Visual Studio 14 CTP defines snprintf() (Daniel Veillard),
-  Use AC_PATH_TOOL to find libgcrypt-config and xml2-config (Micha¿ Górny),
-  Use $libdir for LIBXSLT_DEFAULT_PLUGINS_PATH (larryhaja),
-  Use mkdir macro also in case if mingw32. (Lars Kanis),
-  Add math library to executable link flags (Nick Wellnhofer),
-  Fix quoting of xlocale test program in configure.in (Nick Wellnhofer)
+  Look for libxml2 via pkg-config first (Elliott Sales de Andrade),
+  Change default SOPREFIX on Windows to "bin" (Nick Wellnhofer),
+  Add WIN32_EXTRA_LDFLAGS to tests/plugins/Makefile.am (Michael Haubenwallner)
   
    - Bug Fixes:
-  Fix OOB heap read in xsltExtModuleRegisterDynamic (Nick Wellnhofer),
-  Remove CDATA markup from libxslt_tutorial.c (Nick Wellnhofer),
-  Remove generated headers from dist tarball (Nick Wellnhofer),
-  Mark XML file argument as repeatable (Nick Wellnhofer),
-  Keep timezone in date:add (Nick Wellnhofer),
-  Fix buffer overflow in exsltDateFormat (Nick Wellnhofer),
-  Fix saxon:line-number with namespace nodes (Nick Wellnhofer),
-  Fix dyn:map with namespace nodes (Nick Wellnhofer),
-  Fix error handling in Saxon extension functions (Nick Wellnhofer),
-  Fix double free in libexslt hash functions (Nick Wellnhofer),
-  Fix libxslt format warnings (David Kilzer),
-  Fix xsltNumberFormatGetMultipleLevel (Nick Wellnhofer),
-  Fix use-after-free in xsltDocumentFunctionLoadDocument (Nick Wellnhofer),
-  Always initialize EXSLT month and day to 1 (Nick Wellnhofer),
-  Fix possible NULL pointer deref in transform.c (mahendra.n),
-  Fix possible NULL pointer deref in xsltCopyTextString (Nick Wellnhofer),
-  Fix possible NULL pointer deref in libexslt/functions.c (Nick Wellnhofer),
-  Fix possible NULL pointer deref in xsltproc.c (mahendra.n),
-  Fix possible NULL pointer deref in preproc.c (mahendra.n),
-  Fix LIBXSLT_DEFAULT_PLUGINS_PATH in xsltconfig.h (Nick Wellnhofer),
-  Fix memory leak in xsltNumberFormat (Albert Astals Cid),
-  Error in doc/Makefile.am (Brice De Bruyne),
-  Detect attribute sets recursions in more cases (Daniel Veillard),
-  Check name vales for attribute-set elements (Daniel Veillard),
-  Fix hang with namespace-alias, fixes #700689 (Shaun McCance),
-  Fix str:align with UTF-8 strings (Nick Wellnhofer),
-  Fix for compiled XPath helpers (Nick Wellnhofer),
-  Check return value of exsltFuncNewFunctionData (Nick Wellnhofer),
-  Fix return value of xsltRegisterExtModuleElement (Nick Wellnhofer),
-  Call xmlNodeGetSpacePreserve with element node (Nick Wellnhofer),
-  Set namespaces before evaluating xsl:number (Nick Wellnhofer),
-  Make --maxvars option work (Per Hedeland),
-  Set correct context node when initializing xsl:keys (Nick Wellnhofer),
-  Fix for bug 436589 (Imran Azeezullah),
-  Memory leak in xsltCompileIdKeyPattern error path (Nick Wellnhofer),
-  Fix handling of UTF-8 strings in EXSLT crypto module (Nick Wellnhofer),
-  Fix certain patterns with predicates (Nick Wellnhofer),
-  Fix direct pattern matching (Nick Wellnhofer),
-  Fix str:padding to work with UTF-8 strings (Nick Wellnhofer),
-  EXSLT function str:replace() is broken as-is (Nick Wellnhofer),
-  Fix a couple of places where (f)printf parameters were broken (Daniel Veillard)
+  Also fix memory hazards in exsltFuncResultElem (Nick Wellnhofer),
+  Fix NULL deref in xsltDefaultSortFunction (Nick Wellnhofer),
+  Fix memory hazards in exsltFuncFunctionFunction (Nick Wellnhofer),
+  Fix memory leaks in EXSLT error paths (Nick Wellnhofer),
+  Fix memory leak in str:concat with empty node-set (Nick Wellnhofer),
+  Fix memory leaks in error paths (Nick Wellnhofer),
+  Switch to xmlUTF8Strsize in numbers.c (Nick Wellnhofer),
+  Fix NULL pointer deref in xsltFormatNumberFunction (Nick Wellnhofer),
+  Fix UTF-8 check in str:padding (Nick Wellnhofer),
+  Fix xmlStrPrintf argument (Nick Wellnhofer),
+  Check for overflow in _exsltDateParseGYear (Nick Wellnhofer),
+  Fix double to int conversion (Nick Wellnhofer),
+  Check for overflow in exsltDateParseDuration (Nick Wellnhofer),
+  Change version of xsltMaxVars back to 1.0.24 (Nick Wellnhofer),
+  Disable xsltCopyTextString optimization for extensions (Nick Wellnhofer),
+  Create DOCTYPE for HTML version 5 (Nick Wellnhofer),
+  Make xsl:decimal-format work with namespaces (Nick Wellnhofer),
+  Remove norm:localTime extension function (Nick Wellnhofer),
+  Check for integer overflow in xsltAddTextString (Nick Wellnhofer),
+  Detect infinite recursion when evaluating function arguments (Nick Wellnhofer),
+  Fix memory leak in xsltElementAvailableFunction (Nick Wellnhofer),
+  Fix for pattern predicates calling functions (Nick Wellnhofer),
+  Fix cmd.exe invocations in Makefile.mingw (Nick Wellnhofer),
+  Don't try to install index.sgml (Nick Wellnhofer),
+  Fix symbols.xml (Nick Wellnhofer),
+  Fix heap overread in xsltFormatNumberConversion (Nick Wellnhofer),
+  Fix &lt;xsl:number level="any"/&gt; for non-element nodes (Nick Wellnhofer),
+  Fix unreachable code in xsltAddChild (mahendra.n),
+  Change version number in xsl:version warning (Nick Wellnhofer),
+  Avoid infinite recursion after failed param evaluation (Nick Wellnhofer),
+  Stop if potential recursion is detected (Nick Wellnhofer),
+  Consider built-in templates in apply-imports (Nick Wellnhofer),
+  Fix precedence with multiple attribute sets (Nick Wellnhofer),
+  Rework attribute set resolution (Nick Wellnhofer)
   
    - Improvements:
-  Add support timestamps from environment (Daniel Veillard),
-  Add missing tests to dist tarball (Nick Wellnhofer),
-  Improve error message in xsltAddTemplate and fix test (Nick Wellnhofer),
-  Allow REC tests with empty stdout (Nick Wellnhofer),
-  Fix GPL license in HTML files as well (Nick Wellnhofer),
-  Fix status message in EXSLT dynamic tests (Nick Wellnhofer),
-  Add public function macros to xsltlocale.h (Nick Wellnhofer),
-  Make valgrind tests work with libtool (Nick Wellnhofer),
-  Add a couple of xsl:number tests (Nick Wellnhofer),
-  Lower and upper bound for format token "i" (Nick Wellnhofer),
-  Lower bound for format token "a" (Nick Wellnhofer),
-  Handle negative xsl:number values (Nick Wellnhofer),
-  Round xsl:number values to nearest integer (Nick Wellnhofer),
-  Allow {URI}NCName syntax for user parameters (Nick Wellnhofer),
-  Fix endTimer parameter type (Nick Wellnhofer),
-  Fix error messages for unsupported methods (Nick Wellnhofer),
-  Replace sprintf with snprintf (David Kilzer),
-  Enforce two digit exponent under MSVC (Nick Wellnhofer),
-  Rework xsltNumberFormat to fix warning (Nick Wellnhofer),
-  Fix a couple of GPL licences found in the documentation (Daniel Veillard),
-  Use hash table to lookup named templates (Christian Ceelen),
-  Fix to reg tests post 737840 fix (Daniel Veillard),
-  Don't fail build the man page if xsltproc is not present (Daniel Veillard),
-  Re-adding xsltproc.1 (Daniel Veillard),
-  Fix time type in xsltSaveProfiling (Nick Wellnhofer),
-  Remove unused parameters (Nick Wellnhofer),
-  Suppress unused variable warning. (Nick Wellnhofer),
-  Remove unused variable in xsltGenerateIdFunction (Nick Wellnhofer),
-  Add test case for XPath function args in error case (Nick Wellnhofer),
-  Add comment about known-to-fail test (Nick Wellnhofer),
-  Adjust expected test output (Nick Wellnhofer),
-  Helper functions to evaluate compiled XPath expressions (Nick Wellnhofer),
-  Add tests for crypto:rc4 (Nick Wellnhofer),
-  Add first test case for EXSLT crypto module (Nick Wellnhofer),
-  Separate function for predicate matching in patterns (Nick Wellnhofer),
-  Initialize pseudo random number generator with current time or optional command line parameter (Nils Werner),
-  Adding doc update related to 1.1.28 (Daniel Veillard)
-  
-   - Cleanups:
-  Remove bogus test file (Nick Wellnhofer),
-  Add warning message to expected test output (Nick Wellnhofer)
+  Add .travis.yml (Nick Wellnhofer),
+  Silence tests a little (Nick Wellnhofer),
+  Set LIBXML_SRC to absolute path (Nick Wellnhofer),
+  Add missing #include (Nick Wellnhofer),
+  Adjust expected error messages in tests (Nick Wellnhofer),
+  Make xsltDebug more quiet (Nick Wellnhofer),
+  New-line terminate error message that missed this convention (Jan Pokorný),
+  Use xmlBuffers in EXSLT string functions (Nick Wellnhofer),
+  Switch to xmlUTF8Strsize in EXSLT string functions (Nick Wellnhofer),
+  Check for return value of xmlUTF8Strlen (Nick Wellnhofer),
+  Avoid double/long round trip in FORMAT_ITEM (Nick Wellnhofer),
+  Separate date and duration structs (Nick Wellnhofer),
+  Check for overflow in _exsltDateDifference (Nick Wellnhofer),
+  Clamp seconds field of durations (Nick Wellnhofer),
+  Change _exsltDateAddDurCalc parameter types (Nick Wellnhofer),
+  Fix date:difference with time zones (Nick Wellnhofer),
+  Rework division/remainder arithmetic in date.c (Nick Wellnhofer),
+  Remove exsltDateCastDateToNumber (Nick Wellnhofer),
+  Change internal representation of years (Nick Wellnhofer),
+  Optimize IS_LEAP (Nick Wellnhofer),
+  Link libraries with libm (Jussi Kukkonen),
+  Rename xsltCopyTreeInternal to xsltCopyTree (Nick Wellnhofer),
+  Update linker version script (Nick Wellnhofer),
+  Add local wildcard to version script (Nick Wellnhofer),
+  Make some symbols static (Nick Wellnhofer),
+  Remove redundant NULL check in xsltNumberComp (mahendra.n),
+  Fix forwards compatibility for imported stylesheets (Nick Wellnhofer),
+  Reduce warnings in forwards-compatible mode (Nick Wellnhofer),
+  Precompute XSLT elements after preprocessing (Nick Wellnhofer),
+  Fix whitespace in xsltParseStylesheetTop (Nick Wellnhofer),
+  Consolidate recursion checks (Nick Wellnhofer),
+  Treat XSLT_STATE_STOPPED same as errors (Nick Wellnhofer),
+  Make sure that XSLT_STATE_STOPPED isn't overwritten (Nick Wellnhofer),
+  Add comment regarding built-in templates and params (Nick Wellnhofer),
+  Rewrite memory management of local RVTs (Nick Wellnhofer),
+  Validate QNames of attribute sets (Nick Wellnhofer),
+  Add xsl:attribute-set regression tests (Nick Wellnhofer),
+  Ignore imported stylesheets in xsltApplyAttributeSet (Nick Wellnhofer)
   
 
 </changes>
diff --git a/doc/news.html b/doc/news.html
index 50768936..a1aa850c 100644
--- a/doc/news.html
+++ b/doc/news.html
@@ -9,7 +9,20 @@ H3 {font-family: Verdana,Arial,Helvetica}
 A:link, A:visited, A:active { text-decoration: underline }
     </style><title>News</title></head><body bgcolor="#8b7765" text="#000000" link="#a06060" vlink="#000000"><table border="0" width="100%" cellpadding="5" cellspacing="0" align="center"><tr><td width="120"><a href="http://swpat.ffii.org/"><img src="epatents.png" alt="Action against software patents" /></a></td><td width="180"><a href="http://www.gnome.org/"><img src="gnome2.png" alt="GNOME2 Logo" /></a><a href="http://www.w3.org/Status"><img src="w3c.png" alt="W3C logo" /></a><a href="http://www.redhat.com"><img src="redhat.gif" alt="Red Hat Logo" /></a><div align="left"><a href="http://xmlsoft.org/XSLT/"><img src="Libxslt-Logo-180x168.gif" alt="Made with Libxslt Logo" /></a></div></td><td><table border="0" width="90%" cellpadding="2" cellspacing="0" align="center" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3" bgcolor="#fffacd"><tr><td align="center"><h1>The XSLT C library for GNOME</h1><h2>News</h2></td></tr></table></td></tr></table></td></tr></table><table border="0" cellpadding="4" cellspacing="0" width="100%" align="center"><tr><td bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td valign="top" width="200" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Main Menu</b></center></td></tr><tr><td bgcolor="#fffacd"><form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><input name="query" type="text" size="20" value="" /><input name="submit" type="submit" value="Search ..." /></form><ul><li><a href="index.html">Home</a></li><li><a href="intro.html">Introduction</a></li><li><a href="docs.html">Documentation</a></li><li><a href="bugs.html">Reporting bugs and getting help</a></li><li><a href="help.html">How to help</a></li><li><a href="downloads.html">Downloads</a></li><li><a href="FAQ.html">FAQ</a></li><li><a href="news.html">News</a></li><li><a href="xsltproc2.html">The xsltproc tool</a></li><li><a href="docbook.html">DocBook</a></li><li><a href="API.html">The programming API</a></li><li><a href="python.html">Python and bindings</a></li><li><a href="internals.html">Library internals</a></li><li><a href="extensions.html">Writing extensions</a></li><li><a href="contribs.html">Contributions</a></li><li><a href="EXSLT/index.html" style="font-weight:bold">libexslt</a></li><li><a href="xslt.html">flat page</a>, <a href="site.xsl">stylesheet</a></li><li><a href="html/index.html" style="font-weight:bold">API Menu</a></li><li><a href="ChangeLog.html">ChangeLog</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Related links</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="tutorial/libxslttutorial.html">Tutorial</a>,
           <a href="tutorial2/libxslt_pipes.html">Tutorial2</a></li><li><a href="xsltproc.html">Man page for xsltproc</a></li><li><a href="http://mail.gnome.org/archives/xslt/">Mail archive</a></li><li><a href="http://xmlsoft.org/">XML libxml2</a></li><li><a href="ftp://xmlsoft.org/">FTP</a></li><li><a href="http://www.zlatkovic.com/projects/libxml/">Windows binaries</a></li><li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li><li><a href="http://www.explain.com.au/oss/libxml2xslt.html">MacOsX binaries</a></li><li><a href="http://bugzilla.gnome.org/buglist.cgi?product=libxslt">Bug Tracker</a></li><li><a href="http://codespeak.net/lxml/">lxml Python bindings</a></li><li><a href="http://cpan.uwinnipeg.ca/dist/XML-LibXSLT">Perl XSLT bindings</a></li><li><a href="http://www.zend.com/php5/articles/php5-xmlphp.php#Heading17">XSLT with PHP</a></li><li><a href="http://www.mod-xslt2.com/">Apache module</a></li><li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li><li><a href="http://xsldbg.sourceforge.net/">Xsldbg Debugger</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>API Indexes</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="APIchunk0.html">Alphabetic</a></li><li><a href="APIconstructors.html">Constructors</a></li><li><a href="APIfunctions.html">Functions/Types</a></li><li><a href="APIfiles.html">Modules</a></li><li><a href="APIsymbols.html">Symbols</a></li></ul></td></tr></table></td></tr></table></td><td valign="top" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%"><tr><td><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table border="0" cellpadding="3" cellspacing="1" width="100%"><tr><td bgcolor="#fffacd"><p>See the <a href="http://git.gnome.org/browse/libxslt/">git page</a>
-to get a description of the recent commits.</p><p>Those are the public releases made:</p><h3>v1.1.30: Sep 04 2017</h3><ul>
+to get a description of the recent commits.</p><p>Those are the public releases made:</p><h3>v1.1.31: Oct 06 2017</h3><ul>
+  <li>Portability:<br />
+  Fix win32/configure.js (Nick Wellnhofer)<br />
+  </li>
+
+  <li>Bug Fixes:<br />
+  Fix pkg-config related regressions in configure script (Nick Wellnhofer)<br />
+  </li>
+
+  <li>Improvements:<br />
+  Adjust expected error output for libxml2 changes (Nick Wellnhofer),<br />
+  Misc autoconf updates (Nick Wellnhofer)<br />
+  </li>
+</ul><h3>v1.1.30: Sep 04 2017</h3><ul>
   <li>Documentation:<br />
   Misc doc fixes (Nick Wellnhofer)<br />
   </li>
diff --git a/doc/xslt.html b/doc/xslt.html
index 805538ef..cbefaa25 100644
--- a/doc/xslt.html
+++ b/doc/xslt.html
@@ -304,6 +304,21 @@ to get a description of the recent commits.</p>
 
 <p>Those are the public releases made:</p>
 
+<h3>v1.1.31: Oct 06 2017</h3>
+<ul>
+  <li>Portability:<br/>
+  Fix win32/configure.js (Nick Wellnhofer)<br/>
+  </li>
+
+  <li>Bug Fixes:<br/>
+  Fix pkg-config related regressions in configure script (Nick Wellnhofer)<br/>
+  </li>
+
+  <li>Improvements:<br/>
+  Adjust expected error output for libxml2 changes (Nick Wellnhofer),<br/>
+  Misc autoconf updates (Nick Wellnhofer)<br/>
+  </li>
+</ul>
 <h3>v1.1.30: Sep 04 2017</h3>
 <ul>
   <li>Documentation:<br/>
diff --git a/libxslt.spec b/libxslt.spec
index 1aec1772..a20a4ade 100644
--- a/libxslt.spec
+++ b/libxslt.spec
@@ -1,10 +1,10 @@
 Summary: Library providing the GNOME XSLT engine
 Name: libxslt
 Version: 1.1.31
-Release: 0rc2%{?dist}%{?extra_release}
+Release: 1%{?dist}%{?extra_release}
 License: MIT
 Group: Development/Libraries
-Source: ftp://xmlsoft.org/XSLT/libxslt-%{version}-rc2.tar.gz
+Source: ftp://xmlsoft.org/XSLT/libxslt-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://xmlsoft.org/XSLT/
 Requires: libxml2 >= 2.6.27
@@ -129,5 +129,5 @@ rm -fr %{buildroot}
 %doc python/tests/*.xsl
 
 %changelog
-* Mon Oct  2 2017 Daniel Veillard <veillard@redhat.com>
+* Fri Oct  6 2017 Daniel Veillard <veillard@redhat.com>
 - upstream release 1.1.31 see http://xmlsoft.org/XSLT/news.html
diff --git a/libxslt.spec.in b/libxslt.spec.in
index d9ed76e4..96c0ca65 100644
--- a/libxslt.spec.in
+++ b/libxslt.spec.in
@@ -1,10 +1,10 @@
 Summary: Library providing the GNOME XSLT engine
 Name: libxslt
 Version: @VERSION@
-Release: 0rc2%{?dist}%{?extra_release}
+Release: 1%{?dist}%{?extra_release}
 License: MIT
 Group: Development/Libraries
-Source: ftp://xmlsoft.org/XSLT/libxslt-%{version}-rc2.tar.gz
+Source: ftp://xmlsoft.org/XSLT/libxslt-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://xmlsoft.org/XSLT/
 Requires: libxml2 >= @LIBXML_REQUIRED_VERSION@
diff --git a/win32/configure.js b/win32/configure.js
index 39745911..a8098132 100644
--- a/win32/configure.js
+++ b/win32/configure.js
@@ -19,7 +19,7 @@ var baseNameXslt = "libxslt";
 var baseNameExslt = "libexslt";
 /* Configure file which contains the version and the output file where
    we can store our build configuration. */
-var configFile = baseDir + "\\configure.in";
+var configFile = baseDir + "\\configure.ac";
 var versionFile = ".\\config.msvc";
 /* Input and output files regarding the lib(e)xml features. The second
    output file is there for the compatibility reasons, otherwise it
@@ -165,15 +165,15 @@ function discoverVersion()
 	while (cf.AtEndOfStream != true) {
 		ln = cf.ReadLine();
 		s = new String(ln);
-		if (s.search(/^LIBXSLT_MAJOR_VERSION=/) != -1) {
-			vf.WriteLine(s);
-			verMajorXslt = s.substring(s.indexOf("=") + 1, s.length)
-		} else if(s.search(/^LIBXSLT_MINOR_VERSION=/) != -1) {
-			vf.WriteLine(s);
-			verMinorXslt = s.substring(s.indexOf("=") + 1, s.length)
-		} else if(s.search(/^LIBXSLT_MICRO_VERSION=/) != -1) {
-			vf.WriteLine(s);
-			verMicroXslt = s.substring(s.indexOf("=") + 1, s.length)
+		if (m = s.match(/^m4_define\(\[MAJOR_VERSION\], \[(.*)\]\)/)) {
+			vf.WriteLine("LIBXSLT_MAJOR_VERSION=" + m[1]);
+			verMajorXslt = m[1];
+		} else if(m = s.match(/^m4_define\(\[MINOR_VERSION\], \[(.*)\]\)/)) {
+			vf.WriteLine("LIBXSLT_MINOR_VERSION=" + m[1]);
+			verMinorXslt = m[1];
+		} else if(m = s.match(/^m4_define\(\[MICRO_VERSION\], \[(.*)\]\)/)) {
+			vf.WriteLine("LIBXSLT_MICRO_VERSION=" + m[1]);
+			verMicroXslt = m[1];
 		} else if (s.search(/^LIBEXSLT_MAJOR_VERSION=/) != -1) {
 			vf.WriteLine(s);
 			verMajorExslt = s.substring(s.indexOf("=") + 1, s.length)