Introduce and use the lib_runtime_events boolean configuration variable

The configure script sets this variable to "true" if the runtime_events
library has to be built. At the moment it is always built but this may
change.

4 files changed, 9 insertions, 1 deletions

diff --git a/Makefile.build_config.in b/Makefile.build_config.in
index a1eb2948a6..812b8358ab 100644
--- a/Makefile.build_config.in
+++ b/Makefile.build_config.in
@@ -29,6 +29,9 @@ INSTALL ?= @INSTALL@ -p
 INSTALL_DATA ?= @INSTALL_DATA@
 INSTALL_PROG ?= @INSTALL_PROGRAM@
 
+# Whether to build the runtime_events library
+lib_runtime_events = @lib_runtime_events@
+
 # Whether to install the native toplevel (ocamlnat)
 INSTALL_OCAMLNAT = @install_ocamlnat@
 
diff --git a/api_docgen/Makefile.docfiles b/api_docgen/Makefile.docfiles
index 0c2412b192..d9f922f697 100644
--- a/api_docgen/Makefile.docfiles
+++ b/api_docgen/Makefile.docfiles
@@ -55,7 +55,7 @@ ifneq "$(filter systhreads,$(OTHERLIBRARIES))" ""
 otherlibref += $(thread_MLIS:%.mli=%)
 endif
 
-ifneq "$(filter runtime_events,$(OTHERLIBRARIES))" ""
+ifeq "$(lib_runtime_events)" "true"
 otherlibref += $(runtime_events_MLIS:%.mli=%)
 endif
 
diff --git a/configure b/configure
index e04cd45a99..660373a455 100755
--- a/configure
+++ b/configure
@@ -804,6 +804,7 @@ ocamltest_CPP
 lib_unix
 lib_systhreads
 lib_str
+lib_runtime_events
 lib_dynlink
 otherlibraries
 has_monotonic_clock
@@ -2987,6 +2988,7 @@ OCAML_VERSION_SHORT=5.1
 
 
 
+
  # TODO: rename this variable
 
 
@@ -12794,6 +12796,7 @@ esac
 
 otherlibraries="dynlink runtime_events"
 lib_dynlink=true
+lib_runtime_events=true
 if test x"$enable_unix_lib" != "xno"; then :
   enable_unix_lib=yes
   ac_config_files="$ac_config_files otherlibs/unix/META"
diff --git a/configure.ac b/configure.ac
index 029582a417..4190c47b37 100644
--- a/configure.ac
+++ b/configure.ac
@@ -160,6 +160,7 @@ AC_SUBST([instrumented_runtime_libs])
 AC_SUBST([has_monotonic_clock])
 AC_SUBST([otherlibraries])
 AC_SUBST([lib_dynlink])
+AC_SUBST([lib_runtime_events])
 AC_SUBST([lib_str])
 AC_SUBST([lib_systhreads])
 AC_SUBST([lib_unix])
@@ -619,6 +620,7 @@ AS_CASE([$host],
 
 otherlibraries="dynlink runtime_events"
 lib_dynlink=true
+lib_runtime_events=true
 AS_IF([test x"$enable_unix_lib" != "xno"],
   [enable_unix_lib=yes
   AC_CONFIG_FILES([otherlibs/unix/META])