From 0ff8e6a43c35c632292c6d9bf8c28ec6a3fc16e0 Mon Sep 17 00:00:00 2001
From: herbelin
Date: Thu, 11 Oct 2007 13:10:21 +0000
Subject: Bug variable CAMLP4 qui ne doit pas contenir un chemin mais le type
 de preprocesseur

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@10214 85f007b7-540e-0410-9357-904b9bb8a0f7
---
 configure | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/configure b/configure
index a8891856d1..7962f27d8c 100755
--- a/configure
+++ b/configure
@@ -399,24 +399,24 @@ esac
 # Very basic for the moment: if camlp5 exists, we use it...
 
 if [ "$camlp5dir" != "" ]; then
-    CAMLP4=$camlp5dir
+    CAMLP4=camlp5
     CAMLP4LIB=$camlp5dir
     camlp4oexec=`echo $camlp4oexec | sed -e 's/4/5/'`
 elif [ "$CAMLTAG" = "OCAML310" ]; then
     if [ -x "${CAMLLIB}/camlp5" ]; then 
-	CAMLP4=camlp5
+        CAMLP4LIB=+camlp5
     elif [ -x "${CAMLLIB}/site-lib/camlp5" ]; then 
-	CAMLP4=site-lib/camlp5
+        CAMLP4LIB=+site-lib/camlp5
     else
 	echo "Objective Caml 3.10 found but no Camlp5 installed."
 	echo "Configuration script failed!"
 	exit 1
     fi
-    CAMLP4LIB=+$CAMLP4
+    CAMLP4=camlp5
     camlp4oexec=`echo $camlp4oexec | sed -e 's/4/5/'`
 else 
     CAMLP4=camlp4
-    CAMLP4LIB=+$CAMLP4
+    CAMLP4LIB=+camlp4
 fi
 
 if [ "$CAMLP4" = "camlp5" ] && `$camlp4oexec -v 2>&1 | grep -q 5.00`; then
-- 
cgit v1.2.3