--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,10 @@
+2006-10-06  Eric Blake  <ebb9@byu.net>
+
+	Define several macros for use by the clean-temp module.
+	* close-stream.m4 (gl_CLOSE_STREAM): Define GNULIB_CLOSE_STREAM.
+	* fcntl-safer.m4 (gl_FCNTL_SAFER): Define GNULIB_FCNTL_SAFER.
+	* stdio-safer.m4 (gl_FOPEN_SAFER): Define GNULIB_FOPEN_SAFER.
+
 2006-10-05  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* lchown.m4 (gl_FUNC_LCHOWN): Check whether lchown is declared.

--- a/m4/close-stream.m4
+++ b/m4/close-stream.m4
@@ -1,3 +1,4 @@
+#serial 2
 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,
@@ -6,6 +7,8 @@
 AC_DEFUN([gl_CLOSE_STREAM],
 [
   AC_LIBOBJ([close-stream])
+  AC_DEFINE([GNULIB_CLOSE_STREAM], [1],
+    [Define to 1 when using the gnulib close-stream module.])
 
   dnl Prerequisites of lib/close-stream.c.
   :

--- a/m4/fcntl-safer.m4
+++ b/m4/fcntl-safer.m4
@@ -1,4 +1,4 @@
-#serial 3
+#serial 4
 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,
@@ -8,4 +8,6 @@
 [
   AC_LIBOBJ([open-safer])
   AC_LIBOBJ([creat-safer])
+  AC_DEFINE([GNULIB_FCNTL_SAFER], [1],
+    [Define to 1 when using the gnulib fcntl-safer module.])
 ])

--- a/m4/stdio-safer.m4
+++ b/m4/stdio-safer.m4
@@ -1,4 +1,4 @@
-#serial 8
+#serial 9
 dnl Copyright (C) 2002, 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,
@@ -7,6 +7,8 @@
 AC_DEFUN([gl_FOPEN_SAFER],
 [
   AC_LIBOBJ([fopen-safer])
+  AC_DEFINE([GNULIB_FOPEN_SAFER], [1],
+    [Define to 1 when using the gnulib fopen-safer module.])
 ])
 
 AC_DEFUN([gl_TMPFILE_SAFER],