libposix: Revert the unreviewed part of yesterday's big merge.

Back out yesterday's big merge from the libposix branch, except for the
openat-die.c change that was reviewed and approved by Paul Eggert.
Put the ChangeLog entry at the top, to reflect the order of changes in the
master branch.

Author: brkorb

.gitignore

@@ -6,5 +6,3 @@
 allsnippets.tmp
 amsnippet.tmp
 testdir*
-*.diff
-*.patch

ChangeLog

@@ -4,6 +4,14 @@
 	* m4/setenv.m4 (gl_FUNC_UNSETENV): Also detect Haiku issue.
 	* doc/posix-functions/unsetenv.texi (unsetenv): Document it.
 
+2010-12-30  Bruce Korb  <[email protected]>
+
+	libposix: avoid calling error() within libposix
+	* lib/openat-die.c: remove error module stuff when GNULIB_LIBPOSIX
+	is defined.
+
+2011-02-05  Eric Blake  <[email protected]>
+
 	strerror_r-posix: port to cygwin
 	* lib/strerror_r.c (strerror_r) [__CYGWIN__]: Add cygwin
 	implementation.
@@ -1914,13 +1922,6 @@
 	* doc/posix-functions/gmtime_r.texi: Document the HP-UX 11 problem.
 	* doc/posix-functions/localtime_r.texi: Likewise.
 
-2010-12-30  Bruce Korb  <[email protected]>
-
-	libposix: avoid calling error() within libposix
-	* lib/openat-die.c: remove error module stuff when GNULIB_LIBPOSIX
-	is defined.
-	* lib/xalloc-die.c: Same thing.
-
 2010-12-29  Eric Blake  <[email protected]>
 
 	mountlist: tweak previous commit
@@ -3566,13 +3567,6 @@
 	* lib/ftoastr.h, lib/ftoastr.c, lib/dtoastr.c, lib/ldtoastr.c:
 	* modules/ftoastr: New files.
 
