From 113b703a695acbe31ac6dd6a8c4aa94f6fda7545 Mon Sep 17 00:00:00 2001
From: Stephane Glondu <steph@glondu.net>
Date: Mon, 8 Sep 2008 00:15:04 +0200
Subject: Imported Upstream version 8.2~beta4.svn20080907+dfsg

---
 config/Makefile.template | 7 ++++++-
 config/coq_config.mli    | 4 +++-
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'config')

diff --git a/config/Makefile.template b/config/Makefile.template
index fc8af173..e0e7bf0b 100644
--- a/config/Makefile.template
+++ b/config/Makefile.template
@@ -21,6 +21,10 @@ COQ_CONFIGURED=yes
 # Local use (no installation)
 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
 #        do_Makefile will reside
@@ -28,7 +32,7 @@ LOCAL=LOCALINSTALLATION
 # MANDIR=path where to install manual pages
 # EMACSDIR=path where to put Coq's Emacs mode (coq.el)
 BINDIR="BINDIRDIRECTORY"
-COQLIB="COQLIBDIRECTORY"
+COQLIBINSTALL="COQLIBDIRECTORY"
 MANDIR="MANDIRDIRECTORY"
 DOCDIR="DOCDIRDIRECTORY"
 EMACSLIB="EMACSLIBDIRECTORY"
@@ -58,6 +62,7 @@ COQIDEINCLUDES=LABLGTKINCLUDES
 # Objective-Caml compile command 
 OCAML="OCAMLEXEC"
 OCAMLC="BYTECAMLC"
+OCAMLMKLIB="OCAMLMKLIBEXEC"
 OCAMLOPT="NATIVECAMLC"
 OCAMLDEP="OCAMLDEPEXEC"
 OCAMLDOC="OCAMLDOCEXEC"
diff --git a/config/coq_config.mli b/config/coq_config.mli
index 3898a0f3..af943509 100644
--- a/config/coq_config.mli
+++ b/config/coq_config.mli
@@ -6,7 +6,7 @@
 (*         *       GNU Lesser General Public License Version 2.1        *)
 (************************************************************************)
 
-(*i $Id: coq_config.mli 11313 2008-08-07 11:15:03Z barras $ i*)
+(*i $Id: coq_config.mli 11380 2008-09-07 12:27:27Z glondu $ i*)
 
 val local : bool        (* local use (no installation) *)
 
@@ -24,6 +24,8 @@ val camlp4lib : string  (* where is the library of Camlp4 *)
 val best : string       (* byte/opt *)
 val arch : string       (* architecture *)
 val osdeplibs : string  (* OS dependant link options for ocamlc *)
+val coqrunbyteflags : string (* -custom/-dllib -lcoqrun *)
+
 
 (* val defined : string list  (* options for lib/ocamlpp *) *)
 
-- 
cgit v1.2.3