Skip to content

Commit c604f94

Browse files
committed
install_vim.sh: use VIM_CONFIG_ARGS, select ncurses
1 parent b66d8ad commit c604f94

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

scripts/install_vim.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ EOF
5959
INSTALL_PREFIX="/vim-build/$VIM_NAME"
6060

6161
if [ "$FLAVOR" = vim ]; then
62-
CONFIG_ARGS="--prefix=$INSTALL_PREFIX --enable-multibyte --without-x --enable-gui=no --with-compiledby=vim-testbed"
62+
VIM_CONFIG_ARGS="--prefix=$INSTALL_PREFIX --enable-multibyte --without-x --enable-gui=no --with-compiledby=vim-testbed --with-tlib=ncurses"
6363
fi
6464
set +x
6565
echo "TAG:$TAG"
@@ -74,7 +74,7 @@ EOF
7474
if [ -n "$PYTHON2" ]; then
7575
apk add --virtual vim-build python-dev
7676
if [ "$FLAVOR" = vim ]; then
77-
CONFIG_ARGS="$CONFIG_ARGS --enable-pythoninterp=dynamic"
77+
VIM_CONFIG_ARGS="$VIM_CONFIG_ARGS --enable-pythoninterp=dynamic"
7878
else
7979
apk add --virtual vim-build py2-pip
8080
apk add python
@@ -85,7 +85,7 @@ EOF
8585
if [ -n "$PYTHON3" ]; then
8686
apk add --virtual vim-build python3-dev
8787
if [ "$FLAVOR" = vim ]; then
88-
CONFIG_ARGS="$CONFIG_ARGS --enable-python3interp=dynamic"
88+
VIM_CONFIG_ARGS="$VIM_CONFIG_ARGS --enable-python3interp=dynamic"
8989
else
9090
apk add python3
9191
pip3 install neovim
@@ -96,7 +96,7 @@ EOF
9696
apk add --virtual vim-build ruby-dev
9797
apk add ruby
9898
if [ "$FLAVOR" = vim ]; then
99-
CONFIG_ARGS="$CONFIG_ARGS --enable-rubyinterp"
99+
VIM_CONFIG_ARGS="$VIM_CONFIG_ARGS --enable-rubyinterp"
100100
else
101101
apk add --virtual vim-build ruby-rdoc ruby-irb
102102
gem install neovim
@@ -105,7 +105,7 @@ EOF
105105

106106
if [ $LUA -eq 1 ]; then
107107
if [ "$FLAVOR" = vim ]; then
108-
CONFIG_ARGS="$CONFIG_ARGS --enable-luainterp"
108+
VIM_CONFIG_ARGS="$VIM_CONFIG_ARGS --enable-luainterp"
109109
apk add --virtual vim-build lua-dev
110110
apk add lua
111111
else
@@ -114,7 +114,7 @@ EOF
114114
fi
115115

116116
if [ "$FLAVOR" = vim ] && [ -n "$CONFIGURE_OPTIONS" ]; then
117-
CONFIG_ARGS="$CONFIG_ARGS $CONFIGURE_OPTIONS"
117+
VIM_CONFIG_ARGS="$VIM_CONFIG_ARGS $CONFIGURE_OPTIONS"
118118
fi
119119

120120
cd /vim
@@ -196,9 +196,9 @@ build() {
196196
fi
197197
fi
198198

199-
echo "Configuring with: $CONFIG_ARGS"
199+
echo "Configuring with: $VIM_CONFIG_ARGS"
200200
# shellcheck disable=SC2086
201-
./configure $CONFIG_ARGS || bail "Could not configure"
201+
./configure $VIM_CONFIG_ARGS || bail "Could not configure"
202202
make CFLAGS="-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2" -j4 || bail "Make failed"
203203
make install || bail "Install failed"
204204

0 commit comments

Comments
 (0)