From 4767d724d489a7ad67f696e9401e70b9f9ae2143 Mon Sep 17 00:00:00 2001
From: Samuel Mimram <smimram@debian.org>
Date: Mon, 15 Oct 2007 19:55:12 +0000
Subject: Imported Upstream version 8.1.pl2+dfsg

---
 config/Makefile.template | 14 ++++++++------
 config/coq_config.mli    |  3 ++-
 2 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'config')

diff --git a/config/Makefile.template b/config/Makefile.template
index 3ea7c7c9..1e611356 100644
--- a/config/Makefile.template
+++ b/config/Makefile.template
@@ -31,7 +31,7 @@ EMACSLIB="EMACSLIBDIRECTORY"
 EMACS=EMACSCOMMAND
 
 # Path to Coq distribution
-COQTOP=COQTOPDIRECTORY
+COQSRC=COQSRCDIRECTORY
 VERSION=COQVERSION
 
 # Directory containing Camlp4 binaries. Can be empty if camlp4 is in the PATH
@@ -48,6 +48,9 @@ CAMLP4O=CAMLP4TOOL
 CAMLP4COMPAT=CAMLP4COMPATFLAGS
 MYCAMLP4LIB="CAMLP4LIBDIRECTORY"
 
+# LablGTK
+COQIDEINCLUDES=LABLGTKINCLUDES
+
 # Objective-Caml compile command 
 OCAMLC="BYTECAMLC"
 OCAMLOPT="NATIVECAMLC"
@@ -62,7 +65,7 @@ CAMLOPTLINK="NATIVECAMLC"
 CAMLMKTOP="CAMLMKTOPEXEC"
 
 # Caml flags
-CAMLFLAGS=CAMLANNOTATEFLAG
+CAMLFLAGS=-rectypes CAMLANNOTATEFLAG
 
 # Compilation debug flag
 CAMLDEBUG=COQDEBUGFLAG
@@ -73,16 +76,15 @@ INLINEFLAG=COQINLINEFLAG
 # User compilation flag
 USERFLAGS=
 
+# Flags for GCC
+CFLAGS=CCOMPILEFLAGS
+
 # Compilation profile flag
 CAMLTIMEPROF=COQPROFILEFLAG
 
 # The best compiler: native (=opt) or bytecode (=byte) if no native compiler
 BEST=BESTCOMPILER
 
-# For Camlp4 use
-P4=$(COQTOP)/bin/$(ARCH)/call_camlp4 -I $(COQTOP)/src/parsing
-P4DEP=$(COQTOP)/bin/$(ARCH)/camlp4dep
-
 # Your architecture
 # Can be obtain by UNIX command arch
 ARCH=ARCHITECTURE
diff --git a/config/coq_config.mli b/config/coq_config.mli
index c214344e..bf77f0f3 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 9115 2006-09-01 13:47:00Z notin $ i*)
+(*i $Id: coq_config.mli 10185 2007-10-06 18:05:13Z herbelin $ i*)
 
 val local : bool        (* local use (no installation) *)
 
@@ -18,6 +18,7 @@ val coqtop : string     (* where are the sources *)
 val camldir : string    (* base directory of OCaml binaries *)
 val camllib : string    (* for Dynlink *)
 
+val camlp4 : string     (* exact name of camlp4: either "camlp4" ou "camlp5" *)
 val camlp4lib : string  (* where is the library of Camlp4 *)
 
 val best : string       (* byte/opt *)
-- 
cgit v1.2.3