X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fremove.m4;h=e693f6404e76fe1bca8e1953badc9d9eba383437;hb=fa1db0dd22768f09a507674a30beb5b8a87bb35f;hp=b4a468a996297011e41f4e96aa933270710a5c47;hpb=9f1f81e4362dd265a2fa54b30b16ceed123cd4e5;p=gnulib.git

diff --git a/m4/remove.m4 b/m4/remove.m4
index b4a468a99..e693f6404 100644
--- a/m4/remove.m4
+++ b/m4/remove.m4
@@ -1,5 +1,5 @@
-# remove.m4 serial 4
-dnl Copyright (C) 2009-2012 Free Software Foundation, Inc.
+# remove.m4 serial 5
+dnl Copyright (C) 2009-2013 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -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_honors_slashes" 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