diff options
| author | ichizok <gclient.gaap@gmail.com> | 2021-06-23 15:41:52 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-06-23 15:41:52 +0200 |
| commit | 8ce3ca8961c5968a02de0a0b98f906695331f254 (patch) | |
| tree | ef8addee5f72349ad815b8412e958065892decc3 | |
| parent | 7237cab8f1d1a4391372cafdb57f2d97f3b32d05 (diff) | |
| download | vim-git-8.2.3037.tar.gz | |
patch 8.2.3037: configure reports libcanberra when checking for libsodiumv8.2.3037
Problem: Configure reports libcanberra when checking for libsodium.
Solution: Adjust the message. (Ozaki Kiichi, closes #8435)
| -rwxr-xr-x | src/auto/configure | 4 | ||||
| -rw-r--r-- | src/configure.ac | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/auto/configure b/src/auto/configure index cd678fd9f..fba6a19b5 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -13040,8 +13040,8 @@ if test "$enable_libsodium" = "yes"; then libsodium_lib=-lsodium libsodium_cflags= fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libcanberra" >&5 -$as_echo_n "checking for libcanberra... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libsodium" >&5 +$as_echo_n "checking for libsodium... " >&6; } ac_save_CFLAGS="$CFLAGS" ac_save_LIBS="$LIBS" CFLAGS="$CFLAGS $libsodium_cflags" diff --git a/src/configure.ac b/src/configure.ac index 84b54dbf0..5ec955757 100644 --- a/src/configure.ac +++ b/src/configure.ac @@ -3792,7 +3792,7 @@ if test "$enable_libsodium" = "yes"; then libsodium_lib=-lsodium libsodium_cflags= fi - AC_MSG_CHECKING(for libcanberra) + AC_MSG_CHECKING(for libsodium) ac_save_CFLAGS="$CFLAGS" ac_save_LIBS="$LIBS" CFLAGS="$CFLAGS $libsodium_cflags" diff --git a/src/version.c b/src/version.c index 933dd4f79..4ae884655 100644 --- a/src/version.c +++ b/src/version.c @@ -756,6 +756,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3037, +/**/ 3036, /**/ 3035, |