From 9a89a8ab80bc021deec9da7d79bda20995c4e78d Mon Sep 17 00:00:00 2001
From: Daniel Veillard <veillard@src.gnome.org>
Date: Wed, 27 Jun 2001 11:13:35 +0000
Subject: [PATCH] moved the symlinks detection within a CVS check, this is not
 portable and

* configure.in: moved the symlinks detection within a CVS
  check, this is not portable and will be removed soon.
* xpath.c: small cleanup/speedup
Daniel
---
 ChangeLog    |  6 ++++++
 configure.in | 31 ++++++++++++-------------------
 xpath.c      |  3 ++-
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 888afd76..00c4821c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Jun 27 13:09:51 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
+
+	* configure.in: moved the symlinks detection within a CVS
+	  check, this is not portable and will be removed soon.
+	* xpath.c: small cleanup/speedup
+
 Tue Jun 26 18:05:26 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
 
 	* configure.in doc/xml.html include/libxml/xmlwin32version.h:
diff --git a/configure.in b/configure.in
index 755db6dc..be062aec 100644
--- a/configure.in
+++ b/configure.in
@@ -429,29 +429,22 @@ AC_SUBST(M_LIBS)
 AC_SUBST(RDL_LIBS)
 
 dnl
-dnl cleanup any remaining symlinks if any for include/libxml
+dnl cleanup any remaining symlinks if any for include/libxml, this
+dnl is only needed for the people using CVS and transitionning
 dnl
-if test -L $srcdir/include/libxml
+if test -d $srcdir/include/CVS
 then
-    if test -d $srcdir/include/CVS
+    if test -L $srcdir/include/libxml
     then
-	rm -rf $srcdir/include/libxml
-	echo The CVS repository changed a bit
-	echo 'please run "cvs update -d" and rerun the configuration script'
-	exit 1
-    else
-        echo  $srcdir/include/libxml should not be a symlink anymore
-	exit 1
+	    rm -rf $srcdir/include/libxml
+	    echo The CVS repository changed a bit
+	    echo 'please run "cvs update -d" and rerun the configuration script'
+	    exit 1
+    fi
+    if test -e $srcdir/xmlversion.h
+    then
+	rm -f $srcdir/xmlversion.h
     fi
-fi
-if test -e $srcdir/xmlversion.h
-then
-    rm -f $srcdir/xmlversion.h
-fi
-if test ! -r libxml
-then
-    rm -rf libxml
-    ln -s $srcdir/include/libxml libxml
 fi
 
 AC_OUTPUT(libxml.spec Makefile include/Makefile include/libxml/Makefile doc/Makefile example/Makefile include/libxml/xmlversion.h include/libxml/xmlwin32version.h xml2-config libxml-2.0.pc xml2Conf.sh)
diff --git a/xpath.c b/xpath.c
index 8b8cb272..0741920a 100644
--- a/xpath.c
+++ b/xpath.c
@@ -5556,7 +5556,8 @@ xmlXPathParseNCName(xmlXPathParserContextPtr ctxt) {
 	while (((*in >= 0x61) && (*in <= 0x7A)) ||
 	       ((*in >= 0x41) && (*in <= 0x5A)) ||
 	       ((*in >= 0x30) && (*in <= 0x39)) ||
-	       (*in == '_'))
+	       (*in == '_') || (*in == '.') ||
+	       (*in == '-'))
 	    in++;
 	if ((*in == ' ') || (*in == '>') || (*in == '/') ||
             (*in == '[') || (*in == ']') || (*in == ':') ||