Sync gnulib and dxcommon to latest versions.

Lots of nice updates and hopefully no regressions.

diff --git a/.gitmodules b/.gitmodules
index 13c6889c31de538944a21e573883bce870286538..c2e605275ad8c36d2ac18b0104abe6d5cf8588d5 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "gnulib"]
        path = gnulib
-       url = git://git.savannah.gnu.org/gnulib.git
+       url = https://git.savannah.gnu.org/git/gnulib.git
 [submodule "common"]
        path = common
-       url = git://git.draconx.ca/dxcommon.git
+       url = https://git.draconx.ca/dxcommon.git

diff --git a/Makefile.am b/Makefile.am
index f454e3529c4eab8e54d5be0eee370b70cf9442ec..30cf7aee17cc31b92a30468daf64b3d79e3ef431 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright © 2009-2012, 2015, 2019-2020 Nick Bowler
+# Copyright © 2009-2012, 2015, 2019-2020, 2022 Nick Bowler
 #
 # License WTFPL2: Do What The Fuck You Want To Public License, version 2.
 # This is free software: you are free to do what the fuck you want to.
@@ -9,17 +9,17 @@ ACLOCAL_AMFLAGS = -I m4 -I common/m4
 MAINTAINERCLEANFILES =
 MOSTLYCLEANFILES =
 DISTCLEANFILES =
-CLEANFILES =
 
 # Distribution should be buildable without working gob.
 AM_DISTCHECK_CONFIGURE_FLAGS = GOB2=false
 
 EXTRA_DIST = $(MAINTAINERCLEANFILES) m4/gnulib-cache.m4
+CLEANFILES = $(EXTRA_LTLIBRARIES) $(EXTRA_LIBRARIES)
 
 AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_srcdir)/src \
-       -I$(top_srcdir)/$(DX_BASEDIR)/src \
-       -I$(top_builddir)/lib -I$(top_srcdir)/lib \
-       -DPKGLIBDIR=\"$(pkglibdir)\" -DPKGDATADIR=\"$(pkgdatadir)\"
+              -I$(top_builddir)/lib -I$(top_srcdir)/lib \
+              -I$(DX_BASEDIR)/src -DPKGLIBDIR=\"$(pkglibdir)\" \
+              -DPKGDATADIR=\"$(pkgdatadir)\"
 
 AM_CFLAGS = $(LTDLINCL) $(GLIB_CFLAGS) $(LIBMODPLUG_CFLAGS)
 

diff --git a/common b/common
index 4705ffd69e7b7551bab4650f9e49756667be783b..03a26752c80546ac8cf8fc81807bb5a153786599 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 4705ffd69e7b7551bab4650f9e49756667be783b
+Subproject commit 03a26752c80546ac8cf8fc81807bb5a153786599

diff --git a/configure.ac b/configure.ac
index 36c3ffdae6f53e8e4e8e7b87ed7ff05f8f1d7a8e..5ada4888c58cef72d2b535ca33c741d47cb9d992 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,9 @@
-dnl Copyright © 2009-2012, 2015, 2019-2020 Nick Bowler
+dnl Copyright © 2009-2012, 2015, 2019-2020, 2022 Nick Bowler
 dnl
 dnl License WTFPL2: Do What The Fuck You Want To Public License, version 2.
 dnl This is free software: you are free to do what the fuck you want to.
 dnl There is NO WARRANTY, to the extent permitted by law.
 
-AC_PREREQ(2.62)
 AC_INIT([upkg],[0.1],[nbowler@draconx.ca])
 AC_CONFIG_SRCDIR([src/libupkg.c])
 AC_CONFIG_HEADER([config.h])

diff --git a/gnulib b/gnulib
index 233419c39c6d13d84439b95766328a238ffb6518..8a1e1616f143ccebf13ea477a1d0a4040ce2ddc4 160000 (submodule)
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 233419c39c6d13d84439b95766328a238ffb6518
+Subproject commit 8a1e1616f143ccebf13ea477a1d0a4040ce2ddc4

diff --git a/m4/.gitignore b/m4/.gitignore
index d89469b5b4655ed18fd50cf5cd566f75e8ddd3c6..9454b32f0977f1eda8583f603025046c45bebab3 100644 (file)
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -1,4 +1,5 @@
 00gnulib.m4
+absolute-header.m4
 copysignf.m4
 exponentd.m4
 exponentf.m4
@@ -8,10 +9,8 @@ extern-inline.m4
 float_h.m4
 fpieee.m4
 getopt.m4
-gnulib-cache.m4~
 gnulib-common.m4
 gnulib-comp.m4
-gnulib-comp.m4~
 gnulib-tool.m4
 include_next.m4
 isnand.m4
@@ -30,6 +29,7 @@ math_h.m4
 mathfunc.m4
 nocrash.m4
 off_t.m4
+pid_t.m4
 signbit.m4
 ssize_t.m4
 stddef_h.m4
@@ -37,5 +37,7 @@ strcase.m4
 strings_h.m4
 sys_types_h.m4
 unistd_h.m4
+vararrays.m4
 warn-on-use.m4
 wchar_t.m4
+zzgnulib.m4

diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4
index 39ed0f60ae7923f547499d544e219e2827d2efaf..988fa8e19f47cbe81349f54058dabf12abec41a8 100644 (file)
--- a/m4/gnulib-cache.m4
+++ b/m4/gnulib-cache.m4
@@ -1,8 +1,8 @@
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2022 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
 # This file is distributed in the hope that it will be useful,
@@ -11,7 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this file.  If not, see <http://www.gnu.org/licenses/>.
+# along with this file.  If not, see <https://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License,
 # this file may be distributed as part of a program that
@@ -27,7 +27,22 @@
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=. --makefile-name=gnulib.mk.in --conditional-dependencies --libtool --macro-prefix=gl --no-vc-files copysignf getopt-gnu ldexpf strcase
+# gnulib-tool --import \
+#  --lib=libgnu \
+#  --source-base=lib \
+#  --m4-base=m4 \
+#  --doc-base=doc \
+#  --tests-base=tests \
+#  --aux-dir=. \
+#  --makefile-name=gnulib.mk.in \
+#  --conditional-dependencies \
+#  --libtool \
+#  --macro-prefix=gl \
+#  --no-vc-files \
+#  copysignf \
+#  getopt-gnu \
+#  ldexpf \
+#  strcase
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([])