Mercurial > vim

comparison src/auto/configure @ 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
7957 $as_echo_n "checking --enable-multibyte argument... " >&6; } 7957 $as_echo_n "checking --enable-multibyte argument... " >&6; }
7958 # Check whether --enable-multibyte was given. 7958 # Check whether --enable-multibyte was given.
7959 if test "${enable_multibyte+set}" = set; then : 7959 if test "${enable_multibyte+set}" = set; then :
7960 enableval=$enable_multibyte; 7960 enableval=$enable_multibyte;
7961 else 7961 else
7962 enable_multibyte="no" 7962 enable_multibyte="yes"
7963 fi 7963 fi
7964 7964
7965 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_multibyte" >&5 7965 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_multibyte" >&5
7966 $as_echo "$enable_multibyte" >&6; } 7966 $as_echo "$enable_multibyte" >&6; }
7967 if test "$enable_multibyte" = "yes"; then 7967 if test "$enable_multibyte" = "yes"; then
7968 $as_echo "#define FEAT_MBYTE 1" >>confdefs.h 7968 $as_echo "#define FEAT_MBYTE 1" >>confdefs.h
7969 7969
7970 else
7971 as_fn_error $? "The multi-byte feature can no longer be disabled. If you have
7972 a problem with this, discuss on the Vim mailing list." "$LINENO" 5
7970 fi 7973 fi
7971 7974
7972 { $as_echo "$as_me:${as_lineno-$LINENO}: checking --disable-rightleft argument" >&5 7975 { $as_echo "$as_me:${as_lineno-$LINENO}: checking --disable-rightleft argument" >&5
7973 $as_echo_n "checking --disable-rightleft argument... " >&6; } 7976 $as_echo_n "checking --disable-rightleft argument... " >&6; }
7974 # Check whether --enable-rightleft was given. 7977 # Check whether --enable-rightleft was given.
14811 LIBS="$LIBS -framework Carbon" 14814 LIBS="$LIBS -framework Carbon"
14812 elif test "$MACOS_X_DARWIN" = "yes"; then 14815 elif test "$MACOS_X_DARWIN" = "yes"; then
14813 if test "$features" = "tiny"; then 14816 if test "$features" = "tiny"; then
14814 OS_EXTRA_SRC=`echo "$OS_EXTRA_SRC" | sed -e 's+os_macosx.m++'` 14817 OS_EXTRA_SRC=`echo "$OS_EXTRA_SRC" | sed -e 's+os_macosx.m++'`
14815 OS_EXTRA_OBJ=`echo "$OS_EXTRA_OBJ" | sed -e 's+objects/os_macosx.o++'` 14818 OS_EXTRA_OBJ=`echo "$OS_EXTRA_OBJ" | sed -e 's+objects/os_macosx.o++'`
14816 if test "$enable_multibyte" = "yes"; then 14819 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, we need CoreServices" >&5
14817 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, we need CoreServices" >&5
14818 $as_echo "yes, we need CoreServices" >&6; } 14820 $as_echo "yes, we need CoreServices" >&6; }
14819 LIBS="$LIBS -framework CoreServices" 14821 LIBS="$LIBS -framework CoreServices"
14820 else
14821 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14822 $as_echo "no" >&6; }
14823 OS_EXTRA_SRC=`echo "$OS_EXTRA_SRC" | sed -e 's+os_mac_conv.c++'`
14824 OS_EXTRA_OBJ=`echo "$OS_EXTRA_OBJ" | sed -e 's+objects/os_mac_conv.o++'`
14825 CPPFLAGS=`echo "$CPPFLAGS" | sed -e 's+-DMACOS_X_DARWIN++'`
14826 fi
14827 else 14822 else
14828 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, we need AppKit" >&5 14823 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, we need AppKit" >&5
14829 $as_echo "yes, we need AppKit" >&6; } 14824 $as_echo "yes, we need AppKit" >&6; }
14830 LIBS="$LIBS -framework AppKit" 14825 LIBS="$LIBS -framework AppKit"
14831 if test "$features" = "small" -a "$enable_multibyte" = "no"; then
14832 { $as_echo "$as_me:${as_lineno-$LINENO}: +multi_byte will be set in favor of +clipboard" >&5
14833 $as_echo "$as_me: +multi_byte will be set in favor of +clipboard" >&6;}
14834 enable_multibyte=yes
14835 $as_echo "#define FEAT_MBYTE 1" >>confdefs.h
14836
14837 fi
14838 fi 14826 fi
14839 else 14827 else
14840 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 14828 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14841 $as_echo "no" >&6; } 14829 $as_echo "no" >&6; }
14842 fi 14830 fi