add -bin-annot for OCaml >= 4.0 (thanks to JP Deplaix)

.gitignore

@@ -11,6 +11,8 @@ why3.conf
 *.cmxs
 *.cma
 *.cmxa
+*.cmt
+*.cmti
 *.annot
 *.dep
 *.vo

Makefile.in

@@ -74,6 +74,11 @@ ifeq (@enable_profiling@,yes)
 OFLAGS += -g -p
 endif
 
+ifeq (@enable_bin_annot@,yes)
+OFLAGS += -bin-annot
+BFLAGS += -bin-annot
+endif
+
 # external libraries common to all binaries
 
 EXTOBJS =
@@ -83,7 +88,7 @@ EXTCMA	= $(addsuffix .cma,$(EXTLIBS)) $(addsuffix .cmo,$(EXTOBJS))
 EXTCMXA = $(addsuffix .cmxa,$(EXTLIBS)) $(addsuffix .cmx,$(EXTOBJS))
 
 INSTALLED_LIB_EXTS = a cma cmx cmi cmxa cmxs
-COMPILED_LIB_EXTS = $(INSTALLED_LIB_EXTS) o cmo annot dep output
+COMPILED_LIB_EXTS = $(INSTALLED_LIB_EXTS) o cmo cmt cmti annot dep output
 
 TARGET_EMACS = share/emacs/why3.elc
 

configure.in

@@ -309,6 +309,13 @@ else
    OCAMLINSTALLLIB=$OCAMLLIB
 fi
 
+# bin-annot
+case "$OCAMLVERSION" in
+  0.*|1.*|2.*|3.*)
+        enable_bin_annot=no;;
+  *)
+        enable_bin_annot=yes;;
+esac
 
 # checking for rubber
 if test "$enable_doc" = yes ; then
@@ -693,6 +700,7 @@ AC_SUBST(OCAMLGRAPHLIB)
 dnl AC_SUBST(OCAMLWEB)
 
 AC_SUBST(enable_profiling)
+AC_SUBST(enable_bin_annot)
 
 AC_SUBST(CAMLP5O)