4 files changed, 72 insertions, 15 deletions

diff --git a/autogen/Makefile.in b/autogen/Makefile.in
index 51180d9b21f..846b2fb0f26 100644
--- a/autogen/Makefile.in
+++ b/autogen/Makefile.in
@@ -59,7 +59,7 @@
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=close --avoid=dup --avoid=fchdir --avoid=fstat --avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow --avoid=open --avoid=openat-die --avoid=opendir --avoid=raise --avoid=save-cwd --avoid=select --avoid=sigprocmask --avoid=sys_types --avoid=threadlib --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt c-ctype c-strcase careadlinkat close-stream crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dtotimespec dup2 environ execinfo faccessat fcntl fcntl-h fdatasync fdopendir filemode fstatat fsync getloadavg getopt-gnu gettime gettimeofday intprops largefile lstat manywarnings memrchr mkostemp mktime pipe2 pselect pthread_sigmask putenv qacl readlink readlinkat sig2str socklen stat-time stdalign stdarg stdbool stdio strftime strtoimax strtoumax symlink sys_stat sys_time time timer-time timespec-add timespec-sub unsetenv utimens warnings
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=close --avoid=dup --avoid=fchdir --avoid=fstat --avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow --avoid=open --avoid=openat-die --avoid=opendir --avoid=raise --avoid=save-cwd --avoid=select --avoid=sigprocmask --avoid=sys_types --avoid=threadlib --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt byteswap c-ctype c-strcase careadlinkat close-stream crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dtotimespec dup2 environ execinfo faccessat fcntl fcntl-h fdatasync fdopendir filemode fstatat fsync getloadavg getopt-gnu gettime gettimeofday intprops largefile lstat manywarnings memrchr mkostemp mktime pipe2 pselect pthread_sigmask putenv qacl readlink readlinkat sig2str socklen stat-time stdalign stdarg stdbool stdio strftime strtoimax strtoumax symlink sys_stat sys_time time timer-time timespec-add timespec-sub unsetenv utimens warnings
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
@@ -145,7 +145,8 @@ DIST_COMMON = $(srcdir)/../nt/gnulib.mk $(srcdir)/Makefile.am \
 @BUILDING_FOR_WINDOWSNT_TRUE@   xalloc-oversized.h
 @BUILDING_FOR_WINDOWSNT_TRUE@@gl_GNULIB_ENABLED_be453cec5eecf5731a274f2de7f2db36_TRUE@am__append_5 = gettext.h
 @BUILDING_FOR_WINDOWSNT_FALSE@am__append_6 = core *.stackdump alloca.h \
-@BUILDING_FOR_WINDOWSNT_FALSE@  alloca.h-t dirent.h dirent.h-t \
+@BUILDING_FOR_WINDOWSNT_FALSE@  alloca.h-t byteswap.h \
+@BUILDING_FOR_WINDOWSNT_FALSE@  byteswap.h-t dirent.h dirent.h-t \
 @BUILDING_FOR_WINDOWSNT_FALSE@  errno.h errno.h-t execinfo.h \
 @BUILDING_FOR_WINDOWSNT_FALSE@  execinfo.h-t fcntl.h fcntl.h-t \
 @BUILDING_FOR_WINDOWSNT_FALSE@  getopt.h getopt.h-t inttypes.h \
@@ -174,8 +175,9 @@ DIST_COMMON = $(srcdir)/../nt/gnulib.mk $(srcdir)/Makefile.am \
 # 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.
-@BUILDING_FOR_WINDOWSNT_FALSE@am__append_8 = $(ALLOCA_H) dirent.h \
-@BUILDING_FOR_WINDOWSNT_FALSE@  $(ERRNO_H) $(EXECINFO_H) fcntl.h \
+@BUILDING_FOR_WINDOWSNT_FALSE@am__append_8 = $(ALLOCA_H) $(BYTESWAP_H) \
+@BUILDING_FOR_WINDOWSNT_FALSE@  dirent.h $(ERRNO_H) \
+@BUILDING_FOR_WINDOWSNT_FALSE@  $(EXECINFO_H) fcntl.h \
 @BUILDING_FOR_WINDOWSNT_FALSE@  $(GETOPT_H) inttypes.h signal.h \
 @BUILDING_FOR_WINDOWSNT_FALSE@  arg-nonnull.h c++defs.h \
 @BUILDING_FOR_WINDOWSNT_FALSE@  warn-on-use.h $(STDALIGN_H) \
