Mercurial > vim

comparison src/configure.ac @ 12716:351cf7c67bbe v8.0.1236

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.0.1236: Mac features are confusing commit https://github.com/vim/vim/commit/d057301b1f28736f094affa17b190244ad56e8d9 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Oct 28 21:11:06 2017 +0200 patch 8.0.1236: Mac features are confusing Problem: Mac features are confusing. Solution: Make feature names more consistent, add "osxdarwin". Rename feature flags, cleanup Mac code. (Kazunobu Kuriyama, closes #2178)
author Christian Brabandt <cb@256bit.org>
date Sat, 28 Oct 2017 21:15:35 +0200
parents baf88919c791
children f473855aa9a9
comparison
equal deleted inserted replaced
12715:279ec0abb4ac 12716:351cf7c67bbe
132 dnl We do a check for MacOS X in the very beginning because there 132 dnl We do a check for MacOS X in the very beginning because there
133 dnl are a lot of other things we need to change besides GUI stuff 133 dnl are a lot of other things we need to change besides GUI stuff
134 AC_MSG_CHECKING([for Darwin (Mac OS X)]) 134 AC_MSG_CHECKING([for Darwin (Mac OS X)])
135 if test "`(uname) 2>/dev/null`" = Darwin; then 135 if test "`(uname) 2>/dev/null`" = Darwin; then
136 AC_MSG_RESULT(yes) 136 AC_MSG_RESULT(yes)
137 MACOS_X=yes
138 CPPFLAGS="$CPPFLAGS -DMACOS_X"
137 139
138 AC_MSG_CHECKING(--disable-darwin argument) 140 AC_MSG_CHECKING(--disable-darwin argument)
139 AC_ARG_ENABLE(darwin, 141 AC_ARG_ENABLE(darwin,
140 [ --disable-darwin Disable Darwin (Mac OS X) support.], 142 [ --disable-darwin Disable Darwin (Mac OS X) support.],
141 , [enable_darwin="yes"]) 143 , [enable_darwin="yes"])
206 CPPFLAGS="$CPPFLAGS -arch ppc" 208 CPPFLAGS="$CPPFLAGS -arch ppc"
207 LDFLAGS="$LDFLAGS -arch ppc" 209 LDFLAGS="$LDFLAGS -arch ppc"
208 fi 210 fi
209 211
210 if test "$enable_darwin" = "yes"; then 212 if test "$enable_darwin" = "yes"; then
211 MACOSX=yes 213 MACOS_X_DARWIN=yes
212 OS_EXTRA_SRC="os_macosx.m os_mac_conv.c"; 214 OS_EXTRA_SRC="os_macosx.m os_mac_conv.c";
213 OS_EXTRA_OBJ="objects/os_macosx.o objects/os_mac_conv.o" 215 OS_EXTRA_OBJ="objects/os_macosx.o objects/os_mac_conv.o"
214 dnl TODO: use -arch i386 on Intel machines 216 dnl TODO: use -arch i386 on Intel machines
215 dnl Removed -no-cpp-precomp, only for very old compilers. 217 dnl Removed -no-cpp-precomp, only for very old compilers.
216 CPPFLAGS="$CPPFLAGS -DMACOS_X_UNIX" 218 CPPFLAGS="$CPPFLAGS -DMACOS_X_DARWIN"
217 219
218 dnl If Carbon is found, assume we don't want X11 220 dnl If Carbon is found, assume we don't want X11
219 dnl unless it was specifically asked for (--with-x) 221 dnl unless it was specifically asked for (--with-x)
220 dnl or Motif, Athena or GTK GUI is used. 222 dnl or Motif, Athena or GTK GUI is used.
221 AC_CHECK_HEADER(Carbon/Carbon.h, CARBON=yes) 223 AC_CHECK_HEADER(Carbon/Carbon.h, CARBON=yes)
624 luajit="jit" 626 luajit="jit"
625 fi 627 fi
626 if test -f "${vi_cv_path_lua_pfx}/bin/cyglua-${vi_cv_version_lua}.dll"; then 628 if test -f "${vi_cv_path_lua_pfx}/bin/cyglua-${vi_cv_version_lua}.dll"; then
627 vi_cv_dll_name_lua="cyglua-${vi_cv_version_lua}.dll" 629 vi_cv_dll_name_lua="cyglua-${vi_cv_version_lua}.dll"
628 else 630 else
629 if test "x$MACOSX" = "xyes"; then 631 if test "x$MACOS_X" = "xyes"; then
630 ext="dylib" 632 ext="dylib"
631 indexes="" 633 indexes=""
632 else 634 else
633 ext="so" 635 ext="so"
634 indexes=".0 .1 .2 .3 .4 .5 .6 .7 .8 .9" 636 indexes=".0 .1 .2 .3 .4 .5 .6 .7 .8 .9"
668 AC_DEFINE(DYNAMIC_LUA) 670 AC_DEFINE(DYNAMIC_LUA)
669 LUA_LIBS="" 671 LUA_LIBS=""
670 LUA_CFLAGS="-DDYNAMIC_LUA_DLL=\\\"${vi_cv_dll_name_lua}\\\" $LUA_CFLAGS" 672 LUA_CFLAGS="-DDYNAMIC_LUA_DLL=\\\"${vi_cv_dll_name_lua}\\\" $LUA_CFLAGS"
671 fi 673 fi
672 if test "X$LUA_CFLAGS$LUA_LIBS" != "X" && \ 674 if test "X$LUA_CFLAGS$LUA_LIBS" != "X" && \
673 test "x$MACOSX" = "xyes" && test "x$vi_cv_with_luajit" != "xno" && \ 675 test "x$MACOS_X" = "xyes" && test "x$vi_cv_with_luajit" != "xno" && \
674 test "`(uname -m) 2>/dev/null`" = "x86_64"; then 676 test "`(uname -m) 2>/dev/null`" = "x86_64"; then
675 dnl OSX/x64 requires these flags. See http://luajit.org/install.html 677 dnl OSX/x64 requires these flags. See http://luajit.org/install.html
676 LUA_LIBS="-pagezero_size 10000 -image_base 100000000 $LUA_LIBS" 678 LUA_LIBS="-pagezero_size 10000 -image_base 100000000 $LUA_LIBS"
677 fi 679 fi
678 fi 680 fi
800 AC_MSG_RESULT(not found) 802 AC_MSG_RESULT(not found)
801 fi 803 fi
802 804
803 for path in "${vi_cv_path_mzscheme_pfx}/lib" "${SCHEME_LIB}"; do 805 for path in "${vi_cv_path_mzscheme_pfx}/lib" "${SCHEME_LIB}"; do
804 if test "X$path" != "X"; then 806 if test "X$path" != "X"; then
805 if test "x$MACOSX" = "xyes"; then 807 if test "x$MACOS_X" = "xyes"; then
806 MZSCHEME_LIBS="-framework Racket" 808 MZSCHEME_LIBS="-framework Racket"
807 MZSCHEME_CFLAGS="-DMZ_PRECISE_GC" 809 MZSCHEME_CFLAGS="-DMZ_PRECISE_GC"
808 elif test -f "${path}/libmzscheme3m.a"; then 810 elif test -f "${path}/libmzscheme3m.a"; then
809 MZSCHEME_LIBS="${path}/libmzscheme3m.a" 811 MZSCHEME_LIBS="${path}/libmzscheme3m.a"
810 MZSCHEME_CFLAGS="-DMZ_PRECISE_GC" 812 MZSCHEME_CFLAGS="-DMZ_PRECISE_GC"
1057 else 1059 else
1058 AC_MSG_RESULT(>>> too old; need Perl version 5.003_01 or later <<<) 1060 AC_MSG_RESULT(>>> too old; need Perl version 5.003_01 or later <<<)
1059 fi 1061 fi
1060 fi 1062 fi
1061 1063
1062 if test "x$MACOSX" = "xyes"; then 1064 if test "x$MACOS_X" = "xyes"; then
1063 dnl Mac OS X 10.2 or later 1065 dnl Mac OS X 10.2 or later
1064 dir=/System/Library/Perl 1066 dir=/System/Library/Perl
1065 darwindir=$dir/darwin 1067 darwindir=$dir/darwin
1066 if test -d $darwindir; then 1068 if test -d $darwindir; then
1067 PERL=/usr/bin/perl 1069 PERL=/usr/bin/perl
1199 @echo "python_PYTHONFRAMEWORKINSTALLDIR='$(PYTHONFRAMEWORKINSTALLDIR)'" 1201 @echo "python_PYTHONFRAMEWORKINSTALLDIR='$(PYTHONFRAMEWORKINSTALLDIR)'"
1200 eof 1202 eof
1201 dnl -- delete the lines from make about Entering/Leaving directory 1203 dnl -- delete the lines from make about Entering/Leaving directory
1202 eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`" 1204 eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
1203 rm -f -- "${tmp_mkf}" 1205 rm -f -- "${tmp_mkf}"
1204 if test "x$MACOSX" = "xyes" && test -n "${python_PYTHONFRAMEWORK}" && ${vi_cv_path_python} -c \ 1206 if test "x$MACOS_X" = "xyes" && test -n "${python_PYTHONFRAMEWORK}" && ${vi_cv_path_python} -c \
1205 "import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then 1207 "import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then
1206 vi_cv_path_python_plibs="-framework Python" 1208 vi_cv_path_python_plibs="-framework Python"
1207 if test "x${vi_cv_path_python}" != "x/usr/bin/python" && test -n "${python_PYTHONFRAMEWORKPREFIX}"; then 1209 if test "x${vi_cv_path_python}" != "x/usr/bin/python" && test -n "${python_PYTHONFRAMEWORKPREFIX}"; then
1208 vi_cv_path_python_plibs="-F${python_PYTHONFRAMEWORKPREFIX} -framework Python" 1210 vi_cv_path_python_plibs="-F${python_PYTHONFRAMEWORKPREFIX} -framework Python"
1209 fi 1211 fi
1267 dnl will then define target-specific defines, e.g., -D_REENTRANT. 1269 dnl will then define target-specific defines, e.g., -D_REENTRANT.
1268 dnl Don't do this for Mac OSX, -pthread will generate a warning. 1270 dnl Don't do this for Mac OSX, -pthread will generate a warning.
1269 AC_MSG_CHECKING([if -pthread should be used]) 1271 AC_MSG_CHECKING([if -pthread should be used])
1270 threadsafe_flag= 1272 threadsafe_flag=
1271 thread_lib= 1273 thread_lib=
1272 dnl if test "x$MACOSX" != "xyes"; then 1274 dnl if test "x$MACOS_X" != "xyes"; then
1273 if test "`(uname) 2>/dev/null`" != Darwin; then 1275 if test "`(uname) 2>/dev/null`" != Darwin; then
1274 test "$GCC" = yes && threadsafe_flag="-pthread" 1276 test "$GCC" = yes && threadsafe_flag="-pthread"
1275 if test "`(uname) 2>/dev/null`" = FreeBSD; then 1277 if test "`(uname) 2>/dev/null`" = FreeBSD; then
1276 threadsafe_flag="-D_THREAD_SAFE" 1278 threadsafe_flag="-D_THREAD_SAFE"
1277 thread_lib="-pthread" 1279 thread_lib="-pthread"
1472 dnl will then define target-specific defines, e.g., -D_REENTRANT. 1474 dnl will then define target-specific defines, e.g., -D_REENTRANT.
1473 dnl Don't do this for Mac OSX, -pthread will generate a warning. 1475 dnl Don't do this for Mac OSX, -pthread will generate a warning.
1474 AC_MSG_CHECKING([if -pthread should be used]) 1476 AC_MSG_CHECKING([if -pthread should be used])
1475 threadsafe_flag= 1477 threadsafe_flag=
1476 thread_lib= 1478 thread_lib=
1477 dnl if test "x$MACOSX" != "xyes"; then 1479 dnl if test "x$MACOS_X" != "xyes"; then
1478 if test "`(uname) 2>/dev/null`" != Darwin; then 1480 if test "`(uname) 2>/dev/null`" != Darwin; then
1479 test "$GCC" = yes && threadsafe_flag="-pthread" 1481 test "$GCC" = yes && threadsafe_flag="-pthread"
1480 if test "`(uname) 2>/dev/null`" = FreeBSD; then 1482 if test "`(uname) 2>/dev/null`" = FreeBSD; then
1481 threadsafe_flag="-D_THREAD_SAFE" 1483 threadsafe_flag="-D_THREAD_SAFE"
1482 thread_lib="-pthread" 1484 thread_lib="-pthread"
1727 AC_MSG_RESULT($tclver - OK); 1729 AC_MSG_RESULT($tclver - OK);
1728 tclloc=`echo 'set l [[info library]];set i [[string last lib $l]];incr i -2;puts [[string range $l 0 $i]]' | $vi_cv_path_tcl -` 1730 tclloc=`echo 'set l [[info library]];set i [[string last lib $l]];incr i -2;puts [[string range $l 0 $i]]' | $vi_cv_path_tcl -`
1729 tcldll=`echo 'puts libtcl[[info tclversion]][[info sharedlibextension]]' | $vi_cv_path_tcl -` 1731 tcldll=`echo 'puts libtcl[[info tclversion]][[info sharedlibextension]]' | $vi_cv_path_tcl -`
1730 1732
1731 AC_MSG_CHECKING(for location of Tcl include) 1733 AC_MSG_CHECKING(for location of Tcl include)
1732 if test "x$MACOSX" != "xyes"; then 1734 if test "x$MACOS_X" != "xyes"; then
1733 tclinc="$tclloc/include $tclloc/include/tcl $tclloc/include/tcl$tclver /usr/local/include /usr/local/include/tcl$tclver /usr/include /usr/include/tcl$tclver" 1735 tclinc="$tclloc/include $tclloc/include/tcl $tclloc/include/tcl$tclver /usr/local/include /usr/local/include/tcl$tclver /usr/include /usr/include/tcl$tclver"
1734 else 1736 else
1735 dnl For Mac OS X 10.3, use the OS-provided framework location 1737 dnl For Mac OS X 10.3, use the OS-provided framework location
1736 tclinc="/System/Library/Frameworks/Tcl.framework/Headers" 1738 tclinc="/System/Library/Frameworks/Tcl.framework/Headers"
1737 fi 1739 fi
1747 AC_MSG_RESULT(<not found>) 1749 AC_MSG_RESULT(<not found>)
1748 SKIP_TCL=YES 1750 SKIP_TCL=YES
1749 fi 1751 fi
1750 if test -z "$SKIP_TCL"; then 1752 if test -z "$SKIP_TCL"; then
1751 AC_MSG_CHECKING(for location of tclConfig.sh script) 1753 AC_MSG_CHECKING(for location of tclConfig.sh script)
1752 if test "x$MACOSX" != "xyes"; then 1754 if test "x$MACOS_X" != "xyes"; then
1753 tclcnf=`echo $tclinc | sed s/include/lib/g` 1755 tclcnf=`echo $tclinc | sed s/include/lib/g`
1754 tclcnf="$tclcnf `echo $tclinc | sed s/include/lib64/g`" 1756 tclcnf="$tclcnf `echo $tclinc | sed s/include/lib64/g`"
1755 else 1757 else
1756 dnl For Mac OS X 10.3, use the OS-provided framework location 1758 dnl For Mac OS X 10.3, use the OS-provided framework location
1757 tclcnf="/System/Library/Frameworks/Tcl.framework" 1759 tclcnf="/System/Library/Frameworks/Tcl.framework"
2091 [enable_fontset="no"]) 2093 [enable_fontset="no"])
2092 AC_MSG_RESULT($enable_fontset) 2094 AC_MSG_RESULT($enable_fontset)
2093 dnl defining FEAT_XFONTSET is delayed, so that it can be disabled for no GUI 2095 dnl defining FEAT_XFONTSET is delayed, so that it can be disabled for no GUI
2094 2096
2095 test -z "$with_x" && with_x=yes 2097 test -z "$with_x" && with_x=yes
2096 test "${enable_gui-yes}" != no -a "x$MACOSX" != "xyes" -a "x$QNX" != "xyes" && with_x=yes 2098 test "${enable_gui-yes}" != no -a "x$MACOS_X" != "xyes" -a "x$QNX" != "xyes" && with_x=yes
2097 if test "$with_x" = no; then 2099 if test "$with_x" = no; then
2098 AC_MSG_RESULT(defaulting to: don't HAVE_X11) 2100 AC_MSG_RESULT(defaulting to: don't HAVE_X11)
2099 else 2101 else
2100 dnl Do this check early, so that its failure can override user requests. 2102 dnl Do this check early, so that its failure can override user requests.
2101 2103
2222 fi 2224 fi
2223 2225
2224 fi 2226 fi
2225 fi 2227 fi
2226 2228
2227 test "x$with_x" = xno -a "x$MACOSX" != "xyes" -a "x$QNX" != "xyes" && enable_gui=no 2229 test "x$with_x" = xno -a "x$MACOS_X" != "xyes" -a "x$QNX" != "xyes" && enable_gui=no
2228 2230
2229 AC_MSG_CHECKING(--enable-gui argument) 2231 AC_MSG_CHECKING(--enable-gui argument)
2230 AC_ARG_ENABLE(gui, 2232 AC_ARG_ENABLE(gui,
2231 [ --enable-gui[=OPTS] X11 GUI. [default=auto] [OPTS=auto/no/gtk2/gnome2/gtk3/motif/athena/neXtaw/photon/carbon]], , enable_gui="auto") 2233 [ --enable-gui[=OPTS] X11 GUI. [default=auto] [OPTS=auto/no/gtk2/gnome2/gtk3/motif/athena/neXtaw/photon/carbon]], , enable_gui="auto")
2232 2234
2256 photon) AC_MSG_RESULT(Photon GUI support) ;; 2258 photon) AC_MSG_RESULT(Photon GUI support) ;;
2257 *) AC_MSG_RESULT([Sorry, $enable_gui GUI is not supported]) 2259 *) AC_MSG_RESULT([Sorry, $enable_gui GUI is not supported])
2258 SKIP_PHOTON=YES ;; 2260 SKIP_PHOTON=YES ;;
2259 esac 2261 esac
2260 2262
2261 elif test "x$MACOSX" = "xyes" -a "x$with_x" = "xno" ; then 2263 elif test "x$MACOS_X" = "xyes" -a "x$with_x" = "xno" ; then
2262 SKIP_CARBON= 2264 SKIP_CARBON=
2263 case "$enable_gui_canon" in 2265 case "$enable_gui_canon" in
2264 no) AC_MSG_RESULT(no GUI support) 2266 no) AC_MSG_RESULT(no GUI support)
2265 SKIP_CARBON=YES ;; 2267 SKIP_CARBON=YES ;;
2266 yes|"") AC_MSG_RESULT(yes - automatic GUI support) ;; 2268 yes|"") AC_MSG_RESULT(yes - automatic GUI support) ;;
2378 SKIP_CARBON=YES 2380 SKIP_CARBON=YES
2379 fi 2381 fi
2380 fi 2382 fi
2381 2383
2382 2384
2383 if test "x$MACOSX" = "xyes" -a -z "$SKIP_CARBON" -a "x$CARBON" = "xyes"; then 2385 if test "x$MACOS_X" = "xyes" -a -z "$SKIP_CARBON" -a "x$CARBON" = "xyes"; then
2384 AC_MSG_CHECKING(for Carbon GUI) 2386 AC_MSG_CHECKING(for Carbon GUI)
2385 dnl already did the check, just give the message 2387 dnl already did the check, just give the message
2386 AC_MSG_RESULT(yes); 2388 AC_MSG_RESULT(yes);
2387 GUITYPE=CARBONGUI 2389 GUITYPE=CARBONGUI
2388 if test "$VIMNAME" = "vim"; then 2390 if test "$VIMNAME" = "vim"; then
3186 AC_MSG_RESULT(yes) 3188 AC_MSG_RESULT(yes)
3187 AC_DEFINE(HAVE_PTHREAD_NP_H), 3189 AC_DEFINE(HAVE_PTHREAD_NP_H),
3188 AC_MSG_RESULT(no)) 3190 AC_MSG_RESULT(no))
3189 3191
3190 AC_CHECK_HEADERS(strings.h) 3192 AC_CHECK_HEADERS(strings.h)
3191 if test "x$MACOSX" = "xyes"; then 3193 if test "x$MACOS_X" = "xyes"; then
3192 dnl The strings.h file on OS/X contains a warning and nothing useful. 3194 dnl The strings.h file on OS/X contains a warning and nothing useful.
3193 AC_DEFINE(NO_STRINGS_WITH_STRING_H) 3195 AC_DEFINE(NO_STRINGS_WITH_STRING_H)
3194 else 3196 else
3195 3197
3196 dnl Check if strings.h and string.h can both be included when defined. 3198 dnl Check if strings.h and string.h can both be included when defined.
3648 getpwent getpwnam getpwuid getrlimit gettimeofday getwd lstat \ 3650 getpwent getpwnam getpwuid getrlimit gettimeofday getwd lstat \
3649 memset mkdtemp nanosleep opendir putenv qsort readlink select setenv \ 3651 memset mkdtemp nanosleep opendir putenv qsort readlink select setenv \
3650 getpgid setpgid setsid sigaltstack sigstack sigset sigsetjmp sigaction \ 3652 getpgid setpgid setsid sigaltstack sigstack sigset sigsetjmp sigaction \
3651 sigprocmask sigvec strcasecmp strerror strftime stricmp strncasecmp \ 3653 sigprocmask sigvec strcasecmp strerror strftime stricmp strncasecmp \
3652 strnicmp strpbrk strtol tgetent towlower towupper iswupper \ 3654 strnicmp strpbrk strtol tgetent towlower towupper iswupper \
3653 usleep utime utimes) 3655 usleep utime utimes mblen)
3654 AC_FUNC_FSEEKO 3656 AC_FUNC_FSEEKO
3655 3657
3656 dnl define _LARGE_FILES, _FILE_OFFSET_BITS and _LARGEFILE_SOURCE when 3658 dnl define _LARGE_FILES, _FILE_OFFSET_BITS and _LARGEFILE_SOURCE when
3657 dnl appropriate, so that off_t is 64 bits when needed. 3659 dnl appropriate, so that off_t is 64 bits when needed.
3658 AC_SYS_LARGEFILE 3660 AC_SYS_LARGEFILE
4275 AC_MSG_RESULT(no); 4277 AC_MSG_RESULT(no);
4276 LIBS=$olibs)) 4278 LIBS=$olibs))
4277 fi 4279 fi
4278 AC_CHECK_HEADERS(setjmp.h) 4280 AC_CHECK_HEADERS(setjmp.h)
4279 4281
4280 if test "x$MACOSX" = "xyes" -a -n "$PERL"; then 4282 if test "x$MACOS_X" = "xyes" -a -n "$PERL"; then
4281 dnl -ldl must come after DynaLoader.a 4283 dnl -ldl must come after DynaLoader.a
4282 if echo $LIBS | grep -e '-ldl' >/dev/null; then 4284 if echo $LIBS | grep -e '-ldl' >/dev/null; then
4283 LIBS=`echo $LIBS | sed s/-ldl//` 4285 LIBS=`echo $LIBS | sed s/-ldl//`
4284 PERL_LIBS="$PERL_LIBS -ldl" 4286 PERL_LIBS="$PERL_LIBS -ldl"
4285 fi 4287 fi
4286 fi 4288 fi
4287 4289
4288 if test "x$MACOSX" = "xyes"; then 4290 if test "$MACOS_X" = "yes"; then
4289 AC_MSG_CHECKING(whether we need -framework Cocoa) 4291 AC_MSG_CHECKING([whether we need macOS frameworks])
4290 dnl Cocoa is needed with FEAT_CLIPBOARD or FEAT_MBYTE (the former is 4292 if test "$GUITYPE" = "CARBONGUI"; then
4291 dnl disabled during tiny build) 4293 AC_MSG_RESULT([yes, we need Carbon])
4292 if test "x$features" != "xtiny" || test "x$enable_multibyte" = "xyes"; then 4294 LIBS="$LIBS -framework Carbon"
4293 LIBS=$"$LIBS -framework Cocoa" 4295 elif test "$MACOS_X_DARWIN" = "yes"; then
4294 AC_MSG_RESULT(yes) 4296 if test "$features" = "tiny"; then
4297 dnl Since no FEAT_CLIPBOARD, no longer need for os_macosx.m.
4298 OS_EXTRA_SRC=`echo "$OS_EXTRA_SRC" | sed -e 's+os_macosx.m++'`
4299 OS_EXTRA_OBJ=`echo "$OS_EXTRA_OBJ" | sed -e 's+objects/os_macosx.o++'`
4300 if test "$enable_multibyte" = "yes"; then
4301 AC_MSG_RESULT([yes, we need CoreServices])
4302 LIBS="$LIBS -framework CoreServices"
4303 else
4304 dnl Since no FEAT_MBYTE, no longer need for os_mac_conv.c.
4305 AC_MSG_RESULT([no])
4306 OS_EXTRA_SRC=`echo "$OS_EXTRA_SRC" | sed -e 's+os_mac_conv.c++'`
4307 OS_EXTRA_OBJ=`echo "$OS_EXTRA_OBJ" | sed -e 's+objects/os_mac_conv.o++'`
4308 CPPFLAGS=`echo "$CPPFLAGS" | sed -e 's+-DMACOS_X_DARWIN++'`
4309 fi
4310 else
4311 AC_MSG_RESULT([yes, we need AppKit])
4312 LIBS="$LIBS -framework AppKit"
4313 if test "$features" = "small" -a "$enable_multibyte" = "no"; then
4314 dnl Since FEAT_CLIPBOARD is to be defined in vim.h for FEAT_SMALL, define
4315 dnl FEAT_MBYTE in order not to compromise the interoperability of the
4316 dnl clipboard.
4317 AC_MSG_NOTICE([+multi_byte will be set in favor of +clipboard])
4318 enable_multibyte=yes
4319 AC_DEFINE(FEAT_MBYTE)
4320 fi
4321 fi
4295 else 4322 else
4296 AC_MSG_RESULT(no) 4323 AC_MSG_RESULT([no])
4297 fi
4298 dnl As mentioned above, tiny build implies os_macosx.m isn't needed.
4299 dnl Exclude it from OS_EXTRA_SRC so that linker won't complain about
4300 dnl missing Objective-C symbols.
4301 if test "x$features" = "xtiny"; then
4302 OS_EXTRA_SRC=`echo "$OS_EXTRA_SRC" | sed -e 's+os_macosx.m++'`
4303 OS_EXTRA_OBJ=`echo "$OS_EXTRA_OBJ" | sed -e 's+objects/os_macosx.o++'`
4304 fi 4324 fi
4305 fi 4325 fi
4306 if test "x$MACARCH" = "xboth" && test "x$GUITYPE" = "xCARBONGUI"; then 4326 if test "x$MACARCH" = "xboth" && test "x$GUITYPE" = "xCARBONGUI"; then
4307 LDFLAGS="$LDFLAGS -isysroot $DEVELOPER_DIR/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc" 4327 LDFLAGS="$LDFLAGS -isysroot $DEVELOPER_DIR/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc"
4308 fi 4328 fi