-2010-11-16  Bruce Korb  <[email protected]>
-
-	libposix: Libposix module will be created on the fly
-	* modules/libposix: remove
-	* modules/*: Use pkginclude_HEADERS instead of plain "include".
-	* gnulib-tool: adjust here, too
-
 2010-11-15  Paul Eggert  <[email protected]>
 
 	bootstrap: port to Solaris sed
@@ -4152,74 +4146,6 @@
 	and use malloc rather than the stack for the same reason as
 	mentioned in the comment justifying the other allocation.
 
-2010-10-12  Gary V. Vaughan  <[email protected]>
-
-	libposix: use git-version-gen for version numbering
-	* build-aux/git-version-gen: In order to work inside the
-	libposix subdirectory, also check the parent directory for .git
-	before assuming git describe will not work.
-
-	add _HEADERS primaries to Makefile.am snippets for installable headers
-	* modules/alloca-opt, modules/arg-nonnull, modules/argz,
-	modules/arpa_inet, modules/byteswap, modules/c++defs, modules/ctype,
-	modules/dirent, modules/errno, modules/fcntl-h, modules/float,
-	modules/fnmatch, modules/getopt-posix, modules/glob, modules/iconv-h,
-	modules/iconv_open, modules/inttypes, modules/langinfo,
-	modules/link-warning, modules/locale, modules/math, modules/netdb,
-	modules/netinet_in, modules/poll-h, modules/pthread, modules/pty,
-	modules/sched, modules/search, modules/selinux-h, modules/signal,
-	modules/spawn, modules/stdarg, modules/stdbool, modules/stddef,
-	modules/stdint, modules/stdio, modules/stdlib, modules/string,
-	modules/strings, modules/sys_file, modules/sys_ioctl,
-	modules/sys_select, modules/sys_socket, modules/sys_stat,
-	modules/sys_time, modules/sys_times, modules/sys_utsname,
-	modules/sys_wait, modules/sysexits, modules/termios, modules/time,
-	modules/unistd, modules/unitypes, modules/unused-parameter,
-	modules/warn-on-use, modules/wchar, modules/wctype (Makefile.am):
-	Add nodist_include_HEADERS, nobase_nodist_include_HEADERS and
-	EXTRA_HEADERS declarations for potentially installable header files.
-	* gnulib-tool: Initialize nodist_include_HEADERS,
-	nobase_nodist_include_HEADERS and EXTRA_HEADERS to prime for new
-	`.*_HEADERS +=' declarations.
-	(func_emit_lib_Makefile_am): Edit away new nodist_include_HEADERS,
-	nobase_nodist_include_HEADERS and EXTRA_HEADERS declarations by
-	default, reverting the Makefile.am snippets above to their original
-	condition prior to this change *unless* the gnulib library is being
-	installed.
-
-	New module `libposix'.
-	* modules/libposix: New module to facilitate an installable
-	library of posix modules.
-	(Makefile.am): Use lib_LTLIBRARIES to mark libposix.la as
-	installable.
-	(Depends-On): List all the modules found by `posix-modules',
-	except `strdup' which is spurious, and with the addition of
-	`alloca' to satisfy an otherwise undefined LTALLOCA definition;
-	and `progname' to provide a non-extern program_name symbol so that
-	compilation with `-no-undefined' symbols can work.
-
-	iconv_open: reduce not-trivial repetition of file-list
-	* modules/iconv_open (iconv_headers): New make macro to hold list of
-	iconv header files.
-	(BUILT_SOURCES, MAINTAINERCLEANFILES, EXTRA_DIST): Use it instead of
-	multiple hard-coded copies.
-
-	gnulib-tool: transform hard-coded libgnu.a to $libname.l?a
-	* gnulib-tool (func_emit_lib_Makefile_am): transform hard-coded
-	`libgnu.a' in Makefile.am snippets to be either `$libname.a' or
-	`$libname.la', depending on whether --libtool/--no-libtool options
-	were given.
-
-2010-10-12  Sam Steingold  <[email protected]>
-	    Gary V. Vaughan  <[email protected]>
-
-	gnulib-tool: transform include guards with `--macro-prefix'
-	* gnulib-tool (func_import): support multiple gllib directories:
-	headers are generated for each gllib differently, depending on which
-	features are actually used, so we need to be able to include all
-	these generated headers without fear that one will shadow another,
-	so we prepend the macro-prefix before the guard macros.
-
 2010-10-11  Bruno Haible  <[email protected]>
 
 	stdlib: Allow multiple gnulib generated replacements to coexist.

gnulib-tool

@@ -2815,11 +2815,6 @@ func_emit_lib_Makefile_am ()
   echo
   uses_subdirs=
   {
-    if test false = "$libtool"; then
-      sed_transform_libgnu_a="s, libgnu\\.a, $libname.a,g"
-    else
-      sed_transform_libgnu_a="s, libgnu\\.a, $libname.la,g"
-    fi
     for module in $modules; do
       func_verify_nontests_module
       if test -n "$module"; then
@@ -2832,7 +2827,6 @@ func_emit_lib_Makefile_am ()
                 -e 's,lib_\([A-Z][A-Z]*\),'"${libname}_${libext}"'_\1,g' \
                 -e 's,lib%_LIBRARIES,lib_LIBRARIES,g' \
                 -e 's,lib%_LTLIBRARIES,lib_LTLIBRARIES,g' \
-		-e "$sed_transform_libgnu_a" \
                 -e "$sed_transform_check_PROGRAMS"
           if test "$module" = 'alloca'; then
             echo "${libname}_${libext}_LIBADD += @${perhapsLT}ALLOCA@"
@@ -2872,8 +2866,6 @@ func_emit_lib_Makefile_am ()
   echo
   if test -z "$makefile_name"; then
     echo "SUBDIRS ="
-    echo "nodist_pkginclude_HEADERS ="
-    echo "nobase_nodist_pkginclude_HEADERS ="
     echo "noinst_HEADERS ="
     echo "noinst_LIBRARIES ="
     echo "noinst_LTLIBRARIES ="
@@ -2883,7 +2875,6 @@ func_emit_lib_Makefile_am ()
       echo "pkgdata_DATA ="
     fi
     echo "EXTRA_DIST ="
-    echo "EXTRA_HEADERS ="
     echo "BUILT_SOURCES ="
     echo "SUFFIXES ="
   fi
@@ -2923,18 +2914,11 @@ func_emit_lib_Makefile_am ()
           && test -f "$sourcebase/Makefile.am" \
           && LC_ALL=C grep "^[a-zA-Z0-9_]*_${perhapsLT}LIBRARIES *+\{0,1\}= *$libname\\.$libext\$" "$sourcebase/Makefile.am" > /dev/null; \
         }; then
-    # Install associated header files, per module Makefile.am snippets.
-    sed_transform_HEADERS_primaries="$sed_noop"
     # One of the snippets or the user's Makefile.am already specifies an
     # installation location for the library. Don't confuse automake by saying
     # it should not be installed.
     :
   else
-    # Don't install header files when generated library is not installed.
-    sed_transform_HEADERS_primaries="\
-        /^\(nobase_\)\{0,1\}nodist_pkginclude_HEADERS *=.*$/d
-        /^EXTRA_HEADERS *=.*$/d
-    "
     # By default, the generated library should not be installed.
     echo "noinst_${perhapsLT}LIBRARIES += $libname.$libext"
   fi
@@ -2966,8 +2950,7 @@ func_emit_lib_Makefile_am ()
     echo
   fi
   cat "$tmp"/allsnippets \
-    | sed -e 's|\$(top_srcdir)/build-aux/|$(top_srcdir)/'"$auxdir"'/|g' \
-          -e "$sed_transform_HEADERS_primaries"
+    | sed -e 's|\$(top_srcdir)/build-aux/|$(top_srcdir)/'"$auxdir"'/|g'
   echo
   echo "mostlyclean-local: mostlyclean-generic"
   echo "	@for dir in '' \$(MOSTLYCLEANDIRS); do \\"
@@ -3181,8 +3164,6 @@ func_emit_tests_Makefile_am ()
   if ! $for_test; then
     echo "check_PROGRAMS ="
   fi
-  echo "nodist_pkginclude_HEADERS ="
-  echo "nobase_nodist_pkginclude_HEADERS ="
   echo "noinst_HEADERS ="
   echo "noinst_LIBRARIES ="
   if $use_libtests; then
@@ -3198,7 +3179,6 @@ func_emit_tests_Makefile_am ()
     echo "pkgdata_DATA ="
   fi
   echo "EXTRA_DIST ="
-  echo "EXTRA_HEADERS ="
   echo "BUILT_SOURCES ="
   echo "SUFFIXES ="
   echo "MOSTLYCLEANFILES = core *.stackdump"
@@ -3867,9 +3847,6 @@ s,^\(.................................................[^ ]*\) *,
       break
     fi
   done
-  test -n "${macro_prefix}" && sed_transform_lib_file=$sed_transform_lib_file"
-    s/_GL_\(.*\)_H/_${macro_prefix}_GL_\1_H/g
-  "
   sed_transform_main_lib_file="$sed_transform_lib_file"
   if test -n "$do_copyrights"; then
     if test -n "$lgpl"; then
@@ -3908,10 +3885,6 @@ s,^\(.................................................[^ ]*\) *,
       s/version 2\(.1\)\{0,1\}\([ ,]\)/version 3\2/g
     '
   fi
-  test -n "${macro_prefix}" \
-    && sed_transform_build_aux_file=$sed_transform_build_aux_file"
-         s/_GL_\(.*\)_H/_${macro_prefix}_GL_\1_H/g
-       "
 
   # Determine script to apply to library files that go into $testsbase/.
   sed_transform_testsrelated_lib_file="$sed_transform_lib_file"

lib/xalloc-die.c

@@ -22,10 +22,7 @@
 
 #include <stdlib.h>
 
-#ifndef GNULIB_LIBPOSIX
 #include "error.h"
-#endif
-
 #include "exitfail.h"
 
 #include "gettext.h"
@@ -34,9 +31,7 @@
 void
 xalloc_die (void)
 {
-#ifndef GNULIB_LIBPOSIX
   error (exit_failure, 0, "%s", _("memory exhausted"));
-#endif
 
   /* The `noreturn' cannot be given to error, since it may return if
      its first argument is 0.  To help compilers understand the

modules/alloca-opt

@@ -13,9 +13,6 @@ configure.ac:
 gl_FUNC_ALLOCA
 
 Makefile.am:
-nodist_pkginclude_HEADERS += $(ALLOCA_H)
-EXTRA_HEADERS += alloca.h
-
 BUILT_SOURCES += $(ALLOCA_H)
 
 # We need the following in order to create <alloca.h> when the system

modules/arg-nonnull

@@ -12,8 +12,6 @@ Depends-on:
 configure.ac:
 
 Makefile.am:
-nodist_pkginclude_HEADERS += arg-nonnull.h
-
 # 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

modules/argz

@@ -18,9 +18,6 @@ configure.ac:
 gl_FUNC_ARGZ
 
 Makefile.am:
-nodist_pkginclude_HEADERS += $(ARGZ_H)
-EXTRA_HEADERS += argz.h
-
 BUILT_SOURCES += $(ARGZ_H)
 
 # We need the following in order to create <argz.h> when the system

modules/arpa_inet

@@ -17,8 +17,6 @@ gl_HEADER_ARPA_INET
 AC_PROG_MKDIR_P
 
 Makefile.am:
-nobase_nodist_pkginclude_HEADERS += arpa/inet.h
-
 BUILT_SOURCES += arpa/inet.h
 
 # We need the following in order to create <arpa/inet.h> when the system

modules/byteswap

@@ -11,9 +11,6 @@ configure.ac:
 gl_BYTESWAP
 
 Makefile.am:
-nodist_pkginclude_HEADERS += $(BYTESWAP_H)
-EXTRA_HEADERS += byteswap.h
-
 BUILT_SOURCES += $(BYTESWAP_H)
 
 # We need the following in order to create <byteswap.h> when the system

modules/c++defs

@@ -12,8 +12,6 @@ Depends-on:
 configure.ac:
 
 Makefile.am:
-nodist_pkginclude_HEADERS += c++defs.h
-
 # 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

modules/ctype

@@ -14,8 +14,6 @@ configure.ac:
 gl_CTYPE_H
 
 Makefile.am:
-nodist_pkginclude_HEADERS += ctype.h
-
 BUILT_SOURCES += ctype.h
 
 # We need the following in order to create <ctype.h> when the system

modules/dirent

@@ -16,8 +16,6 @@ configure.ac:
 gl_DIRENT_H
 
 Makefile.am:
-nodist_pkginclude_HEADERS += dirent.h
-
 BUILT_SOURCES += dirent.h
 
 # We need the following in order to create <dirent.h> when the system

modules/errno

@@ -12,9 +12,6 @@ configure.ac:
 gl_HEADER_ERRNO_H
 
 Makefile.am:
-nodist_pkginclude_HEADERS += $(ERRNO_H)
-EXTRA_HEADERS += errno.h
-
 BUILT_SOURCES += $(ERRNO_H)
 
 # We need the following in order to create <errno.h> when the system

modules/fcntl-h

@@ -18,8 +18,6 @@ configure.ac:
 gl_FCNTL_H
 
 Makefile.am:
-nodist_pkginclude_HEADERS += fcntl.h
-
 BUILT_SOURCES += fcntl.h
 
 # We need the following in order to create <fcntl.h> when the system

modules/float

@@ -12,9 +12,6 @@ configure.ac:
 gl_FLOAT_H
 
 Makefile.am:
-nodist_pkginclude_HEADERS += $(FLOAT_H)
-EXTRA_HEADERS += float.h
-
 BUILT_SOURCES += $(FLOAT_H)
 
 # We need the following in order to create <float.h> when the system

modules/fnmatch

@@ -24,9 +24,6 @@ configure.ac:
 gl_FUNC_FNMATCH_POSIX
 
 Makefile.am:
-nodist_pkginclude_HEADERS += $(FNMATCH_H)
-EXTRA_HEADERS += fnmatch.h
-
 BUILT_SOURCES += $(FNMATCH_H)
 
 # We need the following in order to create <fnmatch.h> when the system

modules/getopt-posix

@@ -19,9 +19,6 @@ configure.ac:
 gl_FUNC_GETOPT_POSIX
 
 Makefile.am:
-nodist_pkginclude_HEADERS += $(GETOPT_H)
-EXTRA_HEADERS += getopt.h
-
 BUILT_SOURCES += $(GETOPT_H)
 
 # We need the following in order to create <getopt.h> when the system

modules/glob

@@ -30,9 +30,6 @@ configure.ac:
 gl_GLOB
 
 Makefile.am:
-nodist_pkginclude_HEADERS += $(GLOB_H)
-EXTRA_HEADERS += glob.h
-
 BUILT_SOURCES += $(GLOB_H)
 
 # We need the following in order to create <glob.h> when the system

modules/iconv-h

@@ -15,9 +15,6 @@ configure.ac:
 gl_ICONV_H
 
 Makefile.am:
-nodist_pkginclude_HEADERS += $(ICONV_H)
-EXTRA_HEADERS += iconv.h
-
 BUILT_SOURCES += $(ICONV_H)
 
 # We need the following in order to create <iconv.h> when the system