From: Bram Moolenaar Date: Sat, 30 Jul 2022 10:00:50 +0000 (+0100) Subject: patch 9.0.0108: configure check for timer_create may give wrong error X-Git-Tag: v9.0.0108 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5f6cae8b8a49c435556e32f84d067cd0b4d28e4c;p=vim 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 1fd75e284..18836113b 100755 --- 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 d777b052f..76eb56327 100644 --- 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 79802aa65..80bd894b0 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 */ +/**/ + 108, /**/ 107, /**/