diff --git a/ChangeLog b/ChangeLog
index 199249e0..57532d21 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Oct 16 11:25:15 CEST 2001 Daniel Veillard <daniel@veillard.com>
+
+	* xsltproc/Makefile.am configure.in config.h.in: trying to
+	  bypass libtool crazyness when compiling in my debug environment
+	* libxslt/templates.c: fix a compilation problem due to recent
+	  libxml changes
+
 Sun Oct 14 17:17:03 CEST 2001 Thomas Broyer <tbroyer@ltgt.net>
 
 	* libxslt/numbers.c tests/REC/test-7.7-4.out: implement initial
diff --git a/config.h.in b/config.h.in
index c780b664..948754c0 100644
--- a/config.h.in
+++ b/config.h.in
@@ -1,8 +1,5 @@
 /* config.h.in.  Generated automatically from configure.in by autoheader.  */
 
-/* Define if you need to in order for stat and other things to work.  */
-#undef _POSIX_SOURCE
-
 /* Define if you have the ANSI C header files.  */
 #undef STDC_HEADERS
 
diff --git a/configure.in b/configure.in
index 298a04e4..270ed1af 100644
--- a/configure.in
+++ b/configure.in
@@ -207,10 +207,14 @@ fi
 dnl
 dnl In build tree I use a static version with memory debug enabled
 dnl libtool 1.4 tries to use the shared lib and this won't work
+dnl libtool is a 5000+ line of perl module and hence absolutely pure crap
+dnl no surprise there.
 dnl
-dnl if test "${LOGNAME}" = "veillard" -a "`pwd`" = "/u/veillard/XSLT" ; then
-dnl     LIBXML_LIBS="./libxml2.a"
-dnl fi
+if test "${LOGNAME}" = "veillard" -a "`pwd`" = "/u/veillard/XSLT" ; then
+    LIBXML_LIBS="../../XML/.libs/libxml2.a -lz"
+    DV_LINK="1"
+fi
+AM_CONDITIONAL(DV_STATIC_LINK, test "${DV_LINK}" = "1")
 
 AC_SUBST(XML_CONFIG)
 AC_SUBST(LIBXML_LIBS)
@@ -225,7 +229,7 @@ case ${host} in
 esac
 
 XSLT_INCLUDEDIR='-I${includedir}'
-EXTRA_LIBS="$LIBXML_LIBS $M_LIBS"
+EXTRA_LIBS="$M_LIBS"
 XSLT_LIBS="-lxslt $LIBXML_LIBS $M_LIBS"
 
 AC_SUBST(XSLT_LIBDIR)
diff --git a/libxslt/templates.c b/libxslt/templates.c
index c86f982e..a5dccc9c 100644
--- a/libxslt/templates.c
+++ b/libxslt/templates.c
@@ -14,8 +14,9 @@
 #include <string.h>
 
 #include <libxml/xmlmemory.h>
-#include <libxml/tree.h>
+#include <libxml/globals.h>
 #include <libxml/xmlerror.h>
+#include <libxml/tree.h>
 #include <libxml/xpathInternals.h>
 #include <libxml/parserInternals.h>
 #include "xslt.h"
diff --git a/xsltproc/Makefile.am b/xsltproc/Makefile.am
index 89f0fdc8..e855f9ca 100644
--- a/xsltproc/Makefile.am
+++ b/xsltproc/Makefile.am
@@ -2,14 +2,27 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/libxslt -I$(top_srcdir)/libexslt \
            -I$(top_builddir) -I$(top_builddir)/libxslt \
 	   -I$(top_builddir)/libexslt $(LIBXML_CFLAGS) $(CFLAGS)
 
-bin_PROGRAMS = xsltproc
+if DV_STATIC_LINK
+#
+# Try to bypass the braindead libtool processing of shared libs
+#
+all: xsltproc
 
-DEPS = $(top_builddir)/libxslt/libxslt.la $(top_builddir)/libexslt/libexslt.la
-LDADDS = -L. $(top_builddir)/libxslt/libxslt.la \
-             $(top_builddir)/libexslt/libexslt.la $(EXTRA_LIBS)
+xsltproc: xsltproc.o ../libxslt/.libs/libxslt.a ../libexslt/.libs/libexslt.a ../../XML/.libs/libxml2.a
+	gcc -g -O -o xsltproc  xsltproc.o ../libxslt/.libs/libxslt.a ../libexslt/.libs/libexslt.a ../../XML/.libs/libxml2.a -lz -lm
+
+programs=
+else
+programs=xsltproc
+endif
+
+bin_PROGRAMS = $(programs)
 
 xsltproc_SOURCES = xsltproc.c
 xsltproc_LDFLAGS =
 xsltproc_DEPENDENCIES = $(DEPS)
 xsltproc_LDADD = $(LDADDS)
 
+DEPS = $(top_builddir)/libxslt/libxslt.la $(top_builddir)/libexslt/libexslt.la
+LDADDS = $(top_builddir)/libxslt/libxslt.la \
+         $(top_builddir)/libexslt/libexslt.la @LIBXML_LIBS@ $(EXTRA_LIBS)