Configure v2

.gitignore

@@ -53,6 +53,7 @@ META
 /config.log
 /config.status
 /configure~
+/runtime/caml/config.h.in~
 /flexlink.opt
 /libtool
 /ocamlc.opt
@@ -235,8 +236,7 @@ META
 
 /runtime/domain_state.inc
 /runtime/caml/jumptbl.h
-/runtime/caml/m.h
-/runtime/caml/s.h
+/runtime/caml/config.h
 /runtime/primitives
 /runtime/primitives*.new
 /runtime/prims.c

INSTALL.adoc

@@ -55,8 +55,8 @@ From the top directory, do:
 
         ./configure
 
-This generates the three configuration files `Makefile.config`,
-`runtime/caml/m.h` and `runtime/caml/s.h`.
+This generates the two configuration files `Makefile.config`,
+`runtime/caml/config.h`.
 
 The `configure` script accepts options that can be discovered by running:
 
@@ -95,8 +95,7 @@ files cause errors later on, then look at the template files:
 
         Makefile.config.in
         Makefile.build_config.in
-        runtime/caml/m.h.in
-        runtime/caml/s.h.in
+        runtime/caml/config.h.in
 +
 for guidance on how to edit the generated files by hand.
 

Makefile

@@ -1260,7 +1260,7 @@ runtime_NATIVE_C_SOURCES = \
 
 ## Header files generated by configure
 runtime_CONFIGURED_HEADERS = \
-  $(addprefix runtime/caml/, exec.h m.h s.h version.h)
+  $(addprefix runtime/caml/, exec.h config.h version.h)
 
 ## Header files generated by make
 runtime_BUILT_HEADERS = $(addprefix runtime/, \

Makefile.config.in

@@ -120,9 +120,6 @@ ARCH=@arch@
 # Whether the architecture has 64 bits
 ARCH64=@arch64@
 
-# Endianness for this architecture
-ENDIANNESS=@endianness@
-
 ### Name of architecture model for the native-code compiler.
 ### Some architectures come in several slightly different flavors
 ### that share a common code generator. This variable tailors the