summaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
Diffstat (limited to 'm4')
-rw-r--r--m4/ChangeLog7
-rw-r--r--m4/cycle-check.m46
-rw-r--r--m4/dev-ino.m410
-rw-r--r--m4/same-inode.m410
4 files changed, 31 insertions, 2 deletions
diff --git a/m4/ChangeLog b/m4/ChangeLog
index 75fe4ab98..f5c55d13d 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,10 @@
+2006-08-10 Jim Meyering <jim@meyering.net>
+
+ Update from gnulib.
+ * cycle-check.m4 (gl_CYCLE_CHECK): Don't mention same-inode.h.
+ Require gl_STRUCT_DEV_INO and gl_SAME_INODE.
+ * dev-ino.m4, same-inode.m4: New files.
+
2006-08-10 Paul Eggert <eggert@cs.ucla.edu>
Accommodate new getaddrinfo implementation in gnulib.
diff --git a/m4/cycle-check.m4 b/m4/cycle-check.m4
index c7fe046e9..613b0a931 100644
--- a/m4/cycle-check.m4
+++ b/m4/cycle-check.m4
@@ -1,4 +1,4 @@
-#serial 2
+#serial 3
dnl Copyright (C) 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,
@@ -6,9 +6,11 @@ dnl with or without modifications, as long as this notice is preserved.
AC_DEFUN([gl_CYCLE_CHECK],
[
- AC_LIBSOURCES([cycle-check.c, cycle-check.h, same-inode.h])
+ AC_LIBSOURCES([cycle-check.c, cycle-check.h])
AC_LIBOBJ([cycle-check])
dnl Prerequisites.
AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])
+ AC_REQUIRE([gl_STRUCT_DEV_INO])
+ AC_REQUIRE([gl_SAME_INODE])
])
diff --git a/m4/dev-ino.m4 b/m4/dev-ino.m4
new file mode 100644
index 000000000..7b51d9867
--- /dev/null
+++ b/m4/dev-ino.m4
@@ -0,0 +1,10 @@
+#serial 1
+dnl Copyright (C) 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.
+
+AC_DEFUN([gl_STRUCT_DEV_INO],
+[
+ AC_LIBSOURCES([dev-ino.h])
+])
diff --git a/m4/same-inode.m4 b/m4/same-inode.m4
new file mode 100644
index 000000000..55b3928df
--- /dev/null
+++ b/m4/same-inode.m4
@@ -0,0 +1,10 @@
+#serial 1
+dnl Copyright (C) 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.
+
+AC_DEFUN([gl_SAME_INODE],
+[
+ AC_LIBSOURCES([same-inode.h])
+])