* mkdir-p.m4 (gl_MKDIR_PARENTS): Require gl_FUNC_LCHMOD and gl_CHDIR_SAFER.

* chdir-safer.m4: New file.

diff --git a/m4/ChangeLog b/m4/ChangeLog
index 38ab033..f67761d 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,14 @@
+2006-02-22  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       Sync from coreutils.
+       * mkdir-p.m4 (gl_MKDIR_PARENTS): Require gl_FUNC_LCHMOD and
+       gl_CHDIR_SAFER.
+
+2006-02-22  Jim Meyering  <jim@meyering.net>
+
+       Sync from coreutils.
+       * chdir-safer.m4: New file.
+
 2006-02-17  Eric Blake  <address@hidden>
 
        * getaddrinfo.m4 (gl_GETADDRINFO): Fix caching error.
@@ -113,7 +124,6 @@
 2006-01-09  Jim Meyering  <jim@meyering.net>
 
        Sync from coreutils.
-       * chdir-safer.m4: New file.
        * openat.m4 (gl_FUNC_OPENAT): Require and compile mkdirat.c.
        Require openat-priv.h.
 

diff --git a/m4/chdir-safer.m4 b/m4/chdir-safer.m4
new file mode 100644 (file)
index 0000000..f3d7351
--- /dev/null
+++ b/m4/chdir-safer.m4
@@ -0,0 +1,11 @@
+#serial 1
+dnl Copyright (C) 2005 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_CHDIR_SAFER],
+[
+  AC_LIBSOURCES([chdir-safer.c, chdir-safer.h])
+  AC_LIBOBJ([chdir-safer])
+])

diff --git a/m4/mkdir-p.m4 b/m4/mkdir-p.m4
index 2b72c49..692ed04 100644 (file)
--- a/m4/mkdir-p.m4
+++ b/m4/mkdir-p.m4
@@ -1,5 +1,5 @@
-# mkdir-p.m4 serial 9
-dnl Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# mkdir-p.m4 serial 10
+dnl Copyright (C) 2002, 2003, 2004, 2005, 2006 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.
@@ -12,4 +12,6 @@ AC_DEFUN([gl_MKDIR_PARENTS],
   dnl Prerequisites of lib/mkdir-p.c.
   AC_REQUIRE([AC_FUNC_ALLOCA])
   AC_REQUIRE([gl_AFS])
+  AC_REQUIRE([gl_FUNC_LCHMOD])
+  AC_REQUIRE([gl_CHDIR_SAFER])
 ])