From 8bf9d9738304b9bf1dee14ee639c934db15972a5 Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Mon, 22 Aug 2022 14:45:59 -0700
Subject: [PATCH] build/pkgs/gnulib: Update to version of 2022-07-31

---
 build/pkgs/gnulib/package-version.txt |  3 +--
 build/pkgs/gnulib/spkg-src            |  2 +-
 m4/iconv.m4                           | 24 +++++++++++++++++-------
 m4/lib-link.m4                        |  6 +++---
 4 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/build/pkgs/gnulib/package-version.txt b/build/pkgs/gnulib/package-version.txt
index 993bba70f54..a64fb36670b 100644
--- a/build/pkgs/gnulib/package-version.txt
+++ b/build/pkgs/gnulib/package-version.txt
@@ -1,2 +1 @@
-19435dc207e9279d744435ce72466f765c5358e2
-# version of 2022-07-10
+f9b39c4e337f1dc0dd07c4f3985c476fb875d799
diff --git a/build/pkgs/gnulib/spkg-src b/build/pkgs/gnulib/spkg-src
index 3774cd13540..98eb7f4e561 100755
--- a/build/pkgs/gnulib/spkg-src
+++ b/build/pkgs/gnulib/spkg-src
@@ -3,7 +3,7 @@
 # the commit hash below is the latest as of 2022-07-31
 # For updating gnulib, change this hash and run
 #
-# ./sage -sh -c 'build/pkgs/gnulib/spkg-src
+# ./sage -sh -c 'build/pkgs/gnulib/spkg-src'
 #
 # Then commit the results.
 
diff --git a/m4/iconv.m4 b/m4/iconv.m4
index 00057953e33..2065c9772ad 100644
--- a/m4/iconv.m4
+++ b/m4/iconv.m4
@@ -1,4 +1,4 @@
-# iconv.m4 serial 24
+# iconv.m4 serial 26
 dnl Copyright (C) 2000-2002, 2007-2014, 2016-2022 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
@@ -234,12 +234,6 @@ AC_DEFUN([AM_ICONV_LINK],
 
 dnl Define AM_ICONV using AC_DEFUN_ONCE, in order to avoid warnings like
 dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required".
-dnl This is tricky because of the way 'aclocal' is implemented:
-dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN.
-dnl   Otherwise aclocal's initial scan pass would miss the macro definition.
-dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions.
-dnl   Otherwise aclocal would emit many "Use of uninitialized value $1"
-dnl   warnings.
 AC_DEFUN_ONCE([AM_ICONV],
 [
   AM_ICONV_LINK
@@ -280,4 +274,20 @@ size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, si
        ICONV_CONST="const"
      fi
     ])
+
+  dnl A summary result, for those packages which want to print a summary at the
+  dnl end of the configuration.
+  if test "$am_func_iconv" = yes; then
+    if test -n "$LIBICONV"; then
+      am_cv_func_iconv_summary='yes, in libiconv'
+    else
+      am_cv_func_iconv_summary='yes, in libc'
+    fi
+  else
+    if test "$am_cv_func_iconv" = yes; then
+      am_cv_func_iconv_summary='not working, consider installing GNU libiconv'
+    else
+      am_cv_func_iconv_summary='no, consider installing GNU libiconv'
+    fi
+  fi
 ])
diff --git a/m4/lib-link.m4 b/m4/lib-link.m4
index ed5186afb48..3b75bcd0de1 100644
--- a/m4/lib-link.m4
+++ b/m4/lib-link.m4
@@ -1,4 +1,4 @@
-# lib-link.m4 serial 32
+# lib-link.m4 serial 33
 dnl Copyright (C) 2001-2022 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -196,8 +196,8 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
     eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\"
   ])
   AC_ARG_WITH(PACK[-prefix],
-[[  --with-]]PACK[[-prefix[=DIR]  search for ]PACKLIBS[ in DIR/include and DIR/lib
-  --without-]]PACK[[-prefix     don't search for ]PACKLIBS[ in includedir and libdir]],
+[[  --with-]]PACK[[-prefix[=DIR]  search for ]]PACKLIBS[[ in DIR/include and DIR/lib
+  --without-]]PACK[[-prefix     don't search for ]]PACKLIBS[[ in includedir and libdir]],
 [
     if test "X$withval" = "Xno"; then
       use_additional=no