diff --git a/Makefile b/Makefile index 0c860ec781c..4614f02d030 100644 --- a/Makefile +++ b/Makefile @@ -935,10 +935,6 @@ devsetup: echo '$(TERM_INFO)*** Installing GNU sed$(TERM_RESET)' >&2; \ brew install gnu-sed; \ fi - $(QUIET)if [ "$(PLATFORM)" = "Darwin" ] && [ x"$(DIFF_CAN_FORMAT)" = x"no" ] ; then \ - echo '$(TERM_INFO)*** Installing diffutils$(TERM_RESET)' >&2; \ - brew install diffutils; \ - fi $(QUIET)if [ "$(PLATFORM)" = "Darwin" ] && ! $$(parallel -h | grep -q GNU); then \ echo '$(TERM_INFO)*** Installing GNU parallel$(TERM_RESET)' >&2; \ brew install parallel; \ diff --git a/Makefile.autoconf.in b/Makefile.autoconf.in index f4d211ee3b9..ff9dc394348 100644 --- a/Makefile.autoconf.in +++ b/Makefile.autoconf.in @@ -29,7 +29,6 @@ CXX := @CXX@ CXXFLAGS := @CXXFLAGS@ # this is useless but autoconf is picky... datarootdir = @datarootdir@ -DIFF_CAN_FORMAT := @DIFF_CAN_FORMAT@ EMACS := @EMACS@ ENABLE_OCAMLOPT_CUSTOM_CC := @ENABLE_OCAMLOPT_CUSTOM_CC@ ENABLE_OCAML_BINANNOT := @ENABLE_OCAML_BINANNOT@ diff --git a/configure.ac b/configure.ac index 04498bd9834..5ab5be31aa3 100644 --- a/configure.ac +++ b/configure.ac @@ -474,16 +474,6 @@ AS_IF([test "$SED" != "xno"], [ ]) AC_SUBST([GNU_SED]) -AC_ASSERT_PROG([diff], [$DIFF]) -AC_MSG_CHECKING([if diff supports --LTYPE-line-format=LFMT options]) -# there are several such options but just test one of them and hope for the best -AS_IF([diff --unchanged-line-format=A /dev/null /dev/null 2>/dev/null], [ - DIFF_CAN_FORMAT=yes -], [ - DIFF_CAN_FORMAT=no -]) -AC_MSG_RESULT([$DIFF_CAN_FORMAT]) -AC_SUBST([DIFF_CAN_FORMAT]) AC_CHECK_TOOL([BREW], [brew], [no]) AC_CHECK_TOOL([INSTALL_NAME_TOOL], [install_name_tool], [no])