@@ -186,16 +188,17 @@ DIST_COMMON = $(srcdir)/../nt/gnulib.mk $(srcdir)/Makefile.am \
 @BUILDING_FOR_WINDOWSNT_FALSE@  unistd.h
 @BUILDING_FOR_WINDOWSNT_FALSE@am__append_9 = alloca.in.h allocator.h \
 @BUILDING_FOR_WINDOWSNT_FALSE@  openat-priv.h openat-proc.c \
-@BUILDING_FOR_WINDOWSNT_FALSE@  careadlinkat.h close-stream.h \
-@BUILDING_FOR_WINDOWSNT_FALSE@  md5.h sha1.h sha256.h sha512.h \
-@BUILDING_FOR_WINDOWSNT_FALSE@  dirent.in.h dosname.h ftoastr.c \
-@BUILDING_FOR_WINDOWSNT_FALSE@  ftoastr.h dup2.c errno.in.h \
-@BUILDING_FOR_WINDOWSNT_FALSE@  euidaccess.c execinfo.c \
-@BUILDING_FOR_WINDOWSNT_FALSE@  execinfo.in.h at-func.c \
-@BUILDING_FOR_WINDOWSNT_FALSE@  faccessat.c fcntl.c fcntl.in.h \
-@BUILDING_FOR_WINDOWSNT_FALSE@  fdatasync.c fdopendir.c \
-@BUILDING_FOR_WINDOWSNT_FALSE@  filemode.h fpending.c fpending.h \
-@BUILDING_FOR_WINDOWSNT_FALSE@  at-func.c fstatat.c fsync.c \
+@BUILDING_FOR_WINDOWSNT_FALSE@  byteswap.in.h careadlinkat.h \
+@BUILDING_FOR_WINDOWSNT_FALSE@  close-stream.h md5.h sha1.h \
+@BUILDING_FOR_WINDOWSNT_FALSE@  sha256.h sha512.h dirent.in.h \
+@BUILDING_FOR_WINDOWSNT_FALSE@  dosname.h ftoastr.c ftoastr.h \
+@BUILDING_FOR_WINDOWSNT_FALSE@  dup2.c errno.in.h euidaccess.c \
+@BUILDING_FOR_WINDOWSNT_FALSE@  execinfo.c execinfo.in.h \
+@BUILDING_FOR_WINDOWSNT_FALSE@  at-func.c faccessat.c fcntl.c \
+@BUILDING_FOR_WINDOWSNT_FALSE@  fcntl.in.h fdatasync.c \
+@BUILDING_FOR_WINDOWSNT_FALSE@  fdopendir.c filemode.h \
+@BUILDING_FOR_WINDOWSNT_FALSE@  fpending.c fpending.h at-func.c \
+@BUILDING_FOR_WINDOWSNT_FALSE@  fstatat.c fsync.c \
 @BUILDING_FOR_WINDOWSNT_FALSE@  getdtablesize.c getgroups.c \
 @BUILDING_FOR_WINDOWSNT_FALSE@  getloadavg.c getopt.c \
 @BUILDING_FOR_WINDOWSNT_FALSE@  getopt.in.h getopt1.c \
@@ -235,7 +238,8 @@ subdir = lib
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
         $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/alloca.m4 \
-        $(top_srcdir)/m4/c-strtod.m4 $(top_srcdir)/m4/clock_time.m4 \
+        $(top_srcdir)/m4/byteswap.m4 $(top_srcdir)/m4/c-strtod.m4 \
+        $(top_srcdir)/m4/clock_time.m4 \
         $(top_srcdir)/m4/close-stream.m4 $(top_srcdir)/m4/dirent_h.m4 \
         $(top_srcdir)/m4/dup2.m4 $(top_srcdir)/m4/environ.m4 \
         $(top_srcdir)/m4/errno_h.m4 $(top_srcdir)/m4/euidaccess.m4 \
@@ -399,6 +403,7 @@ BITSIZEOF_SIZE_T = @BITSIZEOF_SIZE_T@
 BITSIZEOF_WCHAR_T = @BITSIZEOF_WCHAR_T@
 BITSIZEOF_WINT_T = @BITSIZEOF_WINT_T@
 BLESSMAIL_TARGET = @BLESSMAIL_TARGET@
+BYTESWAP_H = @BYTESWAP_H@
 CANNOT_DUMP = @CANNOT_DUMP@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -1868,6 +1873,17 @@ uninstall-am:
 @BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_ALLOCA_H_FALSE@alloca.h: $(top_builddir)/config.status
 @BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_ALLOCA_H_FALSE@      rm -f $@
 
