Rename module 'arg-nonnull' to 'snippet/arg-nonnull'.

* modules/snippet/arg-nonnull: Renamed from modules/arg-nonnull.
(Files, Makefile.am): Update.
* build-aux/snippet/arg-nonnull.h: Renamed from build-aux/arg-nonnull.h.
* modules/argv-iter (Depends-on): Update.
* modules/arpa_inet (Depends-on): Update.
* modules/dirent (Depends-on): Update.
* modules/fcntl-h (Depends-on): Update.
* modules/fnmatch (Depends-on): Update.
* modules/getopt-posix (Depends-on): Update.
* modules/glob (Depends-on): Update.
* modules/iconv-h (Depends-on): Update.
* modules/inttypes-incomplete (Depends-on): Update.
* modules/locale (Depends-on): Update.
* modules/math (Depends-on): Update.
* modules/netdb (Depends-on): Update.
* modules/search (Depends-on): Update.
* modules/signal (Depends-on): Update.
* modules/spawn (Depends-on): Update.
* modules/stdio (Depends-on): Update.
* modules/stdlib (Depends-on): Update.
* modules/string (Depends-on): Update.
* modules/strings (Depends-on): Update.
* modules/sys_socket (Depends-on): Update.
* modules/sys_stat (Depends-on): Update.
* modules/sys_time (Depends-on): Update.
* modules/sys_times (Depends-on): Update.
* modules/sys_utsname (Depends-on): Update.
* modules/time (Depends-on): Update.
* modules/unistd (Depends-on): Update.
* modules/wchar (Depends-on): Update.
* MODULES.html.sh (Support for building libraries and executables):
Update.

diff --git a/ChangeLog b/ChangeLog
index 0f8a15a..e300977 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,39 @@
+2011-07-12  Bruno Haible  <bruno@clisp.org>
+
+       Rename module 'arg-nonnull' to 'snippet/arg-nonnull'.
+       * modules/snippet/arg-nonnull: Renamed from modules/arg-nonnull.
+       (Files, Makefile.am): Update.
+       * build-aux/snippet/arg-nonnull.h: Renamed from build-aux/arg-nonnull.h.
+       * modules/argv-iter (Depends-on): Update.
+       * modules/arpa_inet (Depends-on): Update.
+       * modules/dirent (Depends-on): Update.
+       * modules/fcntl-h (Depends-on): Update.
+       * modules/fnmatch (Depends-on): Update.
+       * modules/getopt-posix (Depends-on): Update.
+       * modules/glob (Depends-on): Update.
+       * modules/iconv-h (Depends-on): Update.
+       * modules/inttypes-incomplete (Depends-on): Update.
+       * modules/locale (Depends-on): Update.
+       * modules/math (Depends-on): Update.
+       * modules/netdb (Depends-on): Update.
+       * modules/search (Depends-on): Update.
+       * modules/signal (Depends-on): Update.
+       * modules/spawn (Depends-on): Update.
+       * modules/stdio (Depends-on): Update.
+       * modules/stdlib (Depends-on): Update.
+       * modules/string (Depends-on): Update.
+       * modules/strings (Depends-on): Update.
+       * modules/sys_socket (Depends-on): Update.
+       * modules/sys_stat (Depends-on): Update.
+       * modules/sys_time (Depends-on): Update.
+       * modules/sys_times (Depends-on): Update.
+       * modules/sys_utsname (Depends-on): Update.
+       * modules/time (Depends-on): Update.
+       * modules/unistd (Depends-on): Update.
+       * modules/wchar (Depends-on): Update.
+       * MODULES.html.sh (Support for building libraries and executables):
+       Update.
+
 2011-07-12  Paul Eggert  <eggert@cs.ucla.edu>
 
        Improvements on _Noreturn and related modules.

diff --git a/MODULES.html.sh b/MODULES.html.sh
index 464f1d8..e5c476a 100755 (executable)
--- a/MODULES.html.sh
+++ b/MODULES.html.sh
@@ -3439,7 +3439,7 @@ func_all_modules ()
 
   func_begin_table
   func_module absolute-header
-  func_module arg-nonnull
+  func_module snippet/arg-nonnull
   func_module config-h
   func_module configmake
   func_module dummy

