diff options
author | regisgia <regisgia@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2013-09-02 09:20:57 +0000 |
---|---|---|
committer | regisgia <regisgia@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2013-09-02 09:20:57 +0000 |
commit | 3ea0f070e68af32a696a859b3c863dbd2d4f8a4f (patch) | |
tree | 9e8b558c3960bab0c8975335a3a84ef7fe603a53 /configure | |
parent | 18c3b336781e2c248a44ff9209cb8bf7eb5f38a3 (diff) |
* configure: Remove trailing space.
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@16753 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 512 |
1 files changed, 256 insertions, 256 deletions
@@ -3,7 +3,7 @@ ################################## # # Configuration script for Coq -# +# ################################## VERSION=trunk @@ -18,11 +18,11 @@ test -d bin || mkdir bin which () { IFS=":" # set words separator in PATH to be ':' (it allows spaces in dirnames) for i in $PATH; do - if test -z "$i"; then i=.; fi + if test -z "$i"; then i=.; fi if [ -f "$i/$1" ] ; then - IFS=" " + IFS=" " echo "$i/$1" - break + break fi done } @@ -152,10 +152,10 @@ while : ; do case "$1" in "") break;; -help|--help) usage - exit;; + exit;; -prefix|--prefix) prefix_spec=yes prefix="$2" - shift;; + shift;; -local|--local) local=true;; -coqrunbyteflags|--coqrunbyteflags) coqrunbyteflags_spec=yes coqrunbyteflags="$2" @@ -166,96 +166,96 @@ while : ; do -custom|--custom) custom_spec=yes;; -bindir|--bindir) bindir_spec=yes bindir="$2" - shift;; + shift;; -libdir|--libdir) libdir_spec=yes libdir="$2" - shift;; + shift;; -configdir|--configdir) configdir_spec=yes configdir="$2" - shift;; + shift;; -datadir|--datadir) datadir_spec=yes datadir="$2" - shift;; + shift;; -mandir|--mandir) mandir_spec=yes mandir="$2" - shift;; + shift;; -docdir|--docdir) docdir_spec=yes docdir="$2" - shift;; + shift;; -emacslib|--emacslib) emacslib_spec=yes emacslib="$2" - shift;; + shift;; -emacs |--emacs) emacs_spec=yes - emacs="$2" + emacs="$2" printf "Warning: obsolete -emacs option\n" - shift;; + shift;; -coqdocdir|--coqdocdir) coqdocdir_spec=yes - coqdocdir="$2" - shift;; + coqdocdir="$2" + shift;; -camldir|--camldir) camldir_spec=yes - camldir="$2" - shift;; + camldir="$2" + shift;; -lablgtkdir|--lablgtkdir) lablgtkdir_spec=yes - lablgtkdir="$2" - shift;; + lablgtkdir="$2" + shift;; -usecamlp5|--usecamlp5) - usecamlp5=yes;; + usecamlp5=yes;; -usecamlp4|--usecamlp4) - usecamlp5=no;; + usecamlp5=no;; -camlp5dir|--camlp5dir) usecamlp5=yes - camlp5dir="$2" - shift;; + camlp5dir="$2" + shift;; -arch|--arch) arch_spec=yes arch=$2 - shift;; + shift;; -opt|--opt) bytecamlc=ocamlc.opt camlp4oexec=camlp4o # can't add .opt since dyn load'll be required nativecamlc=ocamlopt.opt;; -natdynlink|--natdynlink) case "$2" in - yes) natdynlink=yes;; + yes) natdynlink=yes;; *) natdynlink=no esac shift;; -coqide|--coqide) coqide_spec=yes - case "$2" in - byte|opt) COQIDE=$2;; - *) COQIDE=no - esac - shift;; + case "$2" in + byte|opt) COQIDE=$2;; + *) COQIDE=no + esac + shift;; -nomacintegration) nomacintegration_spec=yes - shift;; + shift;; -browser|--browser) browser_spec=yes - BROWSER=$2 - shift;; + BROWSER=$2 + shift;; -coqwebsite|--coqwebsite) wwwcoq_spec=yes WWWCOQ=$2 shift;; -nodoc|--nodoc) with_doc_spec=yes with_doc=no;; -with-doc|--with-doc) with_doc_spec=yes - case "$2" in - yes|all) with_doc=all;; - *) with_doc=no - esac - shift;; - -with-geoproof|--with-geoproof) - case "$2" in - yes) with_geoproof=true;; - no) with_geoproof=false;; - esac - shift;; + case "$2" in + yes|all) with_doc=all;; + *) with_doc=no + esac + shift;; + -with-geoproof|--with-geoproof) + case "$2" in + yes) with_geoproof=true;; + no) with_geoproof=false;; + esac + shift;; -makecmd|--makecmd) makecmd="$2" - shift;; + shift;; -byte-only|-byteonly|--byteonly|--byte-only) best_compiler=byte;; -debug|--debug) coq_debug_flag=-g;; -profile|--profile) coq_profile_flag=-p;; -annotate|--annotate) coq_annotate_flag=-dtypes;; -typerex|--typerex) coq_typerex_wrapper=$default_typerex_wrapper;; -no-native-compiler|--no-native-compiler) no_native_compiler=true;; - -force-caml-version|--force-caml-version|-force-ocaml-version|--force-ocaml-version) + -force-caml-version|--force-caml-version|-force-ocaml-version|--force-ocaml-version) force_caml_version_spec=yes - force_caml_version=yes;; + force_caml_version=yes;; *) echo "Unknown option \"$1\"." 1>&2; usage; exit 2;; esac shift @@ -272,38 +272,38 @@ DATEPGM=`which date` case $DATEPGM in "") echo "I can't find the program \"date\" in your path." echo "Please give me the current date" - read COMPILEDATE;; + read COMPILEDATE;; *) COMPILEDATE=`LC_ALL=C LANG=C date +"%b %d %Y %H:%M:%S"`;; esac # Architecture case $arch_spec in - no) + no) # First we test if we are running a Cygwin or Mingw/Msys system if [ `uname -s | cut -c -6` = "CYGWIN" ] ; then - ARCH="win32" - CYGWIN=yes + ARCH="win32" + CYGWIN=yes elif [ `uname -s | cut -c -7` = "MINGW32" ]; then - ARCH="win32" + ARCH="win32" else - # If not, we determine the architecture - if test -x /bin/uname ; then - ARCH=`/bin/uname -s` - elif test -x /usr/bin/uname ; then - ARCH=`/usr/bin/uname -s` - elif test -x /bin/arch ; then - ARCH=`/bin/arch` - elif test -x /usr/bin/arch ; then - ARCH=`/usr/bin/arch` - elif test -x /usr/ucb/arch ; then - ARCH=`/usr/ucb/arch` - else - echo "I can not automatically find the name of your architecture." - printf "%s"\ - "Give me a name, please [win32 for Win95, Win98 or WinNT]: " - read ARCH - fi + # If not, we determine the architecture + if test -x /bin/uname ; then + ARCH=`/bin/uname -s` + elif test -x /usr/bin/uname ; then + ARCH=`/usr/bin/uname -s` + elif test -x /bin/arch ; then + ARCH=`/bin/arch` + elif test -x /usr/bin/arch ; then + ARCH=`/usr/bin/arch` + elif test -x /usr/ucb/arch ; then + ARCH=`/usr/ucb/arch` + else + echo "I can not automatically find the name of your architecture." + printf "%s"\ + "Give me a name, please [win32 for Win95, Win98 or WinNT]: " + read ARCH + fi fi;; yes) ARCH=$arch esac @@ -322,7 +322,7 @@ esac # Is the source tree checked out from a recognised # version control system ? -if test -e .svn/entries ; then +if test -e .svn/entries ; then checkedout=svn elif [ -d '{arch}' ]; then checkedout=gnuarch @@ -346,23 +346,23 @@ if [ "$MAKE" != "" ]; then #Extra support for local installation of make 3.81 #will be useless when make >= 3.81 will be standard if [ -x ./make ]; then - MAKEVERSION=`./make -v | head -1` - if [ "$MAKEVERSION" = "GNU Make 3.81" ]; then OK="yes"; fi + MAKEVERSION=`./make -v | head -1` + if [ "$MAKEVERSION" = "GNU Make 3.81" ]; then OK="yes"; fi fi if [ $OK = "no" ]; then - echo "GNU Make >= 3.81 is needed." - echo "Make 3.81 can be downloaded from ftp://ftp.gnu.org/gnu/make/make-3.81.tar.gz" - echo "then locally installed on a Unix-style system by issuing:" - echo " tar xzvf make-3.81.tar.gz" - echo " cd make-3.81" + echo "GNU Make >= 3.81 is needed." + echo "Make 3.81 can be downloaded from ftp://ftp.gnu.org/gnu/make/make-3.81.tar.gz" + echo "then locally installed on a Unix-style system by issuing:" + echo " tar xzvf make-3.81.tar.gz" + echo " cd make-3.81" echo " ./configure" echo " make" echo " mv make .." - echo " cd .." - echo "Restart then the configure script and later use ./make instead of make." - exit 1 + echo " cd .." + echo "Restart then the configure script and later use ./make instead of make." + exit 1 else - echo "You have locally installed GNU Make 3.81. Good!" + echo "You have locally installed GNU Make 3.81. Good!" fi fi else @@ -374,7 +374,7 @@ fi if [ "$browser_spec" = "no" ]; then case $ARCH in win32) BROWSER='start %s' ;; - Darwin) BROWSER='open %s' ;; + Darwin) BROWSER='open %s' ;; *) BROWSER='firefox -remote "OpenURL(%s,new-tab)" || firefox %s &' ;; esac fi @@ -388,31 +388,31 @@ fi case $camldir_spec in no) CAMLC=`which $bytecamlc` - case "$CAMLC" in - "") echo "$bytecamlc is not present in your path!" - echo "Give me manually the path to the $bytecamlc executable [/usr/local/bin by default]: " - read CAMLC - - case "$CAMLC" in - "") CAMLC=/usr/local/bin/$bytecamlc;; - */ocamlc|*/ocamlc.opt) true;; - */) CAMLC="${CAMLC}"$bytecamlc;; - *) CAMLC="${CAMLC}"/$bytecamlc;; - esac - esac - CAMLBIN=`dirname "$CAMLC"`;; + case "$CAMLC" in + "") echo "$bytecamlc is not present in your path!" + echo "Give me manually the path to the $bytecamlc executable [/usr/local/bin by default]: " + read CAMLC + + case "$CAMLC" in + "") CAMLC=/usr/local/bin/$bytecamlc;; + */ocamlc|*/ocamlc.opt) true;; + */) CAMLC="${CAMLC}"$bytecamlc;; + *) CAMLC="${CAMLC}"/$bytecamlc;; + esac + esac + CAMLBIN=`dirname "$CAMLC"`;; yes) CAMLC=$camldir/$bytecamlc - + CAMLBIN=`dirname "$CAMLC"` - bytecamlc="$CAMLC" - nativecamlc=$CAMLBIN/$nativecamlc - ocamlexec=$CAMLBIN/ocaml - ocamldepexec=$CAMLBIN/ocamldep - ocamldocexec=$CAMLBIN/ocamldoc - ocamllexexec=$CAMLBIN/ocamllex - ocamlyaccexec=$CAMLBIN/ocamlyacc - ocamlmklibexec=$CAMLBIN/ocamlmklib - camlp4oexec=$CAMLBIN/camlp4o + bytecamlc="$CAMLC" + nativecamlc=$CAMLBIN/$nativecamlc + ocamlexec=$CAMLBIN/ocaml + ocamldepexec=$CAMLBIN/ocamldep + ocamldocexec=$CAMLBIN/ocamldoc + ocamllexexec=$CAMLBIN/ocamllex + ocamlyaccexec=$CAMLBIN/ocamlyacc + ocamlmklibexec=$CAMLBIN/ocamlmklib + camlp4oexec=$CAMLBIN/camlp4o esac if test ! -f "$CAMLC" ; then @@ -426,9 +426,9 @@ fi mk_win_path () { case $ARCH,$CYGWIN in - win32,yes) cygpath -m "$1" ;; - win32*) "$ocamlexec" "tools/mingwpath.ml" "$1" ;; - *) echo "$1" ;; + win32,yes) cygpath -m "$1" ;; + win32*) "$ocamlexec" "tools/mingwpath.ml" "$1" ;; + *) echo "$1" ;; esac } @@ -442,22 +442,22 @@ CAMLLIB=`"$CAMLC" -where | tr -d "\r"` case $CAMLVERSION in 1.*|2.*|3.0*|3.10*|3.11.[01]) - echo "Your version of Objective-Caml is $CAMLVERSION." - if [ "$force_caml_version" = "yes" ]; then - echo "*Warning* You are compiling Coq with an outdated version of Objective-Caml." - else - echo " You need Objective-Caml 3.11.2 or later." - echo " Configuration script failed!" - exit 1 - fi;; + echo "Your version of Objective-Caml is $CAMLVERSION." + if [ "$force_caml_version" = "yes" ]; then + echo "*Warning* You are compiling Coq with an outdated version of Objective-Caml." + else + echo " You need Objective-Caml 3.11.2 or later." + echo " Configuration script failed!" + exit 1 + fi;; 3.11.2|3.12*|4.*) - CAMLP4COMPAT="-loc loc" - echo "You have Objective-Caml $CAMLVERSION. Good!";; + CAMLP4COMPAT="-loc loc" + echo "You have Objective-Caml $CAMLVERSION. Good!";; *) - echo "I found the Objective-Caml compiler but cannot find its version number!" - echo "Is it installed properly?" - echo "Configuration script failed!" - exit 1;; + echo "I found the Objective-Caml compiler but cannot find its version number!" + echo "Is it installed properly?" + echo "Configuration script failed!" + exit 1;; esac CAMLTAG=OCAML`echo $CAMLVERSION | sed -e "s/\([1-9]\)\.\([0-9]*\).*/\1\2/g"` @@ -484,23 +484,23 @@ case $usecamlp5 in CAMLP4=camlp5 CAMLP4MOD=gramlib if [ "$camlp5dir" != "" ]; then - if [ -f "$camlp5dir/${CAMLP4MOD}.cma" ]; then - CAMLP4LIB=$camlp5dir - FULLCAMLP4LIB=$camlp5dir - else - echo "Cannot find camlp5 libraries in $camlp5dir (camlp5.cma not found)." - echo "Configuration script failed!" - exit 1 - fi + if [ -f "$camlp5dir/${CAMLP4MOD}.cma" ]; then + CAMLP4LIB=$camlp5dir + FULLCAMLP4LIB=$camlp5dir + else + echo "Cannot find camlp5 libraries in $camlp5dir (camlp5.cma not found)." + echo "Configuration script failed!" + exit 1 + fi elif [ -f "${CAMLLIB}/camlp5/${CAMLP4MOD}.cma" ]; then CAMLP4LIB=+camlp5 - FULLCAMLP4LIB=${CAMLLIB}/camlp5 + FULLCAMLP4LIB=${CAMLLIB}/camlp5 elif [ -f "${CAMLLIB}/site-lib/${CAMLP4MOD}.cma" ]; then CAMLP4LIB=+site-lib/camlp5 - FULLCAMLP4LIB=${CAMLLIB}/site-lib/camlp5 + FULLCAMLP4LIB=${CAMLLIB}/site-lib/camlp5 else - echo "No Camlp5 installation found. Looking for Camlp4 instead..." - usecamlp5=no + echo "No Camlp5 installation found. Looking for Camlp4 instead..." + usecamlp5=no fi esac @@ -510,10 +510,10 @@ case $usecamlp5 in yes) camlp4oexec=`echo "$camlp4oexec" | tr 4 5` case `"$camlp4oexec" -v 2>&1` in - *"version 4.0"*|*5.00*) - echo "Camlp5 version < 5.01 not supported." - echo "Configuration script failed!" - exit 1;; + *"version 4.0"*|*5.00*) + echo "Camlp5 version < 5.01 not supported." + echo "Configuration script failed!" + exit 1;; esac esac @@ -528,16 +528,16 @@ case $usecamlp5 in FULLCAMLP4LIB=${CAMLLIB}/camlp4 if [ ! -f "${FULLCAMLP4LIB}/${CAMLP4MOD}.cma" ]; then - echo "No Camlp4 installation found." - echo "Configuration script failed!" - exit 1 + echo "No Camlp4 installation found." + echo "Configuration script failed!" + exit 1 fi camlp4oexec=${camlp4oexec}rf if [ "`"$camlp4oexec" 2>&1`" != "" ]; then - echo "Error: $camlp4oexec not found or not executable." - echo "Configuration script failed!" - exit 1 + echo "Error: $camlp4oexec not found or not executable." + echo "Configuration script failed!" + exit 1 fi esac @@ -547,19 +547,19 @@ if [ "$best_compiler" = "opt" ] ; then if test -e "$nativecamlc" || test -e "`which $nativecamlc`"; then CAMLOPTVERSION=`"$nativecamlc" -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' ` if [ ! -f "${FULLCAMLP4LIB}/${CAMLP4MOD}.cmxa" ]; then - best_compiler=byte - echo "Cannot find native-code $CAMLP4," - echo "only the bytecode version of Coq will be available." + best_compiler=byte + echo "Cannot find native-code $CAMLP4," + echo "only the bytecode version of Coq will be available." elif [ ! -f "$CAMLLIB"/dynlink.cmxa ]; then - best_compiler=byte - echo "Cannot find native-code dynlink library," - echo "only the bytecode version of Coq will be available." - echo "For building a native-code Coq, you may try to first" + best_compiler=byte + echo "Cannot find native-code dynlink library," + echo "only the bytecode version of Coq will be available." + echo "For building a native-code Coq, you may try to first" echo "compile and install a dummy dynlink.cmxa (see dev/dynlink.ml)" echo "and then run ./configure -natdynlink no" else if [ "$CAMLOPTVERSION" != "$CAMLVERSION" ] ; then - echo "Native and bytecode compilers do not have the same version!" + echo "Native and bytecode compilers do not have the same version!" fi echo "You have native-code compilation. Good!" fi @@ -589,10 +589,10 @@ case $HASNATDYNLINK,$ARCH,`uname -r`,$CAMLVERSION in NATDYNLINKFLAG=os5fixme;; true,Darwin,10.*,3.11.*) if [ `getconf LONG_BIT` = "32" ]; then - # Still a problem for x86_32 + # Still a problem for x86_32 NATDYNLINKFLAG=os5fixme else - # Not a problem for x86_64 + # Not a problem for x86_64 NATDYNLINKFLAG=$HASNATDYNLINK fi;; *) @@ -604,10 +604,10 @@ esac OSDEPLIBS="-cclib -lunix" case $ARCH in sun4*) OS=`uname -r` - case $OS in - 5*) OS="Sun Solaris $OS" - OSDEPLIBS="$OSDEPLIBS -cclib -lnsl -cclib -lsocket";; - *) OS="Sun OS $OS" + case $OS in + 5*) OS="Sun Solaris $OS" + OSDEPLIBS="$OSDEPLIBS -cclib -lnsl -cclib -lsocket";; + *) OS="Sun OS $OS" esac;; esac @@ -619,23 +619,23 @@ IDEARCHDEF=X11 # -byte-only should imply -coqide byte, unless the user decides otherwise -if [ "$best_compiler" = "byte" -a "$coqide_spec" = "no" ]; then +if [ "$best_compiler" = "byte" -a "$coqide_spec" = "no" ]; then coqide_spec=yes COQIDE=byte fi # Which coqide is asked ? which one is possible ? -if [ "$coqide_spec" = "yes" -a "$COQIDE" = "no" ]; then +if [ "$coqide_spec" = "yes" -a "$COQIDE" = "no" ]; then echo "CoqIde disabled as requested." else case $lablgtkdir_spec in - no) + no) if lablgtkdirtmp=$(ocamlfind query lablgtk2.sourceview2 2> /dev/null); then if [ ! -f "$lablgtkdirtmp/gSourceView2.cmi" ]; then - echo "Incomplete Lablgtk2 found by ocamlfind (gSourceView.cmi not found)." + echo "Incomplete Lablgtk2 found by ocamlfind (gSourceView.cmi not found)." elif [ ! -f "$lablgtkdirtmp/glib.mli" ]; then - echo "Incomplete Lablgtk2 found by ocamlfind (glib.mli not found)." + echo "Incomplete Lablgtk2 found by ocamlfind (glib.mli not found)." else lablgtkdirfoundmsg="LabelGtk2 found by ocamlfind" lablgtkdir=$lablgtkdirtmp @@ -643,54 +643,54 @@ else fi fi if [ "$lablgtkdir" = "" -a -f "${CAMLLIB}/lablgtk2/gSourceView2.cmi" -a -f "${CAMLLIB}/lablgtk2/glib.mli" ]; then - lablgtkdirfoundmsg="LablGtk2 found in ocaml lib directory" - lablgtkdir=${CAMLLIB}/lablgtk2 + lablgtkdirfoundmsg="LablGtk2 found in ocaml lib directory" + lablgtkdir=${CAMLLIB}/lablgtk2 LABLGTKLIB=+lablgtk2 # Pour le message utilisateur - fi;; - yes) - if [ ! -d "$lablgtkdir" ]; then + fi;; + yes) + if [ ! -d "$lablgtkdir" ]; then echo "$lablgtkdir is not a valid directory." - echo "Configuration script failed!" - exit 1 - elif [ ! -f "$lablgtkdir/gSourceView2.cmi" ]; then - echo "Incomplete LablGtk2 library (gSourceView2.cmi not found)." - echo "Make sure that the GtkSourceView bindings are available." - echo "Configuration script failed!" - exit 1 + echo "Configuration script failed!" + exit 1 + elif [ ! -f "$lablgtkdir/gSourceView2.cmi" ]; then + echo "Incomplete LablGtk2 library (gSourceView2.cmi not found)." + echo "Make sure that the GtkSourceView bindings are available." + echo "Configuration script failed!" + exit 1 elif [ ! -f "$lablgtkdir/glib.mli" ]; then - echo "Incomplete LablGtk2 library (glib.mli not found)." - echo "Configuration script failed!" - exit 1 + echo "Incomplete LablGtk2 library (glib.mli not found)." + echo "Configuration script failed!" + exit 1 else lablgtkdirfoundmsg="LablGtk2 directory found" LABLGTKLIB=$lablgtkdir # Pour le message utilisateur fi;; esac if [ "$lablgtkdir" = "" ]; then - echo "LablGtk2 not found: CoqIde will not be available." - COQIDE=no + echo "LablGtk2 not found: CoqIde will not be available." + COQIDE=no elif [ -z "`grep -w convert_with_fallback "$lablgtkdir/glib.mli"`" ]; then - echo "$lablgtkdirfoundmsg but too old: CoqIde will not be available." - COQIDE=no; - elif [ "$coqide_spec" = "yes" -a "$COQIDE" = "byte" ]; then - echo "$lablgtkdirfoundmsg, bytecode CoqIde will be used as requested." - COQIDE=byte - elif [ ! -f "${CAMLLIB}/threads/threads.cmxa" -a -f "${lablgtkdir}/gtkThread.cmx" ]; then - echo "$lablgtkdirfoundmsg, not native (or no native threads): bytecode CoqIde will be available." - COQIDE=byte + echo "$lablgtkdirfoundmsg but too old: CoqIde will not be available." + COQIDE=no; + elif [ "$coqide_spec" = "yes" -a "$COQIDE" = "byte" ]; then + echo "$lablgtkdirfoundmsg, bytecode CoqIde will be used as requested." + COQIDE=byte + elif [ ! -f "${CAMLLIB}/threads/threads.cmxa" -a -f "${lablgtkdir}/gtkThread.cmx" ]; then + echo "$lablgtkdirfoundmsg, not native (or no native threads): bytecode CoqIde will be available." + COQIDE=byte else echo "$lablgtkdirfoundmsg, native threads: native CoqIde will be available." - COQIDE=opt + COQIDE=opt if [ "$nomacintegration_spec" = "no" ] && lablgtkosxdir=$(ocamlfind query lablgtkosx 2> /dev/null); then IDEARCHFLAGS=lablgtkosx.cmxa - IDEARCHDEF=QUARTZ - elif [ "$ARCH" = "win32" ]; + IDEARCHDEF=QUARTZ + elif [ "$ARCH" = "win32" ]; then - IDEARCHFLAGS= - IDEARCHFILE=ide/ide_win32_stubs.o - IDEARCHDEF=WIN32 - fi + IDEARCHFLAGS= + IDEARCHFILE=ide/ide_win32_stubs.o + IDEARCHDEF=WIN32 + fi fi fi @@ -707,31 +707,31 @@ esac case $ARCH in Darwin) if [ "$HASNATDYNLINK" = "true" ] - then - STRIPCOMMAND="true" - else - STRIPCOMMAND="strip" - fi;; + then + STRIPCOMMAND="true" + else + STRIPCOMMAND="strip" + fi;; *) if [ "$coq_profile_flag" = "-p" ] || [ "$coq_debug_flag" = "-g" ] then - STRIPCOMMAND="true" + STRIPCOMMAND="true" else - STRIPCOMMAND="strip" + STRIPCOMMAND="strip" fi esac ### Test if documentation can be compiled (latex, hevea) -if test "$with_doc" = "all" +if test "$with_doc" = "all" then for cmd in "latex" "hevea" ; do - if test ! -x "`which $cmd`" - then - echo "$cmd was not found; documentation will not be available" - with_doc=no - break - fi + if test ! -x "`which $cmd`" + then + echo "$cmd was not found; documentation will not be available" + with_doc=no + break + fi done fi @@ -743,32 +743,32 @@ COQTOP=$PWD # OCaml only understand Windows filenames (C:\...) case $ARCH in win32) COQTOP=`mk_win_path "$COQTOP"` - CAMLBIN=`mk_win_path "$CAMLBIN"` - CAMLP4BIN=`mk_win_path "$CAMLP4BIN"` + CAMLBIN=`mk_win_path "$CAMLBIN"` + CAMLP4BIN=`mk_win_path "$CAMLP4BIN"` esac # Default installation directories case $ARCH$CYGWIN in win32) - W32PREF='C:/coq/' - bindir_def="${W32PREF}bin" - libdir_def="${W32PREF}lib" - configdir_def="${W32PREF}config" - datadir_def="${W32PREF}share" - mandir_def="${W32PREF}man" - docdir_def="${W32PREF}doc" - emacslib_def="${W32PREF}emacs" - coqdocdir_def="${W32PREF}latex";; + W32PREF='C:/coq/' + bindir_def="${W32PREF}bin" + libdir_def="${W32PREF}lib" + configdir_def="${W32PREF}config" + datadir_def="${W32PREF}share" + mandir_def="${W32PREF}man" + docdir_def="${W32PREF}doc" + emacslib_def="${W32PREF}emacs" + coqdocdir_def="${W32PREF}latex";; *) - bindir_def=/usr/local/bin - libdir_def=/usr/local/lib/coq - configdir_def=/etc/xdg/coq - datadir_def=/usr/local/share/coq - mandir_def=/usr/local/share/man - docdir_def=/usr/local/share/doc/coq - emacslib_def=/usr/local/share/emacs/site-lisp - coqdocdir_def=/usr/local/share/texmf/tex/latex/misc;; + bindir_def=/usr/local/bin + libdir_def=/usr/local/lib/coq + configdir_def=/etc/xdg/coq + datadir_def=/usr/local/share/coq + mandir_def=/usr/local/share/man + docdir_def=/usr/local/share/doc/coq + emacslib_def=/usr/local/share/emacs/site-lisp + coqdocdir_def=/usr/local/share/texmf/tex/latex/misc;; esac askdir () { @@ -810,7 +810,7 @@ case $datadir_spec/$prefix_spec in yes/*) DATADIR=$datadir;; no/yes) DATADIR=$prefix/share/coq;; *) askdir "the Coqide data files" $datadir_def - DATADIR="$answer";; + DATADIR="$answer";; esac if [ "$DATADIR" != "datadir_def" ]; then datadir_spec=yes; fi @@ -968,31 +968,31 @@ BROWSER=`escape_string "$BROWSER"` case $ARCH in win32) - BINDIR=`escape_string "$BINDIR"` - LIBDIR=`escape_string "$LIBDIR"` - CONFIGDIR=`escape_string "$CONFIGDIR"` - DATADIR=`escape_string "$DATADIR"` - CAMLBIN=`escape_string "$CAMLBIN"` - CAMLLIB=`escape_string "$CAMLLIB"` - MANDIR=`escape_string "$MANDIR"` - DOCDIR=`escape_string "$DOCDIR"` - EMACSLIB=`escape_string "$EMACSLIB"` - COQDOCDIR=`escape_string "$COQDOCDIR"` - CAMLP4BIN=`escape_string "$CAMLP4BIN"` - CAMLP4LIB=`escape_string "$CAMLP4LIB"` - LABLGTKINCLUDES=`escape_string "$LABLGTKINCLUDES"` - COQRUNBYTEFLAGS=`escape_string "$COQRUNBYTEFLAGS"` - COQTOOLSBYTEFLAGS=`escape_string "$COQTOOLSBYTEFLAGS"` - BUILDLDPATH=`escape_string "$BUILDLDPATH"` - ocamlexec=`escape_string "$ocamlexec"` - bytecamlc=`escape_string "$bytecamlc"` - nativecamlc=`escape_string "$nativecamlc"` - ocamlmklibexec=`escape_string "$ocamlmklibexec"` - ocamldepexec=`escape_string "$ocamldepexec"` - ocamldocexec=`escape_string "$ocamldocexec"` - ocamllexexec=`escape_string "$ocamllexexec"` - ocamlyaccexec=`escape_string "$ocamlyaccexec"` - camlp4oexec=`escape_string "$camlp4oexec"` + BINDIR=`escape_string "$BINDIR"` + LIBDIR=`escape_string "$LIBDIR"` + CONFIGDIR=`escape_string "$CONFIGDIR"` + DATADIR=`escape_string "$DATADIR"` + CAMLBIN=`escape_string "$CAMLBIN"` + CAMLLIB=`escape_string "$CAMLLIB"` + MANDIR=`escape_string "$MANDIR"` + DOCDIR=`escape_string "$DOCDIR"` + EMACSLIB=`escape_string "$EMACSLIB"` + COQDOCDIR=`escape_string "$COQDOCDIR"` + CAMLP4BIN=`escape_string "$CAMLP4BIN"` + CAMLP4LIB=`escape_string "$CAMLP4LIB"` + LABLGTKINCLUDES=`escape_string "$LABLGTKINCLUDES"` + COQRUNBYTEFLAGS=`escape_string "$COQRUNBYTEFLAGS"` + COQTOOLSBYTEFLAGS=`escape_string "$COQTOOLSBYTEFLAGS"` + BUILDLDPATH=`escape_string "$BUILDLDPATH"` + ocamlexec=`escape_string "$ocamlexec"` + bytecamlc=`escape_string "$bytecamlc"` + nativecamlc=`escape_string "$nativecamlc"` + ocamlmklibexec=`escape_string "$ocamlmklibexec"` + ocamldepexec=`escape_string "$ocamldepexec"` + ocamldocexec=`escape_string "$ocamldocexec"` + ocamllexexec=`escape_string "$ocamllexexec"` + ocamlyaccexec=`escape_string "$ocamlyaccexec"` + camlp4oexec=`escape_string "$camlp4oexec"` ;; esac |