changeset 29534:e491e48757d7 v9.0.0108

patch 9.0.0108: configure check for timer_create may give wrong error Commit: https://github.com/vim/vim/commit/5f6cae8b8a49c435556e32f84d067cd0b4d28e4c Author: Bram Moolenaar <Bram@vim.org> Date: Sat Jul 30 11:00:50 2022 +0100 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.
author Bram Moolenaar <Bram@vim.org>
date Sat, 30 Jul 2022 12:15:07 +0200
parents 34c1f4cd0c18
children 0dea4955e34b
files src/auto/configure src/configure.ac src/version.c
diffstat 3 files changed, 8 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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+:} fal
 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
--- 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" 
       ])],
       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
--- a/src/version.c
+++ b/src/version.c
@@ -736,6 +736,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    108,
+/**/
     107,
 /**/
     106,