Skip to content

Commit f29bdf5

Browse files
committed
install_vim.sh: use VIM_CONFIG_ARGS, select ncurses
1 parent 1b4bf19 commit f29bdf5

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
@@ -60,7 +60,7 @@ EOF
6060
INSTALL_PREFIX="/vim-build/$VIM_NAME"
6161

6262
if [ "$FLAVOR" = vim ]; then
63-
CONFIG_ARGS="--prefix=$INSTALL_PREFIX --enable-multibyte --without-x --enable-gui=no --with-compiledby=vim-testbed"
63+
VIM_CONFIG_ARGS="--prefix=$INSTALL_PREFIX --enable-multibyte --without-x --enable-gui=no --with-compiledby=vim-testbed --with-tlib=ncurses"
6464
fi
6565
set +x
6666
echo "TAG:$TAG"
@@ -75,7 +75,7 @@ EOF
7575
if [ -n "$PYTHON2" ]; then
7676
apk add --virtual vim-build python-dev
7777
if [ "$FLAVOR" = vim ]; then
78-
CONFIG_ARGS="$CONFIG_ARGS --enable-pythoninterp=dynamic"
78+
VIM_CONFIG_ARGS="$VIM_CONFIG_ARGS --enable-pythoninterp=dynamic"
7979
else
8080
apk add --virtual vim-build py2-pip
8181
apk add python
@@ -86,7 +86,7 @@ EOF
8686
if [ -n "$PYTHON3" ]; then
8787
apk add --virtual vim-build python3-dev
8888
if [ "$FLAVOR" = vim ]; then
89-
CONFIG_ARGS="$CONFIG_ARGS --enable-python3interp=dynamic"
89+
VIM_CONFIG_ARGS="$VIM_CONFIG_ARGS --enable-python3interp=dynamic"
9090
else
9191
apk add python3
9292
pip3 install neovim
@@ -97,7 +97,7 @@ EOF
9797
apk add --virtual vim-build ruby-dev
9898
apk add ruby
9999
if [ "$FLAVOR" = vim ]; then
100-
CONFIG_ARGS="$CONFIG_ARGS --enable-rubyinterp"
100+
VIM_CONFIG_ARGS="$VIM_CONFIG_ARGS --enable-rubyinterp"
101101
else
102102
apk add --virtual vim-build ruby-rdoc ruby-irb
103103
gem install neovim
@@ -106,7 +106,7 @@ EOF
106106

107107
if [ $LUA -eq 1 ]; then
108108
if [ "$FLAVOR" = vim ]; then
109-
CONFIG_ARGS="$CONFIG_ARGS --enable-luainterp"
109+
VIM_CONFIG_ARGS="$VIM_CONFIG_ARGS --enable-luainterp"
110110
apk add --virtual vim-build lua5.3-dev
111111
apk add lua5.3-libs
112112
else
@@ -115,7 +115,7 @@ EOF
115115
fi
116116

117117
if [ "$FLAVOR" = vim ] && [ -n "$CONFIGURE_OPTIONS" ]; then
118-
CONFIG_ARGS="$CONFIG_ARGS $CONFIGURE_OPTIONS"
118+
VIM_CONFIG_ARGS="$VIM_CONFIG_ARGS $CONFIGURE_OPTIONS"
119119
fi
120120

121121
cd /vim
@@ -192,9 +192,9 @@ build() {
192192
fi
193193
fi
194194

195-
echo "Configuring with: $CONFIG_ARGS"
195+
echo "Configuring with: $VIM_CONFIG_ARGS"
196196
# shellcheck disable=SC2086
197-
./configure $CONFIG_ARGS || bail "Could not configure"
197+
./configure $VIM_CONFIG_ARGS || bail "Could not configure"
198198
make CFLAGS="-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2" -j4 || bail "Make failed"
199199
make install || bail "Install failed"
200200

0 commit comments

Comments
 (0)