From 1b17bd751601202687f28b95e38013418ac580b2 Mon Sep 17 00:00:00 2001
From: Jan Wielemaker <J.Wielemaker@cs.vu.nl>
Date: Fri, 24 Aug 2012 10:45:46 +0200
Subject: [PATCH] FIXED: Bug#48: libjpl.so must be linked against swipl.lib

---
 packages/Dialect.defs.in | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/Dialect.defs.in b/packages/Dialect.defs.in
index d569fff..cd65855 100644
--- a/packages/Dialect.defs.in
+++ b/packages/Dialect.defs.in
@@ -20,6 +20,8 @@
 #   * LIBPLSO
 #   Library to include for linking shared objects to the Prolog kernel.
 #   Added after the user files.
+#   * LIBPLEMBED
+#   Library containing the Prolog kernel.  Needed for embedding Prolog.
 
 PL=../swipl.sh
 PLBASE=@PLBASE@
@@ -45,10 +47,11 @@ DEFS=@DEFS@ -D__SWI_PROLOG__
 CFLAGS=$(COFLAGS) $(CWFLAGS) $(CMFLAGS) $(CIFLAGS) $(PKGCFLAGS) $(DEFS)
 CXXFLAGS=$(CFLAGS) -I../cpp
 
+LIBPLEMBED=@USEPLLIB@
 ifeq (@EXEFORMAT@,ELF)
 LIBPLSO=
 else
-LIBPLSO=-lswipl
+LIBPLSO=$(LIBPL)
 endif
 
 PLLDFLAGS=@LDFLAGS@ -L@abs_top_builddir@/../lib/$(PLARCH)
-- 
1.7.11.4

Submodule: packages/jpl
From fee8dd81b50c9f28852cbf7d882eedff9e342a9e Mon Sep 17 00:00:00 2001
From: Jan Wielemaker <J.Wielemaker@cs.vu.nl>
Date: Fri, 24 Aug 2012 10:46:59 +0200
Subject: [PATCH] FIXED: Bug#48: use new LIBPLEMBED from Dialect.in

---
 Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/jpl/Makefile.in b/packages/jpl/Makefile.in
index 06a14de..e44b6e2 100644
--- a/packages/jpl/Makefile.in
+++ b/packages/jpl/Makefile.in
@@ -34,7 +34,7 @@ OBJ=		src/c/jpl.o
 all:		$(TARGETS) jpl.jar exjava-compile jpl_doc
 
 $(LIBJPL):	$(OBJ)
-		$(LD) $(LDSOFLAGS) -o $@ $(OBJ) $(LIBS) $(JAVALIBS) $(LIBPLSO)
+		$(LD) $(LDSOFLAGS) -o $@ $(OBJ) $(LIBS) $(JAVALIBS) $(LIBPLEMBED)
 		if [ -r @LIBJPL@.dylib ]; then \
 		  rm -f @LIBJPL@.jnilib && ln -s @LIBJPL@.dylib @LIBJPL@.jnilib ; \
 		fi
-- 
1.7.11.4