diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-07-30 11:00:50 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-07-30 11:00:50 +0100 |
| commit | 5f6cae8b8a49c435556e32f84d067cd0b4d28e4c (patch) | |
| tree | afbbc0a280a61666137fdb031f71e69f339d6a37 | |
| parent | 2ecbe53f452e92e941aff623f6a0b72f80e43d07 (diff) | |
patch 9.0.0108: configure check for timer_create may give wrong errorv9.0.0108
Problem: Configure check for timer_create may give wrong error.
Solution: Give a warning instead of an error.
| -rwxr-xr-x | src/auto/configure | 6 | ||||
| -rw-r--r-- | src/configure.ac | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/src/auto/configure b/src/auto/configure index 1fd75e284c..18836113be 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 d777b052fd..76eb56327c 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 79802aa65d..80bd894b07 100644 --- 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, |