* modules/same-inode: New module.

* modules/dev-ino: New module.
* modules/cycle-check: Depend on these modules, rather than simply
including their .h files.
(Makefile.am): Don't list cycle-check.[ch] here, now that they're
required via m4/cycle-check.m4.
* modules/same: Depend on new same-inode module, rather than
including same-inode.h.
* modules/chdir-safer: New file.

* m4/dev-ino.m4, m4/same-inode.m4: New files.

9 files changed, 107 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index c1ff92aeef..9d5cd1a302 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2006-08-10  Jim Meyering  <jim@meyering.net>
 
+	* modules/same-inode: New module.
+	* modules/dev-ino: New module.
+	* modules/cycle-check: Depend on these modules, rather than simply
+	including their .h files.
+	(Makefile.am): Don't list cycle-check.[ch] here, now that they're
+	required via m4/cycle-check.m4.
+	* modules/same: Depend on new same-inode module, rather than
+	including same-inode.h.
+	* modules/chdir-safer: New file.
+
 	* modules/chown (Depends-on): Add stat-macros.
 
 2006-08-10  Eric Blake  <ebb9@byu.net>
diff --git a/m4/ChangeLog b/m4/ChangeLog
index d26f5dacfd..8639aecc92 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,7 @@
+2006-08-10  Jim Meyering  <jim@meyering.net>
+
+	* dev-ino.m4, same-inode.m4: New files.
+
 2006-08-09  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* argp.m4 (gl_ARGP): Require AC_C_RESTRICT.
diff --git a/m4/dev-ino.m4 b/m4/dev-ino.m4
new file mode 100644
index 0000000000..7b51d98675
--- /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 0000000000..55b3928df9
--- /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])
+])
diff --git a/modules/chdir-safer b/modules/chdir-safer
new file mode 100644
index 0000000000..ee6c6ae0f7
--- /dev/null
+++ b/modules/chdir-safer
@@ -0,0 +1,25 @@
+Description:
+like chdir, but safer
+
+Files:
+lib/chdir-safer.h
+lib/chdir-safer.c
+m4/chdir-safer.m4
+
+Depends-on:
+same-inode
+stdbool
+
+configure.ac:
+gl_CHDIR_SAFER
+
+Makefile.am:
+
+Include:
+"chdir-safer.h"
+
+License:
+GPL
+
+Maintainer:
+Jim Meyering
diff --git a/modules/cycle-check b/modules/cycle-check
index 090a701eaf..182cb01e3a 100644
--- a/modules/cycle-check
+++ b/modules/cycle-check
@@ -4,16 +4,16 @@ help detect directory cycles efficiently
 Files:
 lib/cycle-check.c
 lib/cycle-check.h
-lib/same-inode.h
-lib/dev-ino.h
+m4/cycle-check.m4
 
 Depends-on:
+dev-ino
+same-inode
 stdbool
 
 configure.ac:
 
 Makefile.am:
-lib_SOURCES += cycle-check.c cycle-check.h dev-ino.h same-inode.h
 
 Include:
 "cycle-check.h"
diff --git a/modules/dev-ino b/modules/dev-ino
new file mode 100644
index 0000000000..1ba601d584
--- /dev/null
+++ b/modules/dev-ino
@@ -0,0 +1,22 @@
+Description:
+declare a simple (device, inode) struct
+
+Files:
+lib/dev-ino.h
+m4/dev-ino.m4
+
+Depends-on:
+
+configure.ac:
+gl_STRUCT_DEV_INO
+
+Makefile.am:
+
+Include:
+"dev-ino.h"
+
+License:
+GPL
+
+Maintainer:
+Jim Meyering
diff --git a/modules/same b/modules/same
index 70b1e146e2..a3616d0f08 100644
--- a/modules/same
+++ b/modules/same
@@ -5,13 +5,13 @@ directory.
 Files:
 lib/same.h
 lib/same.c
-lib/same-inode.h
 m4/same.m4
 
 Depends-on:
 xalloc
 error
 dirname
+same-inode
 stdbool
 
 configure.ac:
diff --git a/modules/same-inode b/modules/same-inode
new file mode 100644
index 0000000000..0d349dddbb
--- /dev/null
+++ b/modules/same-inode
@@ -0,0 +1,22 @@
+Description:
+compare inodes
+
+Files:
+lib/same-inode.h
+m4/same-inode.m4
+
+Depends-on:
+
+configure.ac:
+gl_SAME_INODE
+
+Makefile.am:
+
+Include:
+"same-inode.h"
+
+License:
+LGPL
+
+Maintainer:
+Jim Meyering