applied another patch from Joel Reed still failing here but looking better

* configure.in libxslt/Makefile.am libxslt/xsltwin32config.h
  tests/Makefile.am tests/plugins/Makefile.am
  tests/plugins/testplugin.c: applied another patch from Joel Reed
  still failing here but looking better
Daniel

3 files changed, 44 insertions, 20 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 32e22e3c..7a13048e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 SUBDIRS=docs REC1 REC2 REC general namespaces keys numbers documents \
-        extensions reports xmlspec multiple XSLTMark docbook exslt
+        extensions reports xmlspec multiple XSLTMark docbook exslt plugins
 
 all:
 
@@ -12,7 +12,6 @@ all:
 # and (if errors are expected) in *.err
 test tests:
 	@(cur=`pwd` ; for dir in $(SUBDIRS) ; do cd $$dir ; $(MAKE) CHECKER='$(CHECKER)' tests ; cd $$cur ; done)
-	$(MAKE) plugin_tests
 
 valgrind:
 	@echo '## Running the regression tests under Valgrind'
@@ -24,15 +23,3 @@ full: tests docbook_tests
 docbook_tests:
 	@(cd docbook ; $(MAKE) full)
 
-if WITH_MODULES
-
-plugin_tests:
-	@echo Running the plugin tests...
-	@(cd plugins && LIBXSLT_PLUGINS_PATH=. $(top_builddir)/../xsltproc/xsltproc plugin.xsl plugin.xml)
-
-else
-
-plugin_tests:
-	@echo Skipping the plugin tests.
-
-endif
diff --git a/tests/plugins/Makefile.am b/tests/plugins/Makefile.am
new file mode 100644
index 00000000..82083fe3
--- /dev/null
+++ b/tests/plugins/Makefile.am
@@ -0,0 +1,37 @@
+## Process this file with automake to produce Makefile.in
+
+# somewhat unconventional pkglibdir, but noinst_LTLIBRARIES
+# never build DSOs (afaik). NOTE: must be defined outside the AM_CONDITIONAL
+pkglibdir=$(shell pwd)/plugin
+
+$(top_builddir)/xsltproc/xsltproc:
+	@(cd ../../../xsltproc ; $(MAKE) xsltproc)
+
+EXTRA_DIST = plugin.out	plugin.xml plugin.xsl
+
+all:
+
+if WITH_MODULES
+pkglib_LTLIBRARIES = xmlsoft_org_xslt_testplugin.la
+
+xmlsoft_org_xslt_testplugin_la_CFLAGS = -DMODULE_COMPILE $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS)
+xmlsoft_org_xslt_testplugin_la_SOURCES = testplugin.c
+xmlsoft_org_xslt_testplugin_la_LDFLAGS = -module -avoid-version $(LIBXML_LIBS) $(LIBXSLT_LIBS)
+
+test-logall:
+	@echo '## Running plugin tests'
+	@echo '##  Note: installing xmlsoft_org_xslt_testplugin.so'
+	@echo '##        to $(pkglibdir)'
+
+test tests: $(top_builddir)/xsltproc/xsltproc test-logall install-pkglibLTLIBRARIES
+	@LIBXSLT_PLUGINS_PATH=./plugin $(top_builddir)/xsltproc/xsltproc plugin.xsl plugin.xml > plugin.res
+	@diff plugin.out plugin.res
+	@rm plugin.res
+
+else
+
+test tests:
+	@echo Skipping the plugin tests.
+
+endif
+
diff --git a/tests/plugins/testplugin.c b/tests/plugins/testplugin.c
index ab840d95..f93943d7 100644
--- a/tests/plugins/testplugin.c
+++ b/tests/plugins/testplugin.c
@@ -10,7 +10,7 @@
  */
 
 #define IN_LIBXSLT
-#include "libxslt.h"
+#include <libxslt/libxslt.h>
 
 #ifdef WITH_MODULES
 
@@ -25,11 +25,11 @@
 #include <libxml/xpathInternals.h>
 #include <libxml/list.h>
 #include <libxml/xmlIO.h>
-#include "xslt.h"
-#include "xsltInternals.h"
-#include "xsltutils.h"
-#include "imports.h"
-#include "extensions.h"
+#include <libxslt/xslt.h>
+#include <libxslt/xsltInternals.h>
+#include <libxslt/xsltutils.h>
+#include <libxslt/imports.h>
+#include <libxslt/extensions.h>
 
 #define XSLT_TESTPLUGIN_URL "http://xmlsoft.org/xslt/testplugin"