changement "modern" -> "label"

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@2974 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

7 files changed, 11 insertions, 10 deletions

diff --git a/driver/main.ml b/driver/main.ml
index 7fb887ff3..7710f7fe6 100644
--- a/driver/main.ml
+++ b/driver/main.ml
@@ -76,10 +76,10 @@ module Options = Main_args.Make_options (struct
   let _impl = impl
   let _intf = intf
   let _intf_suffix s = Config.interface_suffix := s
+  let _label = unset classic
   let _linkall = set link_everything
   let _make_runtime () =
     custom_runtime := true; make_runtime := true; link_everything := true
-  let _modern = unset classic
   let _noassert = set noassert
   let _noautolink = set no_auto_link
   let _o s = exec_name := s; archive_name := s; object_name := s
diff --git a/driver/main_args.ml b/driver/main_args.ml
index 1efeffb50..bbf4c156a 100644
--- a/driver/main_args.ml
+++ b/driver/main_args.ml
@@ -26,9 +26,9 @@ module Make_options (F :
      val _impl : string -> unit
      val _intf : string -> unit
      val _intf_suffix : string -> unit
+     val _label : unit -> unit
      val _linkall : unit -> unit
      val _make_runtime : unit -> unit
-     val _modern : unit -> unit
      val _noassert : unit -> unit
      val _noautolink : unit -> unit
      val _o : string -> unit
@@ -69,12 +69,13 @@ struct
            "<file>  Suffix for interface files (default: .mli)";
     "-intf_suffix", Arg.String F._intf_suffix,
            "<file>  (deprecated) same as -intf-suffix";
-    "-modern", Arg.Unit F._modern, " Use strict label syntax";
+    "-label", Arg.Unit F._label, " Use strict label syntax";
     "-linkall", Arg.Unit F._linkall, " Link all modules, even unused ones";
     "-make-runtime", Arg.Unit F._make_runtime,
            " Build a runtime system with given C objects and libraries";
     "-make_runtime", Arg.Unit F._make_runtime,
            " (deprecated) same as -make-runtime";
+    "-modern", Arg.Unit F._label, " (deprecated) same as -label";
     "-noassert", Arg.Unit F._noassert, " Do not compile assertion checks";
     "-noautolink", Arg.Unit F._noautolink,
            " Don't automatically link C libraries specified in .cma files";
diff --git a/driver/main_args.mli b/driver/main_args.mli
index 540a27117..d77589d75 100644
--- a/driver/main_args.mli
+++ b/driver/main_args.mli
@@ -26,9 +26,9 @@ module Make_options (F :
       val _impl : string -> unit
       val _intf : string -> unit
       val _intf_suffix : string -> unit
+      val _label : unit -> unit
       val _linkall : unit -> unit
       val _make_runtime : unit -> unit
-      val _modern : unit -> unit
       val _noassert : unit -> unit
       val _noautolink : unit -> unit
       val _o : string -> unit
diff --git a/otherlibs/labltk/support/Makefile.common b/otherlibs/labltk/support/Makefile.common
index f40bfdacb..2012b2f31 100644
--- a/otherlibs/labltk/support/Makefile.common
+++ b/otherlibs/labltk/support/Makefile.common
@@ -15,7 +15,7 @@ TKLINKOPT=$(STATIC) \
 
 CAMLRUN=$(TOPDIR)/boot/ocamlrun
 LABLC=$(CAMLRUN) $(TOPDIR)/ocamlc -I $(TOPDIR)/stdlib
-LABLCOMP=$(LABLC) -modern -c
+LABLCOMP=$(LABLC) -label -c
 LABLYACC=$(TOPDIR)/boot/ocamlyacc -v
 LABLLEX=$(CAMLRUN) $(TOPDIR)/boot/ocamllex
 LABLLIBR=$(LABLC) -a
@@ -23,5 +23,5 @@ LABLDEP=$(CAMLRUN) $(TOPDIR)/tools/ocamldep
 COMPFLAGS=
 LINKFLAGS=
 
-CAMLOPT=$(CAMLRUN) $(TOPDIR)/ocamlopt -I $(TOPDIR)/stdlib -modern
+CAMLOPT=$(CAMLRUN) $(TOPDIR)/ocamlopt -I $(TOPDIR)/stdlib -label
 CAMLOPTLIBR=$(CAMLOPT) -a
diff --git a/otherlibs/labltk/support/Makefile.common.nt b/otherlibs/labltk/support/Makefile.common.nt
index e3e9f0851..8853f0035 100644
--- a/otherlibs/labltk/support/Makefile.common.nt
+++ b/otherlibs/labltk/support/Makefile.common.nt
@@ -16,7 +16,7 @@ TKLINKOPT=$(STATIC)
 
 CAMLRUN=$(EXEDIR)\boot\ocamlrun
 LABLC=$(CAMLRUN) $(TOPDIR)/ocamlc -I $(TOPDIR)/stdlib
-LABLCOMP=$(LABLC) -modern -c
+LABLCOMP=$(LABLC) -label -c
 LABLYACC=$(EXEDIR)\boot\ocamlyacc -v
 LABLLEX=$(CAMLRUN) $(TOPDIR)/boot/ocamllex
 LABLLIBR=$(LABLC) -a
@@ -24,5 +24,5 @@ LABLDEP=$(CAMLRUN) $(TOPDIR)/tools/ocamldep
 COMPFLAGS=
 LINKFLAGS=
 
-CAMLOPT=$(CAMLRUN) $(TOPDIR)/ocamlopt -I $(TOPDIR)/stdlib -modern
+CAMLOPT=$(CAMLRUN) $(TOPDIR)/ocamlopt -I $(TOPDIR)/stdlib -label
 CAMLOPTLIBR=$(CAMLOPT) -a
diff --git a/tools/ocamlcp.ml b/tools/ocamlcp.ml
index 491b7c231..cef50dc75 100644
--- a/tools/ocamlcp.ml
+++ b/tools/ocamlcp.ml
@@ -45,9 +45,9 @@ module Options = Main_args.Make_options (struct
   let _impl s = option_with_arg "-impl" s
   let _intf s = option_with_arg "-intf" s
   let _intf_suffix s = option_with_arg "-intf-suffix" s
+  let _label = option "-label"
   let _linkall = option "-linkall"
   let _make_runtime = option "-make-runtime"
-  let _modern = option "-modern"
   let _noassert = option "-noassert"
   let _noautolink = option "-noautolink"
   let _o s = option_with_arg "-o" s
diff --git a/utils/config.mlp b/utils/config.mlp
index 7e3667c33..8a01e7442 100644
--- a/utils/config.mlp
+++ b/utils/config.mlp
@@ -12,7 +12,7 @@
 
 (* $Id$ *)
 
-let version = "2.99+11"
+let version = "2.99+12"
 
 let standard_library =
   try