Skip to content
Snippets Groups Projects
Commit b0042935 authored by Allan Blanchard's avatar Allan Blanchard
Browse files

[configure] removed useless deps checks

parent aa45c1ec
No related branches found
No related tags found
No related merge requests found
...@@ -57,12 +57,6 @@ VERSION_CODENAME:=$(shell $(CAT) VERSION_CODENAME) ...@@ -57,12 +57,6 @@ VERSION_CODENAME:=$(shell $(CAT) VERSION_CODENAME)
all: config.sed all: config.sed
dune build $(DUNE_BUILD_OPTS) @install 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) MAJOR_VERSION=$(shell $(SED) -E 's/^([0-9]+)\..*/\1/' VERSION)
MINOR_VERSION=$(shell $(SED) -E 's/^[0-9]+\.([0-9]+).*/\1/' VERSION) MINOR_VERSION=$(shell $(SED) -E 's/^[0-9]+\.([0-9]+).*/\1/' VERSION)
VERSION_CODENAME=$(shell $(CAT) VERSION_CODENAME) VERSION_CODENAME=$(shell $(CAT) VERSION_CODENAME)
...@@ -79,7 +73,6 @@ config.sed: VERSION share/Makefile.config share/Makefile.common Makefile configu ...@@ -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|@FRAMAC_GNU_CPP@|$(FRAMAC_GNU_CPP)|" >> $@
@echo "s|@DEFAULT_CPP_KEEP_COMMENTS@|$(DEFAULT_CPP_KEEP_COMMENTS)|" >> $@ @echo "s|@DEFAULT_CPP_KEEP_COMMENTS@|$(DEFAULT_CPP_KEEP_COMMENTS)|" >> $@
@echo "s|@DEFAULT_CPP_SUPPORTED_ARCH_OPTS@|$(DEFAULT_CPP_SUPPORTED_ARCH_OPTS)|" >> $@ @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 clean:: purge-tests # to be done before a "dune" command
dune clean dune clean
......
...@@ -519,16 +519,6 @@ CPPFLAGS=$OLD_CPPFLAGS ...@@ -519,16 +519,6 @@ CPPFLAGS=$OLD_CPPFLAGS
AC_MSG_RESULT(Default preprocessor supported architecture-related options: $DEFAULT_CPP_SUPPORTED_ARCH_OPTS) 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 # # Substitutions to perform #
############################ ############################
......
...@@ -67,7 +67,6 @@ let dump_to_json () = ...@@ -67,7 +67,6 @@ let dump_to_json () =
"preprocessor_supported_arch_options", "preprocessor_supported_arch_options",
list string Fc_config.preprocessor_supported_arch_options ; list string Fc_config.preprocessor_supported_arch_options ;
"preprocessor_keep_comments", `Bool Fc_config.preprocessor_keep_comments ; "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 ()) ; "current_machdep", `String (Kernel.Machdep.get ()) ;
"machdeps", list string (File.list_available_machdeps ()) ; "machdeps", list string (File.list_available_machdeps ()) ;
"plugins", list string (list_plugin_names ()) ; "plugins", list string (list_plugin_names ()) ;
......
...@@ -63,5 +63,3 @@ let preprocessor_supported_arch_options = [@DEFAULT_CPP_SUPPORTED_ARCH_OPTS@] ...@@ -63,5 +63,3 @@ let preprocessor_supported_arch_options = [@DEFAULT_CPP_SUPPORTED_ARCH_OPTS@]
let preprocessor_keep_comments = let preprocessor_keep_comments =
env_or_default (fun _ -> true) @DEFAULT_CPP_KEEP_COMMENTS@ env_or_default (fun _ -> true) @DEFAULT_CPP_KEEP_COMMENTS@
let dot = @OPTDOT@
...@@ -98,11 +98,6 @@ val preprocessor_keep_comments: bool ...@@ -98,11 +98,6 @@ val preprocessor_keep_comments: bool
@since Neon-rc3 @since Neon-rc3
*) *)
val dot: string option
(** Dot command name.
@return [None] if `dot' is not installed.
@since Carbon-20101201 *)
(* (*
Local Variables: Local Variables:
compile-command: "make -C ../../.." compile-command: "make -C ../../.."
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment