summaryrefslogtreecommitdiffstats
path: root/gl/m4
diff options
context:
space:
mode:
Diffstat (limited to 'gl/m4')
-rw-r--r--gl/m4/gnulib-cache.m46
-rw-r--r--gl/m4/gnulib-comp.m414
-rw-r--r--gl/m4/sha256.m4 (renamed from gl/m4/sha1.m4)12
3 files changed, 17 insertions, 15 deletions
diff --git a/gl/m4/gnulib-cache.m4 b/gl/m4/gnulib-cache.m4
index ee4756e5..4e5055e4 100644
--- a/gl/m4/gnulib-cache.m4
+++ b/gl/m4/gnulib-cache.m4
@@ -38,8 +38,9 @@
38# --no-libtool \ 38# --no-libtool \
39# --macro-prefix=gl \ 39# --macro-prefix=gl \
40# --no-vc-files \ 40# --no-vc-files \
41# --no-vc-files \
41# base64 \ 42# base64 \
42# crypto/sha1 \ 43# crypto/sha256 \
43# dirname \ 44# dirname \
44# environ \ 45# environ \
45# floorf \ 46# floorf \
@@ -64,8 +65,9 @@
64# Specification in the form of a few gnulib-tool.m4 macro invocations: 65# Specification in the form of a few gnulib-tool.m4 macro invocations:
65gl_LOCAL_DIR([]) 66gl_LOCAL_DIR([])
66gl_MODULES([ 67gl_MODULES([
68 --no-vc-files
67 base64 69 base64
68 crypto/sha1 70 crypto/sha256
69 dirname 71 dirname
70 environ 72 environ
71 floorf 73 floorf
diff --git a/gl/m4/gnulib-comp.m4 b/gl/m4/gnulib-comp.m4
index 644b9169..e6501b95 100644
--- a/gl/m4/gnulib-comp.m4
+++ b/gl/m4/gnulib-comp.m4
@@ -58,8 +58,8 @@ AC_DEFUN([gl_EARLY],
58 # Code from module cloexec: 58 # Code from module cloexec:
59 # Code from module close: 59 # Code from module close:
60 # Code from module crypto/af_alg: 60 # Code from module crypto/af_alg:
61 # Code from module crypto/sha1: 61 # Code from module crypto/sha256:
62 # Code from module crypto/sha1-buffer: 62 # Code from module crypto/sha256-buffer:
63 # Code from module dirname: 63 # Code from module dirname:
64 # Code from module dirname-lgpl: 64 # Code from module dirname-lgpl:
65 # Code from module double-slash-root: 65 # Code from module double-slash-root:
@@ -268,7 +268,7 @@ AC_DEFUN([gl_INIT],
268 gl_UNISTD_MODULE_INDICATOR([close]) 268 gl_UNISTD_MODULE_INDICATOR([close])
269 gl_AF_ALG 269 gl_AF_ALG
270 AC_REQUIRE([AC_C_RESTRICT]) 270 AC_REQUIRE([AC_C_RESTRICT])
271 gl_SHA1 271 gl_SHA256
272 gl_MODULE_INDICATOR([dirname]) 272 gl_MODULE_INDICATOR([dirname])
273 gl_DOUBLE_SLASH_ROOT 273 gl_DOUBLE_SLASH_ROOT
274 gl_FUNC_DUP2 274 gl_FUNC_DUP2
@@ -1132,9 +1132,9 @@ AC_DEFUN([gl_FILE_LIST], [
1132 lib/setlocale-lock.c 1132 lib/setlocale-lock.c
1133 lib/setlocale_null.c 1133 lib/setlocale_null.c
1134 lib/setlocale_null.h 1134 lib/setlocale_null.h
1135 lib/sha1-stream.c 1135 lib/sha256-stream.c
1136 lib/sha1.c 1136 lib/sha256.c
1137 lib/sha1.h 1137 lib/sha256.h
1138 lib/size_max.h 1138 lib/size_max.h
1139 lib/snprintf.c 1139 lib/snprintf.c
1140 lib/sockets.c 1140 lib/sockets.c
@@ -1319,7 +1319,7 @@ AC_DEFUN([gl_FILE_LIST], [
1319 m4/servent.m4 1319 m4/servent.m4
1320 m4/setenv.m4 1320 m4/setenv.m4
1321 m4/setlocale_null.m4 1321 m4/setlocale_null.m4
1322 m4/sha1.m4 1322 m4/sha256.m4
1323 m4/size_max.m4 1323 m4/size_max.m4
1324 m4/snprintf.m4 1324 m4/snprintf.m4
1325 m4/socketlib.m4 1325 m4/socketlib.m4
diff --git a/gl/m4/sha1.m4 b/gl/m4/sha256.m4
index 16b79c08..4d1d1dda 100644
--- a/gl/m4/sha1.m4
+++ b/gl/m4/sha256.m4
@@ -1,14 +1,14 @@
1# sha1.m4 serial 12 1# sha256.m4 serial 8
2dnl Copyright (C) 2002-2006, 2008-2023 Free Software Foundation, Inc. 2dnl Copyright (C) 2005, 2008-2023 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation 3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it, 4dnl gives unlimited permission to copy and/or distribute it,
5dnl with or without modifications, as long as this notice is preserved. 5dnl with or without modifications, as long as this notice is preserved.
6 6
7AC_DEFUN([gl_SHA1], 7AC_DEFUN([gl_SHA256],
8[ 8[
9 dnl Prerequisites of lib/sha1.c. 9 dnl Prerequisites of lib/sha256.c.
10 AC_REQUIRE([gl_BIGENDIAN]) 10 AC_REQUIRE([gl_BIGENDIAN])
11 11
12 dnl Determine HAVE_OPENSSL_SHA1 and LIB_CRYPTO 12 dnl Determine HAVE_OPENSSL_SHA256 and LIB_CRYPTO
13 gl_CRYPTO_CHECK([SHA1]) 13 gl_CRYPTO_CHECK([SHA256])
14]) 14])