Move the module indicator macros to the module description.

8 files changed, 24 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index 12c57ec6d1..f0658a300e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
 2007-01-08  Bruno Haible  <bruno@clisp.org>
 
+	* m4/close-stream.m4 (gl_CLOSE_STREAM): Remove GNULIB_CLOSE_STREAM
+	macro definition.
+	* m4/fcntl-safer.m4 (gl_FCNTL_SAFER): Remove GNULIB_FCNTL_SAFER macro
+	definition.
+	* m4/stdio-safer.m4 (gl_FOPEN_SAFER): Remove GNULIB_FOPEN_SAFER macro
+	definition.
+	* modules/close-stream (configure.ac): Invoke gl_MODULE_INDICATOR.
+	* modules/fcntl-safer (configure.ac): Likewise.
+	* modules/fopen-safer (configure.ac): Likewise.
+	* modules/fwriteerror (configure.ac): Likewise. Remove explicit
+	GNULIB_FWRITEERROR macro definition.
+
+2007-01-08  Bruno Haible  <bruno@clisp.org>
+
 	* m4/gnulib-common.m4: New file.
 	* gnulib-tool (func_get_autoconf_snippet): Undo last change.
 	(func_get_filelist): Add m4/gnulib-common.m4.
diff --git a/m4/close-stream.m4 b/m4/close-stream.m4
index 9daed9ec77..b1f9d5477c 100644
--- a/m4/close-stream.m4
+++ b/m4/close-stream.m4
@@ -1,5 +1,5 @@
-#serial 2
-dnl Copyright (C) 2006 Free Software Foundation, Inc.
+#serial 3
+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.
@@ -7,8 +7,6 @@ dnl with or without modifications, as long as this notice is preserved.
 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.
   :
diff --git a/m4/fcntl-safer.m4 b/m4/fcntl-safer.m4
index 143466e412..3475b0a7cf 100644
--- a/m4/fcntl-safer.m4
+++ b/m4/fcntl-safer.m4
@@ -1,5 +1,5 @@
-#serial 4
-dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+#serial 5
+dnl Copyright (C) 2005-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.
@@ -8,6 +8,4 @@ AC_DEFUN([gl_FCNTL_SAFER],
 [
   AC_LIBOBJ([open-safer])
   AC_LIBOBJ([creat-safer])
-  AC_DEFINE([GNULIB_FCNTL_SAFER], [1],
-    [Define to 1 when using the gnulib fcntl-safer module.])
 ])
diff --git a/m4/stdio-safer.m4 b/m4/stdio-safer.m4
index 5227db2621..3d71452ea9 100644
--- a/m4/stdio-safer.m4
+++ b/m4/stdio-safer.m4
@@ -1,5 +1,5 @@
-#serial 9
-dnl Copyright (C) 2002, 2005, 2006 Free Software Foundation, Inc.
+#serial 10
+dnl Copyright (C) 2002, 2005-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.
@@ -7,8 +7,6 @@ dnl with or without modifications, as long as this notice is preserved.
 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],
diff --git a/modules/close-stream b/modules/close-stream
index 75f96f8208..03eba124d5 100644
--- a/modules/close-stream
+++ b/modules/close-stream
@@ -12,6 +12,7 @@ stdbool
 
 configure.ac:
 gl_CLOSE_STREAM
+gl_MODULE_INDICATOR([close-stream])
 
 Makefile.am:
 
diff --git a/modules/fcntl-safer b/modules/fcntl-safer
index 942b6b7ae9..ecd0500901 100644
--- a/modules/fcntl-safer
+++ b/modules/fcntl-safer
@@ -13,6 +13,7 @@ unistd-safer
 
 configure.ac:
 gl_FCNTL_SAFER
+gl_MODULE_INDICATOR([fcntl-safer])
 
 Makefile.am:
 
diff --git a/modules/fopen-safer b/modules/fopen-safer
index 137332e92b..087e045c2c 100644
--- a/modules/fopen-safer
+++ b/modules/fopen-safer
@@ -12,6 +12,7 @@ unistd-safer
 
 configure.ac:
 gl_FOPEN_SAFER
+gl_MODULE_INDICATOR([fopen-safer])
 
 Makefile.am:
 
diff --git a/modules/fwriteerror b/modules/fwriteerror
index b67a45aa8d..f69afc96b6 100644
--- a/modules/fwriteerror
+++ b/modules/fwriteerror
@@ -9,8 +9,7 @@ Depends-on:
 stdbool
 
 configure.ac:
-AC_DEFINE([GNULIB_FWRITEERROR], 1,
-  [Define to 1 when using the gnulib fwriteerror module.])
+gl_MODULE_INDICATOR([fwriteerror])
 
 Makefile.am:
 lib_SOURCES += fwriteerror.h fwriteerror.c