diff options
author | Stephane Glondu <steph@glondu.net> | 2014-01-19 15:09:23 +0100 |
---|---|---|
committer | Stephane Glondu <steph@glondu.net> | 2014-01-19 15:09:23 +0100 |
commit | d2c5c5e616a6e118291fe1ce9965c731adac03a8 (patch) | |
tree | 7b000ad50dcc45ff1c63768a983cded1e23a07ca /configure | |
parent | db38bb4ad9aff74576d3b7f00028d48f0447d5bd (diff) |
Imported Upstream version 8.4pl3dfsgupstream/8.4pl3dfsg
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 38 |
1 files changed, 24 insertions, 14 deletions
@@ -6,7 +6,7 @@ # ################################## -VERSION=8.4pl2 +VERSION=8.4pl3 VOMAGIC=08400 STATEMAGIC=58400 DATE=`LC_ALL=C LANG=C date +"%B %Y"` @@ -332,10 +332,11 @@ fi MAKE=`which ${makecmd:-make}` if [ "$MAKE" != "" ]; then - MAKEVERSION=`$MAKE -v | head -1 | cut -d" " -f3` + # Beware of the final \r in Win32 + MAKEVERSION=`"$MAKE" -v | head -1 | tr -d "\r" | cut -d" " -f3` MAKEVERSIONMAJOR=`echo $MAKEVERSION | cut -d. -f1` MAKEVERSIONMINOR=`echo $MAKEVERSION | cut -d. -f2` - if [ "$MAKEVERSIONMAJOR" -eq 3 -a "$MAKEVERSIONMINOR" -ge 81 ]; then + if [ "$MAKEVERSIONMAJOR" -gt 3 -o "$MAKEVERSIONMAJOR" -eq 3 -a "$MAKEVERSIONMINOR" -ge 81 ]; then echo "You have GNU Make $MAKEVERSION. Good!" else OK="no" @@ -521,16 +522,23 @@ case $usecamlp5 in echo "Configuration script failed!" exit 1 fi - elif [ -f "${CAMLLIB}/camlp5/${CAMLP4MOD}.cma" ]; then - CAMLP4LIB=+camlp5 - FULLCAMLP4LIB=${CAMLLIB}/camlp5 - elif [ -f "${CAMLLIB}/site-lib/${CAMLP4MOD}.cma" ]; then + else + # Beware of the final \r in Win32 + camlp5dir="$(camlp5 -where | tr -d '\r')" + if [ "$camlp5dir" != "" ]; then + CAMLP4LIB=$camlp5dir + FULLCAMLP4LIB=$camlp5dir + elif [ -f "${CAMLLIB}/camlp5/${CAMLP4MOD}.cma" ]; then + CAMLP4LIB=+camlp5 + FULLCAMLP4LIB=${CAMLLIB}/camlp5 + elif [ -f "${CAMLLIB}/site-lib/${CAMLP4MOD}.cma" ]; then CAMLP4LIB=+site-lib/camlp5 FULLCAMLP4LIB=${CAMLLIB}/site-lib/camlp5 - else - echo "No Camlp5 installation found. Looking for Camlp4 instead..." - usecamlp5=no - fi + else + echo "No Camlp5 installation found. Looking for Camlp4 instead..." + usecamlp5=no + fi + fi esac # If we're (still...) going to use Camlp5, let's check its version @@ -623,7 +631,9 @@ if [ "$coqide_spec" = "yes" -a "$COQIDE" = "no" ]; then else case $lablgtkdir_spec in no) - if lablgtkdirtmp=$(ocamlfind query lablgtk2 2> /dev/null); then + # Beware of the final \r in Win32 + lablgtkdirtmp="$(ocamlfind query lablgtk2 2> /dev/null | tr -d '\r')" + if [ "$lablgtkdirtmp" != "" ]; then if [ -f "$lablgtkdirtmp/glib.cmi" -a -f "$lablgtkdirtmp/glib.mli" ]; then lablgtkdirfoundmsg="LabelGtk2 found by ocamlfind" lablgtkdir=$lablgtkdirtmp @@ -632,7 +642,7 @@ else echo "Headers missings in Lablgtk2 found by ocamlfind (glib.cmi/glib.mli not found)." fi fi - if [ "$lablgtkdir" = "" -a -f "${CAMLLIB}/lablgtk2/glib.mli" -a -f "${CAMLLIB}/glib.mli" ]; then + if [ "$lablgtkdir" = "" -a -f "${CAMLLIB}/lablgtk2/glib.cmi" -a -f "${CAMLLIB}/lablgtk2/glib.mli" ]; then lablgtkdirfoundmsg="LablGtk2 found in ocaml lib directory" lablgtkdir=${CAMLLIB}/lablgtk2 LABLGTKLIB=+lablgtk2 # Pour le message utilisateur @@ -887,7 +897,7 @@ case $coqrunbyteflags_spec/$local/$custom_spec/$CUSTOM_OS in */true/*/*) COQRUNBYTEFLAGS="-dllib -lcoqrun -dllpath '$COQTOP'/kernel/byterun";; *) COQRUNBYTEFLAGS="-dllib -lcoqrun -dllpath '$LIBDIR'" - BUILDLDPATH="export CAML_LD_LIBRARY_PATH='$COQTOP'/kernel/byterun";; + BUILDLDPATH="export CAML_LD_LIBRARY_PATH='$COQTOP'/kernel/byterun:$CAML_LD_LIBRARY_PATH";; esac case $coqtoolsbyteflags_spec/$custom_spec/$CUSTOM_OS in yes/*/*) COQTOOLSBYTEFLAGS="$coqtoolsbyteflags";; |