diff --git a/build-aux/arg-nonnull.h b/build-aux/arg-nonnull.h
deleted file mode 100644 (file)
index b6c46e8..0000000
--- a/build-aux/arg-nonnull.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* A C macro for declaring that specific arguments must not be NULL.
-   Copyright (C) 2009-2011 Free Software Foundation, Inc.
-
-   This program is free software: you can redistribute it and/or modify it
-   under the terms of the GNU Lesser General Public License as published
-   by the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-/* _GL_ARG_NONNULL((n,...,m)) tells the compiler and static analyzer tools
-   that the values passed as arguments n, ..., m must be non-NULL pointers.
-   n = 1 stands for the first argument, n = 2 for the second argument etc.  */
-#ifndef _GL_ARG_NONNULL
-# if (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || __GNUC__ > 3
-#  define _GL_ARG_NONNULL(params) __attribute__ ((__nonnull__ params))
-# else
-#  define _GL_ARG_NONNULL(params)
-# endif
-#endif

diff --git a/build-aux/snippet/arg-nonnull.h b/build-aux/snippet/arg-nonnull.h
new file mode 100644 (file)
index 0000000..b6c46e8
--- /dev/null
+++ b/build-aux/snippet/arg-nonnull.h
@@ -0,0 +1,26 @@
+/* A C macro for declaring that specific arguments must not be NULL.
+   Copyright (C) 2009-2011 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify it
+   under the terms of the GNU Lesser General Public License as published
+   by the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* _GL_ARG_NONNULL((n,...,m)) tells the compiler and static analyzer tools
+   that the values passed as arguments n, ..., m must be non-NULL pointers.
+   n = 1 stands for the first argument, n = 2 for the second argument etc.  */
+#ifndef _GL_ARG_NONNULL
+# if (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || __GNUC__ > 3
+#  define _GL_ARG_NONNULL(params) __attribute__ ((__nonnull__ params))
+# else
+#  define _GL_ARG_NONNULL(params)
+# endif
+#endif

diff --git a/modules/arg-nonnull b/modules/arg-nonnull
deleted file mode 100644 (file)
index d4e4d13..0000000
--- a/modules/arg-nonnull
+++ /dev/null
@@ -1,39 +0,0 @@
-Description:
-A C macro for declaring that specific arguments must not be NULL.
-
-Applicability:
-all
-
-Files:
-build-aux/arg-nonnull.h
-
-Depends-on:
-
-configure.ac:
-
-Makefile.am:
-# The BUILT_SOURCES created by this Makefile snippet are not used via #include
-# statements but through direct file reference. Therefore this snippet must be
-# present in all Makefile.am that need it. This is ensured by the applicability
-# 'all' defined above.
-
-BUILT_SOURCES += arg-nonnull.h
-# The arg-nonnull.h that gets inserted into generated .h files is the same as
-# build-aux/arg-nonnull.h, except that it has the copyright header cut off.
-arg-nonnull.h: $(top_srcdir)/build-aux/arg-nonnull.h
-       $(AM_V_GEN)rm -f $@-t $@ && \
-       sed -n -e '/GL_ARG_NONNULL/,$$p' \
-         < $(top_srcdir)/build-aux/arg-nonnull.h \
-         > $@-t && \
-       mv $@-t $@
-MOSTLYCLEANFILES += arg-nonnull.h arg-nonnull.h-t
-
-ARG_NONNULL_H=arg-nonnull.h
-
-Include:
-
-License:
-LGPLv2+
-
-Maintainer:
-Bruno Haible

diff --git a/modules/argv-iter b/modules/argv-iter
index 3844b8a..8802e8f 100644 (file)
--- a/modules/argv-iter
+++ b/modules/argv-iter
@@ -6,8 +6,8 @@ lib/argv-iter.c
 lib/argv-iter.h
 
 Depends-on:
-arg-nonnull
 getdelim
+snippet/arg-nonnull
 stdbool
 
 configure.ac:

diff --git a/modules/arpa_inet b/modules/arpa_inet
index 73eb989..0be145e 100644 (file)
--- a/modules/arpa_inet
+++ b/modules/arpa_inet
@@ -6,9 +6,9 @@ lib/arpa_inet.in.h
 m4/arpa_inet_h.m4
 
 Depends-on:
-arg-nonnull
 c++defs
 include_next
+snippet/arg-nonnull
 sys_socket
 warn-on-use
 

