From 18f28354b6ae01638a3dc751d81a8a7e22ace919 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?U-WIN-U2045GN0RNQ=5CV=C3=ADtor=20Santos=20Costa?=
 <Vítor Santos Costa@WIN-U2045GN0RNQ.(none)>
Date: Tue, 20 Jul 2010 14:33:33 +0100
Subject: [PATCH] more WIN32 compilation fixes.

---
 configure                   | 6 +++++-
 configure.in                | 6 +++++-
 packages/http/Makefile.in   | 2 +-
 packages/jpl                | 2 +-
 packages/semweb/Makefile.in | 2 +-
 packages/semweb/lock.h      | 2 +-
 6 files changed, 14 insertions(+), 6 deletions(-)
 mode change 100644 => 100755 packages/http/Makefile.in
 mode change 100644 => 100755 packages/semweb/Makefile.in
 mode change 100644 => 100755 packages/semweb/lock.h

diff --git a/configure b/configure
index 483ecc41e..096feb1c7 100755
--- a/configure
+++ b/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*)
diff --git a/configure.in b/configure.in
index bdb22151c..633aa7fb5 100755
--- a/configure.in
+++ b/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*)
diff --git a/packages/http/Makefile.in b/packages/http/Makefile.in
old mode 100644
new mode 100755
index e3e38d90c..eaea5d4e5
--- a/packages/http/Makefile.in
+++ b/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)
diff --git a/packages/jpl b/packages/jpl
index f95f831a3..5f1f23e5b 160000
--- a/packages/jpl
+++ b/packages/jpl
@@ -1 +1 @@
-Subproject commit f95f831a3885b53a3b8effd530b986e8cc63386b
+Subproject commit 5f1f23e5b57dfbf51f839ed3c9dd813fad2d2dd1
diff --git a/packages/semweb/Makefile.in b/packages/semweb/Makefile.in
old mode 100644
new mode 100755
index 6305dc52c..056d5bb73
--- a/packages/semweb/Makefile.in
+++ b/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)
diff --git a/packages/semweb/lock.h b/packages/semweb/lock.h
old mode 100644
new mode 100755
index f142f3e76..571c7d9d5
--- a/packages/semweb/lock.h
+++ b/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