summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lynagh <ian@well-typed.com>2012-11-13 22:36:28 +0000
committerIan Lynagh <ian@well-typed.com>2012-11-13 22:36:28 +0000
commit70a0dd6b1ee4ac9dc5d6b4003c65ca8958dda701 (patch)
tree4918eb2aa65ab5bef64d1a0493222929241b1d42
parente605c3e8c1b1a643a7c11e7aa2a7f639dd890cfe (diff)
downloadhaskell-70a0dd6b1ee4ac9dc5d6b4003c65ca8958dda701.tar.gz
Remove unused FP_PROG_SORT / SortCmd / SORT
-rw-r--r--aclocal.m419
-rw-r--r--configure.ac3
-rw-r--r--mk/config.mk.in1
3 files changed, 0 insertions, 23 deletions
diff --git a/aclocal.m4 b/aclocal.m4
index 90879945e8..e23cd436f4 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1162,25 +1162,6 @@ AC_SUBST([FindCmd])[]dnl
])# FP_PROG_FIND
-# FP_PROG_SORT
-# ------------
-# Find a Unix-like sort
-AC_DEFUN([FP_PROG_SORT],
-[AC_PATH_PROG([fp_prog_sort], [sort])
-echo conwip > conftest.txt
-$fp_prog_sort -f conftest.txt > conftest.out 2>&1
-if grep 'conwip' conftest.out > /dev/null 2>&1 ; then
- # The goods
- SortCmd="$fp_prog_sort"
-else
- # Summink else..pick next one.
- AC_MSG_WARN([$fp_prog_sort looks like a non-*nix sort, ignoring it])
- FP_CHECK_PROG([SortCmd], [sort], [], [], [$fp_prog_sort])
-fi
-rm -f conftest.txt conftest.out
-AC_SUBST([SortCmd])[]dnl
-])# FP_PROG_SORT
-
dnl
dnl FPTOOLS_NOCACHE_CHECK prints a message, then sets the
dnl values of the second argument to the result of running
diff --git a/configure.ac b/configure.ac
index f0bc4c35ee..408586c58a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,9 +40,6 @@ dnl ** which are needed by FP_SETUP_PROJECT_VERSION
dnl ** Find find command (for Win32's benefit)
FP_PROG_FIND
-dnl ** Find sort command (for the benefit of Win32 environs)
-FP_PROG_SORT
-
dnl ----------------------------------------------------------
FP_SETUP_PROJECT_VERSION
diff --git a/mk/config.mk.in b/mk/config.mk.in
index f8d4d6a95f..65a595729b 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -688,7 +688,6 @@ CTAGS = $(ETAGS)
#
RAWCPP_FLAGS = -undef -traditional
FIND = @FindCmd@
-SORT = @SortCmd@
#
# Sigh - the autoconf macro for INSTALL will subst a relative path to the fallback