more WIN32 compilation fixes.

configure

@@ -6245,7 +6245,11 @@ elif test -e "$srcdir"/packages/jpl/Makefile.in; then
 	JAVA_HOME="$yap_cv_java"
 	case "$target_os" in
 	    *cygwin*|*mingw*)
-	       JAVALIBPATH="\"$JAVA_HOME\"/lib/jvm.lib -lpthread"
+	       if test $threads = yes; then
+	         JAVALIBPATH="\"$JAVA_HOME\"/lib/jvm.lib -lpthread"
+               else
+	         JAVALIBPATH="\"$JAVA_HOME\"/lib/jvm.lib"
+               fi
 	       JAVAINCPATH="-I\"$JAVA_HOME\"/include -I\"$JAVA_HOME\"/include/win32"
 	       	  ;;
 	       *darwin*)

configure.in

@@ -724,7 +724,11 @@ elif test -e "$srcdir"/packages/jpl/Makefile.in; then
 	JAVA_HOME="$yap_cv_java"
 	case "$target_os" in
 	    *cygwin*|*mingw*)
-	       JAVALIBPATH="\"$JAVA_HOME\"/lib/jvm.lib -lpthread"
+	       if test $threads = yes; then
+	         JAVALIBPATH="\"$JAVA_HOME\"/lib/jvm.lib -lpthread"
+               else
+	         JAVALIBPATH="\"$JAVA_HOME\"/lib/jvm.lib"
+               fi
 	       JAVAINCPATH="-I\"$JAVA_HOME\"/include -I\"$JAVA_HOME\"/include/win32"
 	       	  ;;
 	       *darwin*)

packages/http/Makefile.in

@@ -37,7 +37,7 @@ SO=@SO@
 CWD=$(PWD)
 #
 
-LD=@DO_SECOND_LD@	@SHLIB_CXX_LD@
+LD=@DO_SECOND_LD@	@SHLIB_LD@
 LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@
 
 BINTARGET=$(DESTDIR)$(YAPLIBDIR)

packages/jpl

@@ -1 +1 @@
-Subproject commit f95f831a3885b53a3b8effd530b986e8cc63386b
+Subproject commit 5f1f23e5b57dfbf51f839ed3c9dd813fad2d2dd1

packages/semweb/Makefile.in

@@ -46,7 +46,7 @@ SO=@SO@
 CWD=$(PWD)
 #
 
-LD=@DO_SECOND_LD@	@SHLIB_CXX_LD@
+LD=@DO_SECOND_LD@	@SHLIB_LD@
 LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@
 
 BINTARGET=$(DESTDIR)$(YAPLIBDIR)

packages/semweb/lock.h

@@ -29,7 +29,7 @@
 #include <config.h>
 #endif
 
-#ifdef __WINDOWS__
+#if defined(__WINDOWS__) || defined(__MINGW32__)
 #include <windows.h>
 #if defined(_REENTRANT) && defined(__WINDOWS__)
 enum