Patch 8.2.4039
Problem: The xdiff library is linked in even when not used.
Solution: Use configure to decide whether xdiff object files are included.
Files: src/Makefile, src/config.mk.in, src/configure.ac,
src/auto/configure, src/feature.h
*** ../vim-8.2.4038/src/Makefile 2021-12-28 15:51:40.075738201 +0000
--- src/Makefile 2022-01-08 13:34:42.442873470 +0000
***************
*** 1874,1880 ****
$(OS_EXTRA_OBJ) \
$(NETBEANS_OBJ) \
$(CHANNEL_OBJ) \
! $(XDIFF_OBJS)
# The files included by tests are not in OBJ_COMMON.
OBJ_MAIN = \
--- 1874,1880 ----
$(OS_EXTRA_OBJ) \
$(NETBEANS_OBJ) \
$(CHANNEL_OBJ) \
! $(XDIFF_OBJS_USED)
# The files included by tests are not in OBJ_COMMON.
OBJ_MAIN = \
*** ../vim-8.2.4038/src/config.mk.in 2021-12-28 15:51:40.079738196 +0000
--- src/config.mk.in 2022-01-08 12:45:23.028520961 +0000
***************
*** 37,42 ****
--- 37,44 ----
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIB@
+ XDIFF_OBJS_USED = @XDIFF_OBJS_USED@
+
LUA_LIBS = @LUA_LIBS@
LUA_SRC = @LUA_SRC@
LUA_OBJ = @LUA_OBJ@
*** ../vim-8.2.4038/src/configure.ac 2021-12-28 15:51:40.079738196 +0000
--- src/configure.ac 2022-01-08 13:29:50.959901121 +0000
***************
*** 567,572 ****
--- 567,582 ----
AC_MSG_RESULT(yes)
fi
+ AC_MSG_CHECKING([diff feature])
+ if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then
+ AC_MSG_RESULT([disabled in $features version])
+ else
+ AC_MSG_RESULT(enabled)
+ AC_DEFINE(FEAT_DIFF)
+ XDIFF_OBJS_USED="\$(XDIFF_OBJS)"
+ AC_SUBST(XDIFF_OBJS_USED)
+ fi
+
dnl Check for Lua feature.
AC_MSG_CHECKING(--enable-luainterp argument)
AC_ARG_ENABLE(luainterp,
*** ../vim-8.2.4038/src/auto/configure 2021-12-28 15:51:40.079738196 +0000
--- src/auto/configure 2022-01-08 13:29:53.463892052 +0000
***************
*** 714,719 ****
--- 714,720 ----
vi_cv_path_plain_lua
vi_cv_path_luajit
vi_cv_path_lua
+ XDIFF_OBJS_USED
compiledby
dogvimdiff
dovimdiff
***************
*** 5305,5310 ****
--- 5306,5325 ----
$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.
*** ../vim-8.2.4038/src/feature.h 2022-01-01 14:19:44.028353885 +0000
--- src/feature.h 2022-01-08 12:55:55.559584798 +0000
***************
*** 345,352 ****
/*
* +diff Displaying diffs in a nice way.
* Requires +windows and +autocmd.
*/
! #if defined(FEAT_NORMAL)
# define FEAT_DIFF
#endif
--- 345,353 ----
/*
* +diff Displaying diffs in a nice way.
* Requires +windows and +autocmd.
+ * Can be enabled in autoconf already.
*/
! #if defined(FEAT_NORMAL) && !defined(FEAT_DIFF)
# define FEAT_DIFF
#endif
*** ../vim-8.2.4038/src/version.c 2022-01-08 12:41:12.212795547 +0000
--- src/version.c 2022-01-08 13:31:31.431540929 +0000
***************
*** 752,753 ****
--- 752,755 ----
{ /* Add new patch number below this line */
+ /**/
+ 4039,
/**/
--
hundred-and-one symptoms of being an internet addict:
257. Your "hundred-and-one" lists include well over 101 items, since you
automatically interpret all numbers in hexadecimal notation.
(hex 101 = decimal 257)
/// 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/20220108133727.7FA6E1C0C78%40moolenaar.net.
