summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-06-05 20:03:17 +0100
committerBram Moolenaar <Bram@vim.org>2022-06-05 20:03:17 +0100
commitde1d7343794a950bd624043901ce7b3caca3c49b (patch)
tree9fdb236b5d26ee67f441cc87af14d4a290361bca
parent1004b3d970f19964816eedf89d3ba7aa9416ed24 (diff)
patch 8.2.5060: running configure failsv8.2.5060
Problem: Running configure fails. Solution: Remove line break.
-rwxr-xr-xsrc/auto/configure3
-rw-r--r--src/configure.ac3
-rw-r--r--src/version.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/auto/configure b/src/auto/configure
index e47369de80..3aef2f13ee 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -10593,8 +10593,7 @@ fi
done
else
- for ac_header in Xm/Xm.h Xm/XpmP.h Xm/JoinSideT.h Xm/TraitP.h Xm/Manager.h
- Xm/UnhighlightT.h Xm/Notebook.h
+ for ac_header in Xm/Xm.h Xm/XpmP.h Xm/JoinSideT.h Xm/TraitP.h Xm/Manager.h Xm/UnhighlightT.h Xm/Notebook.h
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
diff --git a/src/configure.ac b/src/configure.ac
index 93630a4163..37a7c6882c 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -3112,8 +3112,7 @@ if test -z "$SKIP_MOTIF"; then
if test "$zOSUnix" = "yes"; then
AC_CHECK_HEADERS(Xm/Xm.h)
else
- AC_CHECK_HEADERS(Xm/Xm.h Xm/XpmP.h Xm/JoinSideT.h Xm/TraitP.h Xm/Manager.h
- Xm/UnhighlightT.h Xm/Notebook.h)
+ AC_CHECK_HEADERS(Xm/Xm.h Xm/XpmP.h Xm/JoinSideT.h Xm/TraitP.h Xm/Manager.h Xm/UnhighlightT.h Xm/Notebook.h)
fi
if test "x$ac_cv_header_Xm_XpmP_h" = "xyes"; then
diff --git a/src/version.c b/src/version.c
index 29196096d1..a361f9ca91 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 5060,
+/**/
5059,
/**/
5058,