Mercurial > vim

comparison src/configure.ac @ 18267:da6a7491e148 v8.1.2128

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.2128: renamed libvterm sources makes merging difficult Commit: https://github.com/vim/vim/commit/93268054428fe3a6bbe3f89d2def2fec4eabcf5f Author: Bram Moolenaar <Bram@vim.org> Date: Thu Oct 10 13:22:54 2019 +0200 patch 8.1.2128: renamed libvterm sources makes merging difficult Problem: Renamed libvterm sources makes merging difficult. Solution: Rename back to the original name and only rename the .o files. Also clean the libvterm build artifacts. (James McCoy, closes #5027)
author Bram Moolenaar <Bram@vim.org>
date Thu, 10 Oct 2019 13:30:04 +0200
parents 1868ec23360e
children 2329061e6289
comparison
equal deleted inserted replaced
18266:4af19863e264 18267:da6a7491e148
2102 AC_MSG_RESULT(no) 2102 AC_MSG_RESULT(no)
2103 fi 2103 fi
2104 fi 2104 fi
2105 if test "$enable_terminal" = "yes" -a "$enable_channel" = "yes"; then 2105 if test "$enable_terminal" = "yes" -a "$enable_channel" = "yes"; then
2106 AC_DEFINE(FEAT_TERMINAL) 2106 AC_DEFINE(FEAT_TERMINAL)
2107 TERM_SRC="libvterm/src/encoding.c libvterm/src/keyboard.c libvterm/src/mouse.c libvterm/src/parser.c libvterm/src/pen.c libvterm/src/termscreen.c libvterm/src/state.c libvterm/src/unicode.c libvterm/src/vterm.c" 2107 TERM_SRC="libvterm/src/encoding.c libvterm/src/keyboard.c libvterm/src/mouse.c libvterm/src/parser.c libvterm/src/pen.c libvterm/src/creen.c libvterm/src/state.c libvterm/src/unicode.c libvterm/src/vterm.c"
2108 AC_SUBST(TERM_SRC) 2108 AC_SUBST(TERM_SRC)
2109 TERM_OBJ="objects/encoding.o objects/keyboard.o objects/termmouse.o objects/parser.o objects/pen.o objects/termscreen.o objects/state.o objects/unicode.o objects/vterm.o" 2109 TERM_OBJ="objects/vterm_encoding.o objects/vterm_keyboard.o objects/vterm_mouse.o objects/vterm_parser.o objects/vterm_pen.o objects/vterm_screen.o objects/vterm_state.o objects/vterm_unicode.o objects/vterm_vterm.o"
2110 AC_SUBST(TERM_OBJ) 2110 AC_SUBST(TERM_OBJ)
2111 fi 2111 fi
2112 2112
2113 AC_MSG_CHECKING(--enable-autoservername argument) 2113 AC_MSG_CHECKING(--enable-autoservername argument)
2114 AC_ARG_ENABLE(autoservername, 2114 AC_ARG_ENABLE(autoservername,