From: Bruno Haible <bruno@clisp.org>
Date: Fri, 4 May 2012 01:35:27 +0000 (+0200)
Subject: Simplify last commit.
X-Git-Tag: v0.1~714
X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;h=96f023c5e537dd4afbdb294de7065f65effe3eb2;p=gnulib.git

Simplify last commit.
---

diff --git a/m4/remove.m4 b/m4/remove.m4
index b4a468a99..809efb3cf 100644
--- a/m4/remove.m4
+++ b/m4/remove.m4
@@ -10,16 +10,11 @@ AC_DEFUN([gl_FUNC_REMOVE],
   AC_REQUIRE([gl_STDIO_H_DEFAULTS])
   AC_REQUIRE([gl_FUNC_RMDIR])
   AC_REQUIRE([gl_FUNC_UNLINK])
-  if { case "$gl_cv_func_rmdir_works" in
-         *yes) false;;
+  if { case "$gl_cv_func_rmdir_works:$gl_cv_func_unlink_works" in
+         *yes:*yes) false;;
          *) true;;
        esac
-     } \
-     || { case "$gl_cv_func_unlink_works" in
-            *yes) false;;
-            *) true;;
-          esac
-        }; then
+     }; then
     dnl If either underlying syscall is broken, then remove likely has
     dnl the same bug; blindly use our replacement.
     REPLACE_REMOVE=1