patch 8.2.4549: cannot build with Motif and editres

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

diff --git a/src/auto/configure b/src/auto/configure
index e603a468c3aae1f4605f678be2fea1a51d461bb4..a5497d8f789ee877a517f5bacd58df2938542681 100755 (executable)
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -10254,7 +10254,7 @@ if test -z "$SKIP_MOTIF"; then
 
 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

diff --git a/src/configure.ac b/src/configure.ac
index ff4a4900850ba8f4c99a909cfcf5fa2679f4bfc6..1426e74c5e6309cfa0c4094a4503e9e16aa57c7e 100644 (file)
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -3004,7 +3004,7 @@ if test -z "$SKIP_MOTIF"; then
   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

diff --git a/src/version.c b/src/version.c
index 2efc6bff354982fd312a2dec4b090b9ec2af068c..7861799b08d60ec04866e1db96ab6384d6f674ed 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 */
+/**/
+    4549,
 /**/
     4548,
 /**/