diff --git a/modules/dirent b/modules/dirent
index 9dd4514..52969d7 100644 (file)
--- a/modules/dirent
+++ b/modules/dirent
@@ -7,9 +7,9 @@ m4/dirent_h.m4
 m4/unistd_h.m4
 
 Depends-on:
-arg-nonnull
 c++defs
 include_next
+snippet/arg-nonnull
 warn-on-use
 
 configure.ac:

diff --git a/modules/fcntl-h b/modules/fcntl-h
index 42a9147..cb7f947 100644 (file)
--- a/modules/fcntl-h
+++ b/modules/fcntl-h
@@ -7,10 +7,10 @@ m4/fcntl_h.m4
 m4/fcntl-o.m4
 
 Depends-on:
-arg-nonnull
 c++defs
 extensions
 include_next
+snippet/arg-nonnull
 unistd
 warn-on-use
 

diff --git a/modules/fnmatch b/modules/fnmatch
index 8a46af2..a5a49f9 100644 (file)
--- a/modules/fnmatch
+++ b/modules/fnmatch
@@ -9,8 +9,8 @@ m4/mbstate_t.m4
 m4/fnmatch.m4
 
 Depends-on:
-arg-nonnull
 extensions
+snippet/arg-nonnull
 alloca          [test -n "$FNMATCH_H"]
 stdbool         [test -n "$FNMATCH_H"]
 wchar           [test -n "$FNMATCH_H"]

diff --git a/modules/getopt-posix b/modules/getopt-posix
index 5da0b47..89b7a54 100644 (file)
--- a/modules/getopt-posix
+++ b/modules/getopt-posix
@@ -12,7 +12,7 @@ Depends-on:
 unistd
 extensions
 include_next
-arg-nonnull
+snippet/arg-nonnull
 gettext-h       [test $REPLACE_GETOPT = 1]
 
 configure.ac:

diff --git a/modules/glob b/modules/glob
index 2abadc0..02b0282 100644 (file)
--- a/modules/glob
+++ b/modules/glob
@@ -9,9 +9,9 @@ lib/glob.c
 m4/glob.m4
 
 Depends-on:
-arg-nonnull
 c++defs
 extensions
+snippet/arg-nonnull
 warn-on-use
 alloca          [test -n "$GLOB_H"]
 d-type          [test -n "$GLOB_H"]

diff --git a/modules/iconv-h b/modules/iconv-h
index 299cf6e..8984d30 100644 (file)
--- a/modules/iconv-h
+++ b/modules/iconv-h
@@ -8,7 +8,7 @@ m4/iconv_h.m4
 Depends-on:
 include_next
 c++defs
-arg-nonnull
+snippet/arg-nonnull
 warn-on-use
 
 configure.ac:

diff --git a/modules/inttypes-incomplete b/modules/inttypes-incomplete
index ef743dd..628a068 100644 (file)
--- a/modules/inttypes-incomplete
+++ b/modules/inttypes-incomplete
@@ -6,9 +6,9 @@ lib/inttypes.in.h
 m4/inttypes.m4
 
 Depends-on:
-arg-nonnull
 include_next
 multiarch
+snippet/arg-nonnull
 stdint
 warn-on-use
 

diff --git a/modules/locale b/modules/locale
index a24b370..70e5e28 100644 (file)
--- a/modules/locale
+++ b/modules/locale
@@ -6,10 +6,10 @@ lib/locale.in.h
 m4/locale_h.m4
 
 Depends-on:
-arg-nonnull
 c++defs
 extensions
 include_next
+snippet/arg-nonnull
 stddef
 warn-on-use
 

diff --git a/modules/math b/modules/math
index 04d05f6..b4ea6fb 100644 (file)
--- a/modules/math
+++ b/modules/math
@@ -6,9 +6,9 @@ lib/math.in.h
 m4/math_h.m4
 
 Depends-on:
-arg-nonnull
 c++defs
 include_next
+snippet/arg-nonnull
 warn-on-use
 
 configure.ac:

diff --git a/modules/netdb b/modules/netdb
index 9540601..5e3dee5 100644 (file)
--- a/modules/netdb
+++ b/modules/netdb
@@ -8,7 +8,7 @@ m4/netdb_h.m4
 Depends-on:
 c++defs
 include_next
-arg-nonnull
+snippet/arg-nonnull
 warn-on-use
 sys_socket
 

