Merge branch 'dfsg-orig' into dfsg-debian

[tar] / m4 / rmdir.m4

diff --git a/m4/rmdir.m4 b/m4/rmdir.m4
index 8d6bee8bb5a5d4c5fc340ccaecea9be13120356c..a8a113eef03846b2bf4ff5766f9c6d4c4df04162 100644 (file)
--- a/m4/rmdir.m4
+++ b/m4/rmdir.m4
@@ -1,4 +1,4 @@
-# rmdir.m4 serial 7
+# rmdir.m4 serial 8
 dnl Copyright (C) 2002, 2005, 2009-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -8,37 +8,22 @@ AC_DEFUN([gl_FUNC_RMDIR],
 [
   AC_REQUIRE([gl_AC_DOS])
   AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
-  dnl FIXME: simplify this module in 2010 if no one reports a missing rmdir
-  AC_REPLACE_FUNCS([rmdir])
-  if test $ac_cv_func_rmdir = no; then
-    REPLACE_RMDIR=1
-    # If someone lacks rmdir, make configure fail, and request
-    # a bug report to inform us about it.
-    if test x"$SKIP_RMDIR_CHECK" != xyes; then
-      AC_MSG_FAILURE([Your system lacks the rmdir function.
-              Please report this, along with the output of "uname -a", to the
-              bug-coreutils@gnu.org mailing list.  To continue past this point,
-              rerun configure with SKIP_RMDIR_CHECK=yes.
-              E.g., ./configure SKIP_RMDIR_CHECK=yes])
-    fi
-  else
-    dnl Detect cygwin 1.5.x bug.
-    AC_CACHE_CHECK([whether rmdir works], [gl_cv_func_rmdir_works],
-      [mkdir conftest.dir
-       touch conftest.file
-       AC_RUN_IFELSE(
-         [AC_LANG_PROGRAM(
-           [[#include <stdio.h>
-             #include <errno.h>
-             #include <unistd.h>
+  dnl Detect cygwin 1.5.x bug.
+  AC_CACHE_CHECK([whether rmdir works], [gl_cv_func_rmdir_works],
+    [mkdir conftest.dir
+     touch conftest.file
+     AC_RUN_IFELSE(
+       [AC_LANG_PROGRAM(
+         [[#include <stdio.h>
+           #include <errno.h>
+           #include <unistd.h>
 ]], [[return !rmdir ("conftest.file/") || errno != ENOTDIR
        || !rmdir ("conftest.dir/./");]])],
-         [gl_cv_func_rmdir_works=yes], [gl_cv_func_rmdir_works=no],
-         [gl_cv_func_rmdir_works="guessing no"])
-       rm -rf conftest.dir conftest.file])
-    if test x"$gl_cv_func_rmdir_works" != xyes; then
-      REPLACE_RMDIR=1
-      AC_LIBOBJ([rmdir])
-    fi
+       [gl_cv_func_rmdir_works=yes], [gl_cv_func_rmdir_works=no],
+       [gl_cv_func_rmdir_works="guessing no"])
+     rm -rf conftest.dir conftest.file])
+  if test x"$gl_cv_func_rmdir_works" != xyes; then
+    REPLACE_RMDIR=1
+    AC_LIBOBJ([rmdir])
   fi
 ])