patch 8.2.2432: libvterm tests are executed even when libtool doesn't work

Problem:    Libvterm tests are executed even when libtool doesn't work.
Solution:   Only run libvterm tests if /usr/bin/gcc exists.

diff --git a/src/Makefile b/src/Makefile
index c30af8b2952badbe776f8ba2a8e3207cf1d237bd..4e32814ffd11d94e52d8bd80f000d2b90a92cf13 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -2294,9 +2294,12 @@ run_message_test: $(MESSAGE_TEST_TARGET)
 
 # Run the libvterm tests.
 # This works only on GNU make, not on BSD make.
+# Libtool requires "gcc".
 test_libvterm:
        @if $(MAKE) --version 2>/dev/null | grep -qs "GNU Make"; then \
-               cd libvterm; $(MAKE) -f Makefile test CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"; \
+         if test -x "/usr/bin/gcc"; then \
+           cd libvterm; $(MAKE) -f Makefile test CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"; \
+         fi \
        fi
 
 # Run individual OLD style test.

diff --git a/src/version.c b/src/version.c
index 6854c10fd5d96e94578fea7945a576e678d74d24..dc20c3349cfc3c935c5c606dd74c188d4c258689 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2432,
 /**/
     2431,
 /**/