Skip to content

Commit 8bf9d97

Browse files
author
Matthias Koeppe
committed
build/pkgs/gnulib: Update to version of 2022-07-31
1 parent ce70f3d commit 8bf9d97

File tree

4 files changed

+22
-13
lines changed

4 files changed

+22
-13
lines changed

build/pkgs/gnulib/package-version.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
19435dc207e9279d744435ce72466f765c5358e2
2-
# version of 2022-07-10
1+
f9b39c4e337f1dc0dd07c4f3985c476fb875d799

build/pkgs/gnulib/spkg-src

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# the commit hash below is the latest as of 2022-07-31
44
# For updating gnulib, change this hash and run
55
#
6-
# ./sage -sh -c 'build/pkgs/gnulib/spkg-src
6+
# ./sage -sh -c 'build/pkgs/gnulib/spkg-src'
77
#
88
# Then commit the results.
99

m4/iconv.m4

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# iconv.m4 serial 24
1+
# iconv.m4 serial 26
22
dnl Copyright (C) 2000-2002, 2007-2014, 2016-2022 Free Software Foundation,
33
dnl Inc.
44
dnl This file is free software; the Free Software Foundation
@@ -234,12 +234,6 @@ AC_DEFUN([AM_ICONV_LINK],
234234

235235
dnl Define AM_ICONV using AC_DEFUN_ONCE, in order to avoid warnings like
236236
dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required".
237-
dnl This is tricky because of the way 'aclocal' is implemented:
238-
dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN.
239-
dnl Otherwise aclocal's initial scan pass would miss the macro definition.
240-
dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions.
241-
dnl Otherwise aclocal would emit many "Use of uninitialized value $1"
242-
dnl warnings.
243237
AC_DEFUN_ONCE([AM_ICONV],
244238
[
245239
AM_ICONV_LINK
@@ -280,4 +274,20 @@ size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, si
280274
ICONV_CONST="const"
281275
fi
282276
])
277+
278+
dnl A summary result, for those packages which want to print a summary at the
279+
dnl end of the configuration.
280+
if test "$am_func_iconv" = yes; then
281+
if test -n "$LIBICONV"; then
282+
am_cv_func_iconv_summary='yes, in libiconv'
283+
else
284+
am_cv_func_iconv_summary='yes, in libc'
285+
fi
286+
else
287+
if test "$am_cv_func_iconv" = yes; then
288+
am_cv_func_iconv_summary='not working, consider installing GNU libiconv'
289+
else
290+
am_cv_func_iconv_summary='no, consider installing GNU libiconv'
291+
fi
292+
fi
283293
])

m4/lib-link.m4

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# lib-link.m4 serial 32
1+
# lib-link.m4 serial 33
22
dnl Copyright (C) 2001-2022 Free Software Foundation, Inc.
33
dnl This file is free software; the Free Software Foundation
44
dnl gives unlimited permission to copy and/or distribute it,
@@ -196,8 +196,8 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
196196
eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\"
197197
])
198198
AC_ARG_WITH(PACK[-prefix],
199-
[[ --with-]]PACK[[-prefix[=DIR] search for ]PACKLIBS[ in DIR/include and DIR/lib
200-
--without-]]PACK[[-prefix don't search for ]PACKLIBS[ in includedir and libdir]],
199+
[[ --with-]]PACK[[-prefix[=DIR] search for ]]PACKLIBS[[ in DIR/include and DIR/lib
200+
--without-]]PACK[[-prefix don't search for ]]PACKLIBS[[ in includedir and libdir]],
201201
[
202202
if test "X$withval" = "Xno"; then
203203
use_additional=no

0 commit comments

Comments
 (0)