diff options
| author | Sébastien Hinderer <Sebastien.Hinderer@inria.fr> | 2022-09-27 16:25:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-27 16:25:06 +0200 |
| commit | 477d6bb41d0ddb7f886eacbdd98d413e99d75aae (patch) | |
| tree | f0d60234723868b1d4b24aa1c40f50379eb8ed33 /configure.ac | |
| parent | 30eb1ab90e3e4b30b40878866f61bd02e61b40ae (diff) | |
| parent | 6a65b169ce037a8d281d53943adc918a45ff1ac3 (diff) | |
| download | ocaml-477d6bb41d0ddb7f886eacbdd98d413e99d75aae.tar.gz | |
Merge pull request #11541 from shindere/simplify-ifneqs-on-bool-variables
Make tests on boolean build variables more readable
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index 234760060c..42f705499b 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]) @@ -172,10 +173,10 @@ AC_SUBST([ocamltest_unix_include]) AC_SUBST([cc_has_debug_prefix_map]) AC_SUBST([as_has_debug_prefix_map]) AC_SUBST([with_debugger]) # TODO: rename this variable -AC_SUBST([ocamltest_ocamldebug]) -AC_SUBST([with_camltex]) +AC_SUBST([build_ocamldebug]) +AC_SUBST([build_ocamltex]) AC_SUBST([ocamldoc]) -AC_SUBST([ocamltest_ocamldoc]) +AC_SUBST([build_ocamldoc]) AC_SUBST([documentation_tool]) AC_SUBST([documentation_tool_cmd]) AC_SUBST([ocamltest]) @@ -491,8 +492,8 @@ AS_IF([test x"$enable_unix_lib" = "xno" || test x"$enable_str_lib" = "xno"], [AS_IF([test x"$enable_ocamldoc" = "xyes"], [AC_MSG_ERROR([ocamldoc requires the unix and str libraries])], [enable_ocamldoc="no" - with_camltex=""])], - [with_camltex="true"]) + build_ocamltex=false])], + [build_ocamltex=true]) # Initialization of libtool # Allow the MSVC linker to be found even if ld isn't installed. @@ -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]) @@ -1954,14 +1956,14 @@ AC_COMPILE_IFELSE( AS_CASE([$enable_debugger], [no], [with_debugger="" - ocamltest_ocamldebug=false + build_ocamldebug=false AC_MSG_NOTICE([replay debugger disabled])], [AS_IF([$sockets], [with_debugger="ocamldebugger" - ocamltest_ocamldebug=true + build_ocamldebug=true AC_MSG_NOTICE([replay debugger supported])], [with_debugger="" - ocamltest_ocamldebug=false + build_ocamldebug=false AC_MSG_NOTICE([replay debugger not supported])]) ]) @@ -2041,9 +2043,9 @@ AS_IF([test x"$enable_installing_source_artifacts" = "xno"], AS_IF([test x"$enable_ocamldoc" = "xno"], [ocamldoc="" - ocamltest_ocamldoc=false], + build_ocamldoc=false], [ocamldoc=ocamldoc - ocamltest_ocamldoc=true + build_ocamldoc=true AC_CONFIG_FILES([ocamldoc/META])]) documentation_tool_cmd='' |