Parametrize link flags for VM-dependent bytecode

 * Remove unneeded -custom flags.
 * Replace needed ones by a configure parameter. Setting it to "-dllib
   -lcoqrun" enables the creation/usage of pure bytecode executable
   provided the so/dll with the VM is found by ocamlrun.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@11363 85f007b7-540e-0410-9357-904b9bb8a0f7

1 files changed, 15 insertions, 0 deletions

diff --git a/configure b/configure
index dc1baaffa3..11f72d19f2 100755
--- a/configure
+++ b/configure
@@ -32,6 +32,8 @@ usage () {
     printf "\tSet installation directory to <dir>\n"
     echo "-local"
     printf "\tSet installation directory to the current source tree\n"
+    echo "-coqrunbyteflags"
+    printf "\tSet link flags for VM-dependent bytecode\n"
     echo "-src"
     printf "\tSpecifies the source directory\n"
     echo "-bindir"
@@ -105,6 +107,7 @@ ar_exec=ar
 ranlib_exec=ranlib
 
 local=false
+coqrunbyteflags_spec=no
 src_spec=no
 prefix_spec=no
 bindir_spec=no
@@ -138,6 +141,9 @@ while : ; do
                       prefix="$2"
 		      shift;;
     -local|--local) local=true;;
+    -coqrunbyteflags|--coqrunbyteflags) coqrunbyteflags_spec=yes
+                                        coqrunbyteflags="$2"
+                                        shift;;
     -src|--src) src_spec=yes
                 COQSRC="$2"
 	        shift;;
@@ -755,6 +761,12 @@ case $coqdocdir_spec/$prefix_spec/$local in
 	esac;;
 esac
 
+case $coqrunbyteflags_spec/$local in
+    yes/*) COQRUNBYTEFLAGS="$coqrunbyteflags";;
+    */true) COQRUNBYTEFLAGS="-custom";;
+    *) COQRUNBYTEFLAGS="-custom";;
+esac
+
 # case $emacs_spec in
 #     no) echo "Which Emacs command should I use to compile coq.el [$emacs_def] ?"
 #         read EMACS
@@ -775,6 +787,7 @@ echo "  Architecture                      : $ARCH"
 if test ! -z "$OS" ; then
   echo "  Operating system                  : $OS"
 fi
+echo "  Coq VM bytecode link flags        : $COQRUNBYTEFLAGS"
 echo "  OS dependent libraries            : $OSDEPLIBS"
 echo "  Objective-Caml/Camlp4 version     : $CAMLVERSION"
 echo "  Objective-Caml/Camlp4 binaries in : $CAMLBIN"
@@ -863,6 +876,7 @@ cat << END_OF_COQ_CONFIG > $mlconfig_file
 (* DO NOT EDIT THIS FILE: automatically generated by ../configure *)
 
 let local = $local
+let coqrunbyteflags = "$COQRUNBYTEFLAGS"
 let bindir = "$ESCBINDIR" 
 let coqlib = "$ESCLIBDIR"
 let coqtop = "$ESCCOQTOP"
@@ -910,6 +924,7 @@ chmod a-w "$mlconfig_file"
 rm -f "$COQSRC/config/Makefile"
 
 sed -e "s|LOCALINSTALLATION|$local|" \
+    -e "s|XCOQRUNBYTEFLAGS|$COQRUNBYTEFLAGS|" \
     -e "s|COQSRCDIRECTORY|$COQSRC|" \
     -e "s|COQVERSION|$VERSION|" \
     -e "s|BINDIRDIRECTORY|$ESCBINDIR|" \