commit e2adcf397421d47440d135a97765e1dbe7f824fe
author Bram Moolenaar <Bram@vim.org> Sat Mar 12 11:57:25 2022 +0000
committer Bram Moolenaar <Bram@vim.org> Sat Mar 12 11:57:25 2022 +0000
tree 62e54238c6a23b2f932fc9dd4e3c071219cc4bf7
parent fb43cfc2c6a003b850343bfd27cb3059c734d7d4

patch 8.2.4549: cannot build with Motif and editres

Problem:    Cannot build with Motif and editres. (Tony Mechelynck)
Solution:   Fix configure mistake.

src/auto/configure

diff --git a/src/auto/configure b/src/auto/configure
index e603a46..a5497d8 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -10254,7 +10254,7 @@
 
 fi
 
-if -z "$SKIP_MOTIF"; then
+if test -z "$SKIP_MOTIF"; then
       if test -n "$GUI_INC_LOC"; then
     GUI_INC_LOC=-I"`echo $GUI_INC_LOC|sed 's%-I%%'`"
   fi

src/configure.ac

diff --git a/src/configure.ac b/src/configure.ac
index ff4a490..1426e74 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -3004,7 +3004,7 @@
   AC_SUBST(MOTIF_LIBNAME)
 fi
 
-if -z "$SKIP_MOTIF"; then
+if test -z "$SKIP_MOTIF"; then
   dnl Prepend -I and -L to $GUI_INC_LOC and $GUI_LIB_LOC if not empty
   dnl Avoid adding it when it twice
   if test -n "$GUI_INC_LOC"; then

src/version.c

diff --git a/src/version.c b/src/version.c
index 2efc6bf..7861799 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    4549,
+/**/
     4548,
 /**/
     4547,