diff --git a/modules/pselect b/modules/pselect
index 73c1e9f..fa69c53 100644 (file)
--- a/modules/pselect
+++ b/modules/pselect
@@ -23,7 +23,7 @@ Include:
 <sys/select.h>
 
 Link:
-$(LIBSOCKET)
+$(LIBSOCKET) $(LIB_PTHREAD_SIGMASK)
 
 License:
 LGPLv2+

diff --git a/modules/pselect-tests b/modules/pselect-tests
index 0a405fc..a5fd9ff 100644 (file)
--- a/modules/pselect-tests
+++ b/modules/pselect-tests
@@ -9,4 +9,4 @@ configure.ac:
 Makefile.am:
 TESTS += test-pselect
 check_PROGRAMS += test-pselect
-test_pselect_LDADD = $(LDADD) @LIBSOCKET@ $(INET_PTON_LIB)
+test_pselect_LDADD = $(LDADD) @LIBSOCKET@ @LIB_PTHREAD_SIGMASK@ $(INET_PTON_LIB)

diff --git a/modules/search b/modules/search
index 16de9ea..e4e064e 100644 (file)
--- a/modules/search
+++ b/modules/search
@@ -6,9 +6,9 @@ lib/search.in.h
 m4/search_h.m4
 
 Depends-on:
-arg-nonnull
 c++defs
 include_next
+snippet/arg-nonnull
 warn-on-use
 
 configure.ac:

diff --git a/modules/signal b/modules/signal
index 785da78..d70302e 100644 (file)
--- a/modules/signal
+++ b/modules/signal
@@ -6,9 +6,9 @@ lib/signal.in.h
 m4/signal_h.m4
 
 Depends-on:
-arg-nonnull
 c++defs
 include_next
+snippet/arg-nonnull
 warn-on-use
 extensions
 

diff --git a/modules/snippet/arg-nonnull b/modules/snippet/arg-nonnull
new file mode 100644 (file)
index 0000000..a85a5e2
--- /dev/null
+++ b/modules/snippet/arg-nonnull
@@ -0,0 +1,40 @@
+Description:
+A C macro for declaring that specific arguments must not be NULL.
+
+Applicability:
+all
+
+Files:
+build-aux/snippet/arg-nonnull.h
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+# The BUILT_SOURCES created by this Makefile snippet are not used via #include
+# statements but through direct file reference. Therefore this snippet must be
+# present in all Makefile.am that need it. This is ensured by the applicability
+# 'all' defined above.
+
+BUILT_SOURCES += arg-nonnull.h
+# The arg-nonnull.h that gets inserted into generated .h files is the same as
+# build-aux/snippet/arg-nonnull.h, except that it has the copyright header cut
+# off.
+arg-nonnull.h: $(top_srcdir)/build-aux/snippet/arg-nonnull.h
+       $(AM_V_GEN)rm -f $@-t $@ && \
+       sed -n -e '/GL_ARG_NONNULL/,$$p' \
+         < $(top_srcdir)/build-aux/snippet/arg-nonnull.h \
+         > $@-t && \
+       mv $@-t $@
+MOSTLYCLEANFILES += arg-nonnull.h arg-nonnull.h-t
+
+ARG_NONNULL_H=arg-nonnull.h
+
+Include:
+
+License:
+LGPLv2+
+
+Maintainer:
+Bruno Haible

diff --git a/modules/spawn b/modules/spawn
index 718a61e..650d260 100644 (file)
--- a/modules/spawn
+++ b/modules/spawn
@@ -6,10 +6,10 @@ lib/spawn.in.h
 m4/spawn_h.m4
 
 Depends-on:
-arg-nonnull
 c++defs
 include_next
 sched
+snippet/arg-nonnull
 warn-on-use
 
 configure.ac:

diff --git a/modules/stdio b/modules/stdio
index c524d73..fdae894 100644 (file)
--- a/modules/stdio
+++ b/modules/stdio
@@ -7,8 +7,8 @@ m4/stdio_h.m4
 
 Depends-on:
 include_next
-arg-nonnull
 c++defs
+snippet/arg-nonnull
 stddef
 warn-on-use
 

diff --git a/modules/stdlib b/modules/stdlib
index 0ec07fb..c049763 100644 (file)
--- a/modules/stdlib
+++ b/modules/stdlib
@@ -7,9 +7,9 @@ m4/stdlib_h.m4
 
 Depends-on:
 _Noreturn
