X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=m4%2Ffchdir.m4;h=fd170d294470c0ae919b02c7c27d092b2a946d4f;hb=1b9bd2b9f83a84ede12622d6a040383b6bded37d;hp=caebfcbe0610cafd5ea15f1dfd7aca5028ed4c38;hpb=854ebf64dc7dae95a43a4e139e075156d2add805;p=gnulib.git

diff --git a/m4/fchdir.m4 b/m4/fchdir.m4
index caebfcbe0..fd170d294 100644
--- a/m4/fchdir.m4
+++ b/m4/fchdir.m4
@@ -1,28 +1,25 @@
-# fchdir.m4 serial 1
-dnl Copyright (C) 2006 Free Software Foundation, Inc.
+# fchdir.m4 serial 4
+dnl Copyright (C) 2006-2007 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.
 
 AC_DEFUN([gl_FUNC_FCHDIR],
 [
+  AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
   AC_CHECK_FUNCS_ONCE([fchdir])
   if test $ac_cv_func_fchdir = no; then
+    REPLACE_FCHDIR=1
     AC_LIBOBJ([fchdir])
     gl_PREREQ_FCHDIR
     AC_DEFINE([FCHDIR_REPLACEMENT], 1,
       [Define if gnulib's fchdir() replacement is used.])
-    gl_ABSOLUTE_HEADER([dirent.h])
-    ABSOLUTE_DIRENT_H=\"$gl_cv_absolute_dirent_h\"
+    gl_CHECK_NEXT_HEADERS([dirent.h])
     DIRENT_H='dirent.h'
-    UNISTD_H2='unistd.h'
   else
     DIRENT_H=
-    UNISTD_H2=
   fi
-  AC_SUBST([ABSOLUTE_DIRENT_H])
   AC_SUBST([DIRENT_H])
-  AC_SUBST([UNISTD_H2])
 ])
 
 # Prerequisites of lib/fchdir.c.