patch 9.0.0108: configure check for timer_create may give wrong error

Problem:    Configure check for timer_create may give wrong error.
Solution:   Give a warning instead of an error.

diff --git a/src/auto/configure b/src/auto/configure
index 1fd75e284c65cee75e5c68b3083f68eea964b9b4..18836113be254677ed4b2a1f86c01aefc06ae8e4 100755 (executable)
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -13044,7 +13044,8 @@ if ${vim_cv_timer_create+:} false; then :
 else
 
 if test "$cross_compiling" = yes; then :
-  as_fn_error $? "cross-compiling: please set 'vim_cv_timer_create'" "$LINENO" 5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: failed to build test program; if cross-compiling please set 'vim_cv_timer_create'" >&5
+$as_echo "$as_me: WARNING: failed to build test program; if cross-compiling please set 'vim_cv_timer_create'" >&2;}
 
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -13098,7 +13099,8 @@ if ${vim_cv_timer_create_with_lrt+:} false; then :
 else
 
     if test "$cross_compiling" = yes; then :
-  as_fn_error $? "cross-compiling: please set 'vim_cv_timer_create_with_lrt'" "$LINENO" 5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: failed to build test program; if cross-compiling please set 'vim_cv_timer_create_with_lrt'" >&5
+$as_echo "$as_me: WARNING: failed to build test program; if cross-compiling please set 'vim_cv_timer_create_with_lrt'" >&2;}
 
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext

diff --git a/src/configure.ac b/src/configure.ac
index d777b052fd5830ecf82747f121871f09f9a27b58..76eb56327cbf7ee519041fb586cc786094905b4f 100644 (file)
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -3828,7 +3828,7 @@ static void set_flag(union sigval sv) {}
   ])],
   vim_cv_timer_create=yes,
   vim_cv_timer_create=no,
-  AC_MSG_ERROR(cross-compiling: please set 'vim_cv_timer_create')
+  AC_MSG_WARN([failed to build test program; if cross-compiling please set 'vim_cv_timer_create'])
   )])
 
 dnl If the previous failed, check for timer_create() and linking with -lrt.
@@ -3856,7 +3856,7 @@ if test "x$vim_cv_timer_create" = "xno" ; then
       ])],
       vim_cv_timer_create_with_lrt=yes,
       vim_cv_timer_create_with_lrt=no,
-      AC_MSG_ERROR(cross-compiling: please set 'vim_cv_timer_create_with_lrt')
+      AC_MSG_WARN([failed to build test program; if cross-compiling please set 'vim_cv_timer_create_with_lrt'])
     )])
   LIBS="$save_LIBS"
 else

diff --git a/src/version.c b/src/version.c
index 79802aa65d76645ec1f054fbc7a44f7a725e4def..80bd894b07795db1b458d16c5a5ec5c8d165e88c 100644 (file)
--- 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 */
+/**/
+    108,
 /**/
     107,
 /**/