Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/70a0dd6b1ee4ac9dc5d6b4003c65ca8958dda701 >--------------------------------------------------------------- commit 70a0dd6b1ee4ac9dc5d6b4003c65ca8958dda701 Author: Ian Lynagh <i...@well-typed.com> Date: Tue Nov 13 22:36:28 2012 +0000 Remove unused FP_PROG_SORT / SortCmd / SORT >--------------------------------------------------------------- aclocal.m4 | 19 ------------------- configure.ac | 3 --- mk/config.mk.in | 1 - 3 files changed, 0 insertions(+), 23 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 9087994..e23cd43 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 f0bc4c3..408586c 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 f8d4d6a..65a5957 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 _______________________________________________ Cvs-ghc mailing list Cvs-ghc@haskell.org http://www.haskell.org/mailman/listinfo/cvs-ghc
