From b004293593384af334f41fffab2ccd7ad0d62123 Mon Sep 17 00:00:00 2001
From: Allan Blanchard <allan.blanchard@cea.fr>
Date: Mon, 18 Jul 2022 10:34:52 +0200
Subject: [PATCH] [configure] removed useless deps checks
---
Makefile | 7 -------
configure.ac | 10 ----------
src/kernel_internals/runtime/dump_config.ml | 1 -
src/kernel_internals/runtime/fc_config.ml.in | 2 --
src/kernel_internals/runtime/fc_config.mli | 5 -----
5 files changed, 25 deletions(-)
diff --git a/Makefile b/Makefile
index ac2e4c824b0..4a4fc309266 100644
--- a/Makefile
+++ b/Makefile
@@ -57,12 +57,6 @@ VERSION_CODENAME:=$(shell $(CAT) VERSION_CODENAME)
all: config.sed
dune build $(DUNE_BUILD_OPTS) @install
-ifeq ($(HAS_DOT),yes)
-OPTDOT=Some \"$(DOT)\"
-else
-OPTDOT=None
-endif
-
MAJOR_VERSION=$(shell $(SED) -E 's/^([0-9]+)\..*/\1/' VERSION)
MINOR_VERSION=$(shell $(SED) -E 's/^[0-9]+\.([0-9]+).*/\1/' VERSION)
VERSION_CODENAME=$(shell $(CAT) VERSION_CODENAME)
@@ -79,7 +73,6 @@ config.sed: VERSION share/Makefile.config share/Makefile.common Makefile configu
@echo "s|@FRAMAC_GNU_CPP@|$(FRAMAC_GNU_CPP)|" >> $@
@echo "s|@DEFAULT_CPP_KEEP_COMMENTS@|$(DEFAULT_CPP_KEEP_COMMENTS)|" >> $@
@echo "s|@DEFAULT_CPP_SUPPORTED_ARCH_OPTS@|$(DEFAULT_CPP_SUPPORTED_ARCH_OPTS)|" >> $@
- @echo "s|@OPTDOT@|$(OPTDOT)|" >> $@
clean:: purge-tests # to be done before a "dune" command
dune clean
diff --git a/configure.ac b/configure.ac
index feef7b72517..21b7763b5b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -519,16 +519,6 @@ CPPFLAGS=$OLD_CPPFLAGS
AC_MSG_RESULT(Default preprocessor supported architecture-related options: $DEFAULT_CPP_SUPPORTED_ARCH_OPTS)
-# dot and xdot tools
-####################
-
-configure_tool([DOT],[dot],[dot not found: you should install GraphViz],no)
-
-configure_tool([UNIX2DOS],[unix2dos],
- [unix2dos not found: you should install tofrodos],no)
-
-plugin_use_external(tests,unix2dos)
-
############################
# Substitutions to perform #
############################
diff --git a/src/kernel_internals/runtime/dump_config.ml b/src/kernel_internals/runtime/dump_config.ml
index d932f5a2f6d..09141e5afa0 100644
--- a/src/kernel_internals/runtime/dump_config.ml
+++ b/src/kernel_internals/runtime/dump_config.ml
@@ -67,7 +67,6 @@ let dump_to_json () =
"preprocessor_supported_arch_options",
list string Fc_config.preprocessor_supported_arch_options ;
"preprocessor_keep_comments", `Bool Fc_config.preprocessor_keep_comments ;
- "dot", (match Fc_config.dot with Some cmd -> `String cmd | None -> `Null) ;
"current_machdep", `String (Kernel.Machdep.get ()) ;
"machdeps", list string (File.list_available_machdeps ()) ;
"plugins", list string (list_plugin_names ()) ;
diff --git a/src/kernel_internals/runtime/fc_config.ml.in b/src/kernel_internals/runtime/fc_config.ml.in
index 2889e6566f1..46be5ea3cfe 100644
--- a/src/kernel_internals/runtime/fc_config.ml.in
+++ b/src/kernel_internals/runtime/fc_config.ml.in
@@ -63,5 +63,3 @@ let preprocessor_supported_arch_options = [@DEFAULT_CPP_SUPPORTED_ARCH_OPTS@]
let preprocessor_keep_comments =
env_or_default (fun _ -> true) @DEFAULT_CPP_KEEP_COMMENTS@
-
-let dot = @OPTDOT@
diff --git a/src/kernel_internals/runtime/fc_config.mli b/src/kernel_internals/runtime/fc_config.mli
index 181574f0a5a..ad676f2371e 100644
--- a/src/kernel_internals/runtime/fc_config.mli
+++ b/src/kernel_internals/runtime/fc_config.mli
@@ -98,11 +98,6 @@ val preprocessor_keep_comments: bool
@since Neon-rc3
*)
-val dot: string option
-(** Dot command name.
- @return [None] if `dot' is not installed.
- @since Carbon-20101201 *)
-
(*
Local Variables:
compile-command: "make -C ../../.."
--
GitLab