diff options
author | Bram Moolenaar <Bram@vim.org> | 2022-01-08 13:36:57 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2022-01-08 13:36:57 +0000 |
commit | 67ffb417861a90fd2c1b215a42fd230272ed94cb (patch) | |
tree | 25b56d4048bbabe4d6c4aef70517d686985718ac /src/auto | |
parent | 748b308eebe8d8860888eb27da08333f175d547d (diff) | |
download | vim-git-67ffb417861a90fd2c1b215a42fd230272ed94cb.tar.gz |
patch 8.2.4039: the xdiff library is linked in even when not usedv8.2.4039
Problem: The xdiff library is linked in even when not used.
Solution: Use configure to decide whether xdiff object files are included.
Diffstat (limited to 'src/auto')
-rwxr-xr-x | src/auto/configure | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/auto/configure b/src/auto/configure index cde05d688..72d2d076d 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -714,6 +714,7 @@ LUA_SRC vi_cv_path_plain_lua vi_cv_path_luajit vi_cv_path_lua +XDIFF_OBJS_USED compiledby dogvimdiff dovimdiff @@ -5305,6 +5306,20 @@ else $as_echo "yes" >&6; } fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking diff feature" >&5 +$as_echo_n "checking diff feature... " >&6; } +if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled in $features version" >&5 +$as_echo "disabled in $features version" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: enabled" >&5 +$as_echo "enabled" >&6; } + $as_echo "#define FEAT_DIFF 1" >>confdefs.h + + XDIFF_OBJS_USED="\$(XDIFF_OBJS)" + +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-luainterp argument" >&5 $as_echo_n "checking --enable-luainterp argument... " >&6; } # Check whether --enable-luainterp was given. |