-arg-nonnull
 c++defs
 include_next
+snippet/arg-nonnull
 stddef
 unistd
 warn-on-use

diff --git a/modules/string b/modules/string
index 62f2634..f457ab1 100644 (file)
--- a/modules/string
+++ b/modules/string
@@ -6,10 +6,10 @@ lib/string.in.h
 m4/string_h.m4
 
 Depends-on:
-arg-nonnull
 c++defs
 extensions
 include_next
+snippet/arg-nonnull
 stddef
 warn-on-use
 

diff --git a/modules/strings b/modules/strings
index 87bccc4..3c4de90 100644 (file)
--- a/modules/strings
+++ b/modules/strings
@@ -6,9 +6,9 @@ lib/strings.in.h
 m4/strings_h.m4
 
 Depends-on:
-arg-nonnull
 c++defs
 include_next
+snippet/arg-nonnull
 warn-on-use
 
 configure.ac:

diff --git a/modules/sys_socket b/modules/sys_socket
index e76bcee..b78e782 100644 (file)
--- a/modules/sys_socket
+++ b/modules/sys_socket
@@ -8,10 +8,10 @@ m4/sockpfaf.m4
 
 Depends-on:
 alignof
-arg-nonnull
 c++defs
 errno
 include_next
+snippet/arg-nonnull
 socklen
 sys_uio
 warn-on-use

diff --git a/modules/sys_stat b/modules/sys_stat
index b646188..baa531b 100644 (file)
--- a/modules/sys_stat
+++ b/modules/sys_stat
@@ -7,9 +7,9 @@ m4/sys_stat_h.m4
 m4/unistd_h.m4
 
 Depends-on:
-arg-nonnull
 c++defs
 include_next
+snippet/arg-nonnull
 time
 warn-on-use
 

diff --git a/modules/sys_time b/modules/sys_time
index 6e2b33a..ca5862d 100644 (file)
--- a/modules/sys_time
+++ b/modules/sys_time
@@ -7,8 +7,8 @@ m4/sys_time_h.m4
 
 Depends-on:
 include_next
-arg-nonnull
 c++defs
+snippet/arg-nonnull
 warn-on-use
 
 configure.ac:

diff --git a/modules/sys_times b/modules/sys_times
index 936d320..5d289d1 100644 (file)
--- a/modules/sys_times
+++ b/modules/sys_times
@@ -6,8 +6,8 @@ lib/sys_times.in.h
 m4/sys_times_h.m4
 
 Depends-on:
-arg-nonnull
 include_next
+snippet/arg-nonnull
 warn-on-use
 
 configure.ac:

diff --git a/modules/sys_utsname b/modules/sys_utsname
index 4d30baa..8e6ed6a 100644 (file)
--- a/modules/sys_utsname
+++ b/modules/sys_utsname
@@ -6,8 +6,8 @@ lib/sys_utsname.in.h
 m4/sys_utsname_h.m4
 
 Depends-on:
-arg-nonnull
 include_next
+snippet/arg-nonnull
 warn-on-use
 
 configure.ac:

diff --git a/modules/time b/modules/time
index 46a1e10..4af57fd 100644 (file)
--- a/modules/time
+++ b/modules/time
@@ -8,8 +8,8 @@ m4/time_h.m4
 Depends-on:
 extensions
 include_next
-arg-nonnull
 c++defs
+snippet/arg-nonnull
 warn-on-use
 stddef
 

diff --git a/modules/unistd b/modules/unistd
index 1849de8..48c7c04 100644 (file)
--- a/modules/unistd
+++ b/modules/unistd
@@ -6,9 +6,9 @@ m4/unistd_h.m4
 lib/unistd.in.h
 
 Depends-on:
-arg-nonnull
 c++defs
 include_next
+snippet/arg-nonnull
 stddef
 warn-on-use
 

diff --git a/modules/wchar b/modules/wchar
index 1e96e2f..6efec9f 100644 (file)
--- a/modules/wchar
+++ b/modules/wchar
@@ -7,9 +7,9 @@ m4/wchar_h.m4
 m4/wint_t.m4
 
 Depends-on:
-arg-nonnull
 c++defs
 include_next
+snippet/arg-nonnull
 stddef
 warn-on-use