Mercurial > vim

comparison src/configure.ac @ 15450:bb421f682528 v8.1.0733

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.0733: too many #ifdefs for the multi-byte feature commit https://github.com/vim/vim/commit/2be7cb73f66cf69659195d9a8ad4beaa359f2865 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Jan 12 16:10:51 2019 +0100 patch 8.1.0733: too many #ifdefs for the multi-byte feature Problem: Too many #ifdefs for the multi-byte feature. Solution: Tentatively always enable the multi-byte feature. If you have a problem with this, please discuss on the Vim maillist.
author Bram Moolenaar <Bram@vim.org>
date Sat, 12 Jan 2019 16:15:04 +0100
parents cd0fdfe83217
children 41fbbcea0f1b
comparison
equal deleted inserted replaced
15449:869f88d11e31 15450:bb421f682528
2136 fi 2136 fi
2137 2137
2138 AC_MSG_CHECKING(--enable-multibyte argument) 2138 AC_MSG_CHECKING(--enable-multibyte argument)
2139 AC_ARG_ENABLE(multibyte, 2139 AC_ARG_ENABLE(multibyte,
2140 [ --enable-multibyte Include multibyte editing support.], , 2140 [ --enable-multibyte Include multibyte editing support.], ,
2141 [enable_multibyte="no"]) 2141 [enable_multibyte="yes"])
2142 AC_MSG_RESULT($enable_multibyte) 2142 AC_MSG_RESULT($enable_multibyte)
2143 if test "$enable_multibyte" = "yes"; then 2143 if test "$enable_multibyte" = "yes"; then
2144 AC_DEFINE(FEAT_MBYTE) 2144 AC_DEFINE(FEAT_MBYTE)
2145 else
2146 AC_MSG_ERROR([The multi-byte feature can no longer be disabled. If you have
2147 a problem with this, discuss on the Vim mailing list.])
2145 fi 2148 fi
2146 2149
2147 dnl Right-to-Left language support for Vim will be included with big features, 2150 dnl Right-to-Left language support for Vim will be included with big features,
2148 dnl unless ENABLE_RIGHTLEFT is undefined. 2151 dnl unless ENABLE_RIGHTLEFT is undefined.
2149 AC_MSG_CHECKING(--disable-rightleft argument) 2152 AC_MSG_CHECKING(--disable-rightleft argument)
4414 elif test "$MACOS_X_DARWIN" = "yes"; then 4417 elif test "$MACOS_X_DARWIN" = "yes"; then
4415 if test "$features" = "tiny"; then 4418 if test "$features" = "tiny"; then
4416 dnl Since no FEAT_CLIPBOARD, no longer need for os_macosx.m. 4419 dnl Since no FEAT_CLIPBOARD, no longer need for os_macosx.m.
4417 OS_EXTRA_SRC=`echo "$OS_EXTRA_SRC" | sed -e 's+os_macosx.m++'` 4420 OS_EXTRA_SRC=`echo "$OS_EXTRA_SRC" | sed -e 's+os_macosx.m++'`
4418 OS_EXTRA_OBJ=`echo "$OS_EXTRA_OBJ" | sed -e 's+objects/os_macosx.o++'` 4421 OS_EXTRA_OBJ=`echo "$OS_EXTRA_OBJ" | sed -e 's+objects/os_macosx.o++'`
4419 if test "$enable_multibyte" = "yes"; then 4422 AC_MSG_RESULT([yes, we need CoreServices])
4420 AC_MSG_RESULT([yes, we need CoreServices]) 4423 LIBS="$LIBS -framework CoreServices"
4421 LIBS="$LIBS -framework CoreServices"
4422 else
4423 dnl Since no FEAT_MBYTE, no longer need for os_mac_conv.c.
4424 AC_MSG_RESULT([no])
4425 OS_EXTRA_SRC=`echo "$OS_EXTRA_SRC" | sed -e 's+os_mac_conv.c++'`
4426 OS_EXTRA_OBJ=`echo "$OS_EXTRA_OBJ" | sed -e 's+objects/os_mac_conv.o++'`
4427 CPPFLAGS=`echo "$CPPFLAGS" | sed -e 's+-DMACOS_X_DARWIN++'`
4428 fi
4429 else 4424 else
4430 AC_MSG_RESULT([yes, we need AppKit]) 4425 AC_MSG_RESULT([yes, we need AppKit])
4431 LIBS="$LIBS -framework AppKit" 4426 LIBS="$LIBS -framework AppKit"
4432 if test "$features" = "small" -a "$enable_multibyte" = "no"; then
4433 dnl Since FEAT_CLIPBOARD is to be defined in vim.h for FEAT_SMALL, define
4434 dnl FEAT_MBYTE in order not to compromise the interoperability of the
4435 dnl clipboard.
4436 AC_MSG_NOTICE([+multi_byte will be set in favor of +clipboard])
4437 enable_multibyte=yes
4438 AC_DEFINE(FEAT_MBYTE)
4439 fi
4440 fi 4427 fi
4441 else 4428 else
4442 AC_MSG_RESULT([no]) 4429 AC_MSG_RESULT([no])
4443 fi 4430 fi
4444 fi 4431 fi