From f6aa2bc3e5941306e2ba6813014fa2eb8d3f4931 Mon Sep 17 00:00:00 2001 From: Cheng Shao <terrorjack@type.dance> Date: Tue, 21 May 2024 07:22:55 +0000 Subject: [PATCH] autoconf: remove unused context diff check This patch removes redundant autoconf check for the context diff program given it isn't actually been used anywhere, especially since make removal. (cherry picked from commit b7bcf72990c20bf88c57d7d2b4478d8f2ad18ac3) (cherry picked from commit 0e9d2a0fb2fad412e10a29363f92554ef7ca9583) --- configure.ac | 3 --- m4/fp_prog_context_diff.m4 | 23 ----------------------- 2 files changed, 26 deletions(-) delete mode 100644 m4/fp_prog_context_diff.m4 diff --git a/configure.ac b/configure.ac index 5d992f7ca45..aa2da6cde71 100644 --- a/configure.ac +++ b/configure.ac @@ -735,9 +735,6 @@ AC_SUBST(TargetHasIdentDirective) GHC_GNU_NONEXEC_STACK AC_SUBST(TargetHasGnuNonexecStack) -dnl ** figure out how to do context diffs -FP_PROG_CONTEXT_DIFF - dnl Let's make sure install-sh is executable here. If we got it from dnl a darcs repo, it might not be (see bug #978). chmod +x install-sh diff --git a/m4/fp_prog_context_diff.m4 b/m4/fp_prog_context_diff.m4 deleted file mode 100644 index 886f73ce4c0..00000000000 --- a/m4/fp_prog_context_diff.m4 +++ /dev/null @@ -1,23 +0,0 @@ -# FP_PROG_CONTEXT_DIFF -# -------------------- -# Figure out how to do context diffs. Sets the output variable ContextDiffCmd. -# -# Note: NeXTStep thinks diff'ing a file against itself is "trouble". -AC_DEFUN([FP_PROG_CONTEXT_DIFF], -[AC_CACHE_CHECK([for a working context diff], [fp_cv_context_diff], -[echo foo > conftest1 -echo foo > conftest2 -fp_cv_context_diff=no -for fp_var in '-U 1' '-u1' '-C 1' '-c1' -do - if diff $fp_var conftest1 conftest2 > /dev/null 2>&1; then - fp_cv_context_diff="diff $fp_var" - break - fi -done]) -if test x"$fp_cv_context_diff" = xno; then - AC_MSG_ERROR([cannot figure out how to do context diffs]) -fi -AC_SUBST(ContextDiffCmd, [$fp_cv_context_diff]) -])# FP_PROG_CONTEXT_DIFF - -- GitLab