From c063e58ecde978c3813ae7be3a06a0fdb7226f17 Mon Sep 17 00:00:00 2001
From: glondu
Date: Sat, 6 Sep 2008 13:06:44 +0000
Subject: Install dllcoqrun.so and use it by default

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@11371 85f007b7-540e-0410-9357-904b9bb8a0f7
---
 Makefile.build           | 1 +
 config/Makefile.template | 1 +
 configure                | 7 +++++--
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Makefile.build b/Makefile.build
index f6568e5b0f..99dfdd23ae 100644
--- a/Makefile.build
+++ b/Makefile.build
@@ -669,6 +669,7 @@ endif
 	# we install it with libraries
 	-$(MKDIR) -p $(FULLCOQLIB)/contrib/micromega
 	$(INSTALLBIN) $(CSDPCERT) $(FULLCOQLIB)/contrib/micromega
+	$(INSTALLBIN) $(DLLCOQRUN) $(FULLCOQLIB)
 
 install-library-light:
 	$(MKDIR) $(FULLCOQLIB)
diff --git a/config/Makefile.template b/config/Makefile.template
index e617d37932..e0e7bf0b03 100644
--- a/config/Makefile.template
+++ b/config/Makefile.template
@@ -23,6 +23,7 @@ LOCAL=LOCALINSTALLATION
 
 # Bytecode link flags for VM ("-custom" or "-dllib -lcoqrun")
 COQRUNBYTEFLAGS=XCOQRUNBYTEFLAGS
+BUILDLDPATH=
 
 # Paths for true installation
 # BINDIR=path where coqtop, coqc, coqmktop, coq-tex, coqdep, gallina and
diff --git a/configure b/configure
index e4148c7a41..b9f44b9b69 100755
--- a/configure
+++ b/configure
@@ -764,10 +764,12 @@ case $coqdocdir_spec/$prefix_spec/$local in
 	esac;;
 esac
 
+BUILDLDPATH="# you might want to set CAML_LD_LIBRARY_PATH by hand!"
 case $coqrunbyteflags_spec/$local in
     yes/*) COQRUNBYTEFLAGS="$coqrunbyteflags";;
-    */true) COQRUNBYTEFLAGS="-custom";;
-    *) COQRUNBYTEFLAGS="-custom";;
+    */true) COQRUNBYTEFLAGS="-dllib -lcoqrun -dllpath $COQTOP/kernel/byterun";;
+    *) COQRUNBYTEFLAGS="-dllib -lcoqrun -dllpath $LIBDIR"
+       BUILDLDPATH="export CAML_LD_LIBRARY_PATH=$COQTOP/kernel/byterun";;
 esac
 
 # case $emacs_spec in
@@ -932,6 +934,7 @@ sed -e "s|LOCALINSTALLATION|$local|" \
     -e "s|COQVERSION|$VERSION|" \
     -e "s|BINDIRDIRECTORY|$ESCBINDIR|" \
     -e "s|COQLIBDIRECTORY|$ESCLIBDIR|" \
+    -e "s|BUILDLDPATH=|$BUILDLDPATH|" \
     -e "s|MANDIRDIRECTORY|$ESCMANDIR|" \
     -e "s|DOCDIRDIRECTORY|$ESCDOCDIR|" \
     -e "s|EMACSLIBDIRECTORY|$ESCEMACSLIB|" \
-- 
cgit v1.2.3