diff options
| author |  herbelin <herbelin@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2000-11-11 13:00:02 +0000 |
|---|---|---|
| committer | herbelin <herbelin@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2000-11-11 13:00:02 +0000 |
| commit | 6c9a07a1d1618159780cf1f8fdb5a9785da55d68 (patch) | |
| tree | f9ad13fa46546d113adb20abfc6b2ae994783861 /configure | |
| parent | 4c389d1c425b5b0cc168b6071f2bbcdff80b7597 (diff) | |
Prise en compte camlp4.opt dans la configuration et le Makefile
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@844 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 18 |
1 files changed, 12 insertions, 6 deletions
@@ -23,6 +23,7 @@ done bytecamlc=ocamlc nativecamlc=ocamlopt +camlp4o=camlp4o coq_debug_flag= coq_profile_flag= best_compiler=opt @@ -80,6 +81,7 @@ while : ; do arch=$2 shift;; -opt|--opt) bytecamlc=ocamlc.opt + camlp4o=camlp4o.opt nativecamlc=ocamlopt.opt;; -byte-only|-byteonly|--byteonly|--byte-only) best_compiler=byte;; -debug|--debug) coq_debug_flag=-g;; @@ -297,18 +299,20 @@ CAMLLIB=`ocamlc -v | sed -n -e 's|.*directory:* *\(.*\)$|\1|p' ` # Camlp4 -CAMLP4=`which camlp4` +CAMLP4=`which $camlp4o` case $CAMLP4 in "") echo "camlp4 is not present in your path!" echo "Give me manually the path to the camlp4 executable [/usr/local/bin by default]: " read CAMLP4 case $CAMLP4 in - "") CAMLP4=/usr/local/bin/camlp4;; - */camlp4) true;; - */) CAMLP4=${CAMLP4}camlp4;; - *) CAMLP4=${CAMLP4}/camlp4;; - esac;; + "") CAMLP4=/usr/local/bin/camlp4o;; + */camlp4) CAMLP4=${CAMLP4}o;; + */camlp4o) true;; + */) CAMLP4=${CAMLP4}camlp4o;; + *) CAMLP4=${CAMLP4}/camlp4o;; + esac + camlp4o=$CAMLP4;; esac if test ! -f $CAMLP4 ; then @@ -394,6 +398,7 @@ case $ARCH in -e "s|CAMLBINDIRECTORY|$CAMLBIN|" \ -e "s|CAMLP4BINDIRECTORY|$CAMLP4BIN|" \ -e "s|CAMLP4LIBDIRECTORY|$CAMLP4LIB|" \ + -e "s|CAMLP4TOOL|$camlp4o|" \ -e "s|OSKIND|$OSTYPE|" \ -e "s|COQDEBUGFLAG|$coq_debug_flag|" \ -e "s|COQPROFILEFLAG|$coq_profile_flag|" \ @@ -419,6 +424,7 @@ case $ARCH in -e "s|CAMLBINDIRECTORY|$CAMLBIN|" \ -e "s|CAMLP4BINDIRECTORY|$CAMLP4BIN|" \ -e "s|CAMLP4LIBDIRECTORY|$CAMLP4LIB|" \ + -e "s|CAMLP4TOOL|$camlp4o|" \ -e "s|OSKIND|$OSTYPE|" \ -e "s|COQDEBUGFLAG|$coq_debug_flag|" \ -e "s|COQPROFILEFLAG|$coq_profile_flag|" \ |