Patch 8.2.4129
Problem: Building with +sound but without +eval fails. (Dominique Pellé)
Solution: Disable canberra in tiny and small build. (closes #9548)
Files: src/configure.ac, src/auto/configure
*** ../vim-8.2.4128/src/configure.ac 2022-01-08 13:36:24.130742353 +0000
--- src/configure.ac 2022-01-18 11:08:55.729614563 +0000
***************
*** 540,545 ****
--- 540,551 ----
AC_SUBST(dovimdiff)
AC_SUBST(dogvimdiff)
+ if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then
+ has_eval=no
+ else
+ has_eval=yes
+ fi
+
AC_MSG_CHECKING(--with-compiledby argument)
AC_ARG_WITH(compiledby, [ --with-compiledby=NAME name to show in :version
message],
compiledby="$withval"; AC_MSG_RESULT($withval),
***************
*** 585,591 ****
AC_MSG_RESULT($enable_luainterp)
if test "$enable_luainterp" = "yes" -o "$enable_luainterp" = "dynamic"; then
! if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then
AC_MSG_ERROR([cannot use Lua with tiny or small features])
fi
--- 591,597 ----
AC_MSG_RESULT($enable_luainterp)
if test "$enable_luainterp" = "yes" -o "$enable_luainterp" = "dynamic"; then
! if test "$has_eval" = "no"; then
AC_MSG_ERROR([cannot use Lua with tiny or small features])
fi
***************
*** 1072,1078 ****
[enable_perlinterp="no"])
AC_MSG_RESULT($enable_perlinterp)
if test "$enable_perlinterp" = "yes" -o "$enable_perlinterp" = "dynamic"; then
! if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then
AC_MSG_ERROR([cannot use Perl with tiny or small features])
fi
AC_SUBST(vi_cv_path_perl)
--- 1078,1084 ----
[enable_perlinterp="no"])
AC_MSG_RESULT($enable_perlinterp)
if test "$enable_perlinterp" = "yes" -o "$enable_perlinterp" = "dynamic"; then
! if test "$has_eval" = "no"; then
AC_MSG_ERROR([cannot use Perl with tiny or small features])
fi
AC_SUBST(vi_cv_path_perl)
***************
*** 1221,1227 ****
[enable_pythoninterp="no"])
AC_MSG_RESULT($enable_pythoninterp)
if test "$enable_pythoninterp" = "yes" -o "$enable_pythoninterp" = "dynamic";
then
! if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then
AC_MSG_ERROR([cannot use Python with tiny or small features])
fi
--- 1227,1233 ----
[enable_pythoninterp="no"])
AC_MSG_RESULT($enable_pythoninterp)
if test "$enable_pythoninterp" = "yes" -o "$enable_pythoninterp" = "dynamic";
then
! if test "$has_eval" = "no"; then
AC_MSG_ERROR([cannot use Python with tiny or small features])
fi
***************
*** 1456,1462 ****
[enable_python3interp="no"])
AC_MSG_RESULT($enable_python3interp)
if test "$enable_python3interp" = "yes" -o "$enable_python3interp" =
"dynamic"; then
! if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then
AC_MSG_ERROR([cannot use Python with tiny or small features])
fi
--- 1462,1468 ----
[enable_python3interp="no"])
AC_MSG_RESULT($enable_python3interp)
if test "$enable_python3interp" = "yes" -o "$enable_python3interp" =
"dynamic"; then
! if test "$has_eval" = "no"; then
AC_MSG_ERROR([cannot use Python with tiny or small features])
fi
***************
*** 1969,1975 ****
[enable_rubyinterp="no"])
AC_MSG_RESULT($enable_rubyinterp)
if test "$enable_rubyinterp" = "yes" -o "$enable_rubyinterp" = "dynamic"; then
! if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then
AC_MSG_ERROR([cannot use Ruby with tiny or small features])
fi
--- 1975,1981 ----
[enable_rubyinterp="no"])
AC_MSG_RESULT($enable_rubyinterp)
if test "$enable_rubyinterp" = "yes" -o "$enable_rubyinterp" = "dynamic"; then
! if test "$has_eval" = "no"; then
AC_MSG_ERROR([cannot use Ruby with tiny or small features])
fi
***************
*** 2082,2088 ****
[ --disable-netbeans Disable NetBeans integration support.],
, [enable_netbeans="yes"])
if test "$enable_netbeans" = "yes"; then
! if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then
AC_MSG_RESULT([cannot use NetBeans with tiny or small features])
enable_netbeans="no"
else
--- 2088,2094 ----
[ --disable-netbeans Disable NetBeans integration support.],
, [enable_netbeans="yes"])
if test "$enable_netbeans" = "yes"; then
! if test "$has_eval" = "no"; then
AC_MSG_RESULT([cannot use NetBeans with tiny or small features])
enable_netbeans="no"
else
***************
*** 2097,2103 ****
[ --disable-channel Disable process communication support.],
, [enable_channel="yes"])
if test "$enable_channel" = "yes"; then
! if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then
AC_MSG_RESULT([cannot use channels with tiny or small features])
enable_channel="no"
else
--- 2103,2109 ----
[ --disable-channel Disable process communication support.],
, [enable_channel="yes"])
if test "$enable_channel" = "yes"; then
! if test "$has_eval" = "no"; then
AC_MSG_RESULT([cannot use channels with tiny or small features])
enable_channel="no"
else
***************
*** 2205,2211 ****
[ --enable-terminal Enable terminal emulation support.],
, [enable_terminal="auto"])
if test "$enable_terminal" = "yes" || test "$enable_terminal" = "auto" -a
"x$features" = "xhuge" ; then
! if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then
AC_MSG_RESULT([cannot use terminal emulator with tiny or small features])
enable_terminal="no"
else
--- 2211,2217 ----
[ --enable-terminal Enable terminal emulation support.],
, [enable_terminal="auto"])
if test "$enable_terminal" = "yes" || test "$enable_terminal" = "auto" -a
"x$features" = "xhuge" ; then
! if test "$has_eval" = "no"; then
AC_MSG_RESULT([cannot use terminal emulator with tiny or small features])
enable_terminal="no"
else
***************
*** 3794,3800 ****
enable_canberra="no"
fi
else
! AC_MSG_RESULT($enable_canberra)
fi
if test "$enable_canberra" = "yes"; then
if test "x$PKG_CONFIG" != "xno"; then
--- 3800,3811 ----
enable_canberra="no"
fi
else
! if test "$enable_canberra" = "yes" -a "$has_eval" = "no"; then
! AC_MSG_RESULT([cannot use sound with tiny or small features])
! enable_canberra="no"
! else
! AC_MSG_RESULT($enable_canberra)
! fi
fi
if test "$enable_canberra" = "yes"; then
if test "x$PKG_CONFIG" != "xno"; then
***************
*** 3808,3814 ****
AC_MSG_CHECKING(for libcanberra)
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
! if `echo "$CFLAGS" | grep -v "$canberra_cflags" >/dev/null`; then
CFLAGS="$CFLAGS $canberra_cflags"
fi
LIBS="$LIBS $canberra_lib"
--- 3819,3825 ----
AC_MSG_CHECKING(for libcanberra)
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
! if `echo "$CFLAGS" | grep -v "$canberra_cflags" 2>/dev/null`; then
CFLAGS="$CFLAGS $canberra_cflags"
fi
LIBS="$LIBS $canberra_lib"
*** ../vim-8.2.4128/src/auto/configure 2022-01-08 13:36:24.134742355 +0000
--- src/auto/configure 2022-01-18 11:08:58.617604181 +0000
***************
*** 5256,5261 ****
--- 5256,5267 ----
+ if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then
+ has_eval=no
+ else
+ has_eval=yes
+ fi
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-compiledby argument"
>&5
$as_echo_n "checking --with-compiledby argument... " >&6; }
***************
*** 5333,5339 ****
$as_echo "$enable_luainterp" >&6; }
if test "$enable_luainterp" = "yes" -o "$enable_luainterp" = "dynamic"; then
! if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then
as_fn_error $? "cannot use Lua with tiny or small features" "$LINENO" 5
fi
--- 5339,5345 ----
$as_echo "$enable_luainterp" >&6; }
if test "$enable_luainterp" = "yes" -o "$enable_luainterp" = "dynamic"; then
! if test "$has_eval" = "no"; then
as_fn_error $? "cannot use Lua with tiny or small features" "$LINENO" 5
fi
***************
*** 6103,6109 ****
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_perlinterp" >&5
$as_echo "$enable_perlinterp" >&6; }
if test "$enable_perlinterp" = "yes" -o "$enable_perlinterp" = "dynamic"; then
! if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then
as_fn_error $? "cannot use Perl with tiny or small features" "$LINENO" 5
fi
--- 6109,6115 ----
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_perlinterp" >&5
$as_echo "$enable_perlinterp" >&6; }
if test "$enable_perlinterp" = "yes" -o "$enable_perlinterp" = "dynamic"; then
! if test "$has_eval" = "no"; then
as_fn_error $? "cannot use Perl with tiny or small features" "$LINENO" 5
fi
***************
*** 6308,6314 ****
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_pythoninterp" >&5
$as_echo "$enable_pythoninterp" >&6; }
if test "$enable_pythoninterp" = "yes" -o "$enable_pythoninterp" = "dynamic";
then
! if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then
as_fn_error $? "cannot use Python with tiny or small features" "$LINENO" 5
fi
--- 6314,6320 ----
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_pythoninterp" >&5
$as_echo "$enable_pythoninterp" >&6; }
if test "$enable_pythoninterp" = "yes" -o "$enable_pythoninterp" = "dynamic";
then
! if test "$has_eval" = "no"; then
as_fn_error $? "cannot use Python with tiny or small features" "$LINENO" 5
fi
***************
*** 6659,6665 ****
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_python3interp" >&5
$as_echo "$enable_python3interp" >&6; }
if test "$enable_python3interp" = "yes" -o "$enable_python3interp" =
"dynamic"; then
! if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then
as_fn_error $? "cannot use Python with tiny or small features" "$LINENO" 5
fi
--- 6665,6671 ----
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_python3interp" >&5
$as_echo "$enable_python3interp" >&6; }
if test "$enable_python3interp" = "yes" -o "$enable_python3interp" =
"dynamic"; then
! if test "$has_eval" = "no"; then
as_fn_error $? "cannot use Python with tiny or small features" "$LINENO" 5
fi
***************
*** 7587,7593 ****
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_rubyinterp" >&5
$as_echo "$enable_rubyinterp" >&6; }
if test "$enable_rubyinterp" = "yes" -o "$enable_rubyinterp" = "dynamic"; then
! if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then
as_fn_error $? "cannot use Ruby with tiny or small features" "$LINENO" 5
fi
--- 7593,7599 ----
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_rubyinterp" >&5
$as_echo "$enable_rubyinterp" >&6; }
if test "$enable_rubyinterp" = "yes" -o "$enable_rubyinterp" = "dynamic"; then
! if test "$has_eval" = "no"; then
as_fn_error $? "cannot use Ruby with tiny or small features" "$LINENO" 5
fi
***************
*** 7765,7771 ****
fi
if test "$enable_netbeans" = "yes"; then
! if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot use NetBeans with
tiny or small features" >&5
$as_echo "cannot use NetBeans with tiny or small features" >&6; }
enable_netbeans="no"
--- 7771,7777 ----
fi
if test "$enable_netbeans" = "yes"; then
! if test "$has_eval" = "no"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot use NetBeans with
tiny or small features" >&5
$as_echo "cannot use NetBeans with tiny or small features" >&6; }
enable_netbeans="no"
***************
*** 7788,7794 ****
fi
if test "$enable_channel" = "yes"; then
! if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot use channels with
tiny or small features" >&5
$as_echo "cannot use channels with tiny or small features" >&6; }
enable_channel="no"
--- 7794,7800 ----
fi
if test "$enable_channel" = "yes"; then
! if test "$has_eval" = "no"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot use channels with
tiny or small features" >&5
$as_echo "cannot use channels with tiny or small features" >&6; }
enable_channel="no"
***************
*** 8092,8098 ****
fi
if test "$enable_terminal" = "yes" || test "$enable_terminal" = "auto" -a
"x$features" = "xhuge" ; then
! if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot use terminal
emulator with tiny or small features" >&5
$as_echo "cannot use terminal emulator with tiny or small features" >&6; }
enable_terminal="no"
--- 8098,8104 ----
fi
if test "$enable_terminal" = "yes" || test "$enable_terminal" = "auto" -a
"x$features" = "xhuge" ; then
! if test "$has_eval" = "no"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot use terminal
emulator with tiny or small features" >&5
$as_echo "cannot use terminal emulator with tiny or small features" >&6; }
enable_terminal="no"
***************
*** 13051,13058 ****
enable_canberra="no"
fi
else
! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_canberra" >&5
$as_echo "$enable_canberra" >&6; }
fi
if test "$enable_canberra" = "yes"; then
if test "x$PKG_CONFIG" != "xno"; then
--- 13057,13070 ----
enable_canberra="no"
fi
else
! if test "$enable_canberra" = "yes" -a "$has_eval" = "no"; then
! { $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot use sound with
tiny or small features" >&5
! $as_echo "cannot use sound with tiny or small features" >&6; }
! enable_canberra="no"
! else
! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_canberra" >&5
$as_echo "$enable_canberra" >&6; }
+ fi
fi
if test "$enable_canberra" = "yes"; then
if test "x$PKG_CONFIG" != "xno"; then
***************
*** 13067,13073 ****
$as_echo_n "checking for libcanberra... " >&6; }
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
! if `echo "$CFLAGS" | grep -v "$canberra_cflags" >/dev/null`; then
CFLAGS="$CFLAGS $canberra_cflags"
fi
LIBS="$LIBS $canberra_lib"
--- 13079,13085 ----
$as_echo_n "checking for libcanberra... " >&6; }
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
! if `echo "$CFLAGS" | grep -v "$canberra_cflags" 2>/dev/null`; then
CFLAGS="$CFLAGS $canberra_cflags"
fi
LIBS="$LIBS $canberra_lib"
*** ../vim-8.2.4128/src/version.c 2022-01-18 10:37:23.757431028 +0000
--- src/version.c 2022-01-18 10:51:48.328085350 +0000
***************
*** 752,753 ****
--- 752,755 ----
{ /* Add new patch number below this line */
+ /**/
+ 4129,
/**/
--
DENNIS: Listen -- strange women lying in ponds distributing swords is no
basis for a system of government. Supreme executive power derives
from a mandate from the masses, not from some farcical aquatic
ceremony.
The Quest for the Holy Grail (Monty Python)
/// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/20220118111202.DDFFE1C044E%40moolenaar.net.
