X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fremove.m4;h=7eb8f7e06531586001a06756405104bb00829497;hb=46f5f314f34a08c9305758482d7d2fdb0e999d09;hp=bc8f678935dff7ce7191cd562059ba881ef25e1a;hpb=2fe314d87dda467d8e58b73321b0eff3eb5825b1;p=gnulib.git

diff --git a/m4/remove.m4 b/m4/remove.m4
index bc8f67893..7eb8f7e06 100644
--- a/m4/remove.m4
+++ b/m4/remove.m4
@@ -1,5 +1,5 @@
-# remove.m4 serial 3
-dnl Copyright (C) 2009-2011 Free Software Foundation, Inc.
+# remove.m4 serial 5
+dnl Copyright (C) 2009-2014 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,7 +10,11 @@ AC_DEFUN([gl_FUNC_REMOVE],
   AC_REQUIRE([gl_STDIO_H_DEFAULTS])
   AC_REQUIRE([gl_FUNC_RMDIR])
   AC_REQUIRE([gl_FUNC_UNLINK])
-  if test "$gl_cv_func_rmdir_works:$gl_cv_func_unlink_works" != yes:yes; then
+  if { case "$gl_cv_func_rmdir_works:$gl_cv_func_unlink_honors_slashes" in
+         *yes:*yes) false;;
+         *) true;;
+       esac
+     }; then
     dnl If either underlying syscall is broken, then remove likely has
     dnl the same bug; blindly use our replacement.
     REPLACE_REMOVE=1