+# We need the following in order to create <byteswap.h> when the system
+# doesn't have one.
+@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_BYTESWAP_H_TRUE@byteswap.h: byteswap.in.h $(top_builddir)/config.status
+@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_BYTESWAP_H_TRUE@     $(AM_V_GEN)rm -f $@-t $@ && \
+@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_BYTESWAP_H_TRUE@     { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_BYTESWAP_H_TRUE@       cat $(srcdir)/byteswap.in.h; \
+@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_BYTESWAP_H_TRUE@     } > $@-t && \
+@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_BYTESWAP_H_TRUE@     mv -f $@-t $@
+@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_BYTESWAP_H_FALSE@byteswap.h: $(top_builddir)/config.status
+@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_BYTESWAP_H_FALSE@    rm -f $@
+
 # We need the following in order to create <dirent.h> when the system
 # doesn't have one that works with the given compiler.
 @BUILDING_FOR_WINDOWSNT_FALSE@dirent.h: dirent.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
diff --git a/autogen/aclocal.m4 b/autogen/aclocal.m4
index 5beeef676cc..8abb30b7fb0 100644
--- a/autogen/aclocal.m4
+++ b/autogen/aclocal.m4
@@ -987,6 +987,7 @@ AC_SUBST([am__untar])
 m4_include([m4/00gnulib.m4])
 m4_include([m4/acl.m4])
 m4_include([m4/alloca.m4])
+m4_include([m4/byteswap.m4])
 m4_include([m4/c-strtod.m4])
 m4_include([m4/clock_time.m4])
 m4_include([m4/close-stream.m4])
diff --git a/autogen/config.in b/autogen/config.in
index 0d48daca6bc..bcdfed288d4 100644
--- a/autogen/config.in
+++ b/autogen/config.in
@@ -313,6 +313,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if ALSA is available. */
 #undef HAVE_ALSA
 
+/* Define to 1 if you have the <byteswap.h> header file. */
+#undef HAVE_BYTESWAP_H
+
 /* Define to 1 if strtold conforms to C99. */
 #undef HAVE_C99_STRTOLD
 
diff --git a/autogen/configure b/autogen/configure
index 0959be77352..35d95e7809a 100755
--- a/autogen/configure
+++ b/autogen/configure
@@ -1247,6 +1247,9 @@ GNULIB_CLOSE
 GNULIB_CHOWN
 GNULIB_CHDIR
 LIB_CLOCK_GETTIME
+GL_GENERATE_BYTESWAP_H_FALSE
+GL_GENERATE_BYTESWAP_H_TRUE
+BYTESWAP_H
 GL_GENERATE_ALLOCA_H_FALSE
 GL_GENERATE_ALLOCA_H_TRUE
 ALLOCA_H
@@ -7287,6 +7290,7 @@ esac
   # Code from module allocator:
   # Code from module at-internal:
   # Code from module binary-io:
+  # Code from module byteswap:
   # Code from module c-ctype:
   # Code from module c-strcase:
   # Code from module careadlinkat:
@@ -22408,6 +22412,35 @@ fi
 
 
 
+    for ac_header in byteswap.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "byteswap.h" "ac_cv_header_byteswap_h" "$ac_includes_default"
+if test "x$ac_cv_header_byteswap_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_BYTESWAP_H 1
+_ACEOF
+
+    BYTESWAP_H=''
+
+else
+
+    BYTESWAP_H='byteswap.h'
+
+fi
+
+done
+
+
+   if test -n "$BYTESWAP_H"; then
+  GL_GENERATE_BYTESWAP_H_TRUE=
+  GL_GENERATE_BYTESWAP_H_FALSE='#'
+else
+  GL_GENERATE_BYTESWAP_H_TRUE='#'
+  GL_GENERATE_BYTESWAP_H_FALSE=
+fi
+
+
+
 
 
 
@@ -29546,6 +29579,10 @@ if test -z "${GL_GENERATE_ALLOCA_H_TRUE}" && test -z "${GL_GENERATE_ALLOCA_H_FAL
   as_fn_error "conditional \"GL_GENERATE_ALLOCA_H\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${GL_GENERATE_BYTESWAP_H_TRUE}" && test -z "${GL_GENERATE_BYTESWAP_H_FALSE}"; then
+  as_fn_error "conditional \"GL_GENERATE_BYTESWAP_H\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 
 if test -z "${GL_GENERATE_ERRNO_H_TRUE}" && test -z "${GL_GENERATE_ERRNO_H_FALSE}"; then
   as_fn_error "conditional \"GL_GENERATE_ERRNO_H\" was never defined.