X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fremove.m4;h=bc8f678935dff7ce7191cd562059ba881ef25e1a;hb=0ac9362d3e63ada72bef1cb93bb20ef5b9d01e44;hp=c3bcd6a2cb8e02aa48de296576ae2569dabe26e9;hpb=b2e2010c7c902235b5efb5bd3c6529f61b093aa4;p=gnulib.git

diff --git a/m4/remove.m4 b/m4/remove.m4
index c3bcd6a2c..bc8f67893 100644
--- a/m4/remove.m4
+++ b/m4/remove.m4
@@ -1,5 +1,5 @@
-# remove.m4 serial 1
-dnl Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+# remove.m4 serial 3
+dnl Copyright (C) 2009-2011 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.
@@ -7,7 +7,6 @@ dnl with or without modifications, as long as this notice is preserved.
 AC_DEFUN([gl_FUNC_REMOVE],
 [
   AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-  AC_REQUIRE([gl_AC_DOS])
   AC_REQUIRE([gl_STDIO_H_DEFAULTS])
   AC_REQUIRE([gl_FUNC_RMDIR])
   AC_REQUIRE([gl_FUNC_UNLINK])
@@ -15,7 +14,6 @@ AC_DEFUN([gl_FUNC_REMOVE],
     dnl If either underlying syscall is broken, then remove likely has
     dnl the same bug; blindly use our replacement.
     REPLACE_REMOVE=1
-    AC_LIBOBJ([remove])
   else
     dnl C89 requires remove(), but only POSIX requires it to handle
     dnl directories.  On mingw, directories fails with EPERM.
@@ -33,8 +31,7 @@ AC_DEFUN([gl_FUNC_REMOVE],
           esac])
        rm -rf conftest.dir])
     case $gl_cv_func_remove_dir_works in
-      *no*) REPLACE_REMOVE=1
-        AC_LIBOBJ([remove]);;
+      *no*) REPLACE_REMOVE=1;;
     esac
   fi
 ])