patch 8.2.3037: configure reports libcanberra when checking for libsodium

Problem:    Configure reports libcanberra when checking for libsodium.
Solution:   Adjust the message. (Ozaki Kiichi, closes #8435)

diff --git a/src/auto/configure b/src/auto/configure
index cd678fd9f156203bd8f40e7e2b82187f7bd97197..fba6a19b538949b69236fc2e0a468a1aa288014a 100755 (executable)
--- 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 84b54dbf0a4ce73be615876531491686fbb85ae7..5ec955757fc6912c3fd8a7e7995c97176442818b 100644 (file)
--- 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 933dd4f798615f249257ecdfbdf05465ba3ed5e2..4ae884655909cef945761a7cc6ec432d8484c3b1 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3037,
 /**/
     3036,
 /**/