From be81ec22ccdecb5bf80dd9528223e443e8c03359 Mon Sep 17 00:00:00 2001
From: Gilles Espinasse <g.esp@free.fr>
Date: Sun, 30 Sep 2012 08:42:30 +0200
Subject: [PATCH] Remove useless `rm' detection.

`rm -f' is directly used in the `configure' script created by
autoconf, thus no availability test is necessary.

* builds/unix/configure.raw (RMF): Remove test.
* builds/unix/unix-def.in (DELETE): Updated.
---
 ChangeLog                 | 10 ++++++++++
 builds/unix/configure.raw |  4 +---
 builds/unix/unix-def.in   |  2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e18545efe..2a9b7530e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2012-09-30  Gilles Espinasse  <g.esp@free.fr>
+
+	Remove useless `rm' detection.
+
+	`rm -f' is directly used in the `configure' script created by
+	autoconf, thus no availability test is necessary.
+
+	* builds/unix/configure.raw (RMF): Remove test.
+	* builds/unix/unix-def.in (DELETE): Updated.
+
 2012-09-29  Werner Lemberg  <wl@gnu.org>
 
 	[autofit] Minor optimization.
diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw
index 78c8fb187..e8955b6bd 100644
--- a/builds/unix/configure.raw
+++ b/builds/unix/configure.raw
@@ -66,10 +66,8 @@ AC_SUBST(CC_BUILD)
 AC_SUBST(EXEEXT_BUILD)
 
 
-
 # auxiliary programs
 
-AC_CHECK_PROG([RMF], [rm], [rm -f])
 AC_CHECK_PROG([RMDIR], [rmdir], [rmdir])
 
 
@@ -125,7 +123,7 @@ echo >> conftest.c "#endif"
 
 ${CPP} ${CPPFLAGS} conftest.c | ${GREP} ac_cpp_ft > conftest.sh
 eval `cat conftest.sh`
-${RMF} conftest.c conftest.sh confft2build.h ftoption.h ftstdlib.h
+rm -f conftest.c conftest.sh confft2build.h ftoption.h ftstdlib.h
 
 if test x != "x${ac_cpp_ft_sizeof_int}" \
    -a x != x"${ac_cpp_ft_sizeof_long}"; then
diff --git a/builds/unix/unix-def.in b/builds/unix/unix-def.in
index e0a7a3a61..d3ebc8b26 100644
--- a/builds/unix/unix-def.in
+++ b/builds/unix/unix-def.in
@@ -15,7 +15,7 @@
 
 TOP_DIR := $(shell cd $(TOP_DIR); pwd)
 
-DELETE    := @RMF@
+DELETE    := rm -f
 DELDIR    := @RMDIR@
 CAT       := cat
 SEP       := /