Mercurial > vim

comparison src/auto/configure @ 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
4185 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Darwin (Mac OS X)" >&5 4185 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Darwin (Mac OS X)" >&5
4186 $as_echo_n "checking for Darwin (Mac OS X)... " >&6; } 4186 $as_echo_n "checking for Darwin (Mac OS X)... " >&6; }
4187 if test "`(uname) 2>/dev/null`" = Darwin; then 4187 if test "`(uname) 2>/dev/null`" = Darwin; then
4188 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 4188 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
4189 $as_echo "yes" >&6; } 4189 $as_echo "yes" >&6; }
4190 MACOS_X=yes
4191 CPPFLAGS="$CPPFLAGS -DMACOS_X"
4190 4192
4191 { $as_echo "$as_me:${as_lineno-$LINENO}: checking --disable-darwin argument" >&5 4193 { $as_echo "$as_me:${as_lineno-$LINENO}: checking --disable-darwin argument" >&5
4192 $as_echo_n "checking --disable-darwin argument... " >&6; } 4194 $as_echo_n "checking --disable-darwin argument... " >&6; }
4193 # Check whether --enable-darwin was given. 4195 # Check whether --enable-darwin was given.
4194 if test "${enable_darwin+set}" = set; then : 4196 if test "${enable_darwin+set}" = set; then :
4355 CPPFLAGS="$CPPFLAGS -arch ppc" 4357 CPPFLAGS="$CPPFLAGS -arch ppc"
4356 LDFLAGS="$LDFLAGS -arch ppc" 4358 LDFLAGS="$LDFLAGS -arch ppc"
4357 fi 4359 fi
4358 4360
4359 if test "$enable_darwin" = "yes"; then 4361 if test "$enable_darwin" = "yes"; then
4360 MACOSX=yes 4362 MACOS_X_DARWIN=yes
4361 OS_EXTRA_SRC="os_macosx.m os_mac_conv.c"; 4363 OS_EXTRA_SRC="os_macosx.m os_mac_conv.c";
4362 OS_EXTRA_OBJ="objects/os_macosx.o objects/os_mac_conv.o" 4364 OS_EXTRA_OBJ="objects/os_macosx.o objects/os_mac_conv.o"
4363 CPPFLAGS="$CPPFLAGS -DMACOS_X_UNIX" 4365 CPPFLAGS="$CPPFLAGS -DMACOS_X_DARWIN"
4364 4366
4365 # On IRIX 5.3, sys/types and inttypes.h are conflicting. 4367 # On IRIX 5.3, sys/types and inttypes.h are conflicting.
4366 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ 4368 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
4367 inttypes.h stdint.h unistd.h 4369 inttypes.h stdint.h unistd.h
4368 do : 4370 do :
5151 luajit="jit" 5153 luajit="jit"
5152 fi 5154 fi
5153 if test -f "${vi_cv_path_lua_pfx}/bin/cyglua-${vi_cv_version_lua}.dll"; then 5155 if test -f "${vi_cv_path_lua_pfx}/bin/cyglua-${vi_cv_version_lua}.dll"; then
5154 vi_cv_dll_name_lua="cyglua-${vi_cv_version_lua}.dll" 5156 vi_cv_dll_name_lua="cyglua-${vi_cv_version_lua}.dll"
5155 else 5157 else
5156 if test "x$MACOSX" = "xyes"; then 5158 if test "x$MACOS_X" = "xyes"; then
5157 ext="dylib" 5159 ext="dylib"
5158 indexes="" 5160 indexes=""
5159 else 5161 else
5160 ext="so" 5162 ext="so"
5161 indexes=".0 .1 .2 .3 .4 .5 .6 .7 .8 .9" 5163 indexes=".0 .1 .2 .3 .4 .5 .6 .7 .8 .9"
5197 5199
5198 LUA_LIBS="" 5200 LUA_LIBS=""
5199 LUA_CFLAGS="-DDYNAMIC_LUA_DLL=\\\"${vi_cv_dll_name_lua}\\\" $LUA_CFLAGS" 5201 LUA_CFLAGS="-DDYNAMIC_LUA_DLL=\\\"${vi_cv_dll_name_lua}\\\" $LUA_CFLAGS"
5200 fi 5202 fi
5201 if test "X$LUA_CFLAGS$LUA_LIBS" != "X" && \ 5203 if test "X$LUA_CFLAGS$LUA_LIBS" != "X" && \
5202 test "x$MACOSX" = "xyes" && test "x$vi_cv_with_luajit" != "xno" && \ 5204 test "x$MACOS_X" = "xyes" && test "x$vi_cv_with_luajit" != "xno" && \
5203 test "`(uname -m) 2>/dev/null`" = "x86_64"; then 5205 test "`(uname -m) 2>/dev/null`" = "x86_64"; then
5204 LUA_LIBS="-pagezero_size 10000 -image_base 100000000 $LUA_LIBS" 5206 LUA_LIBS="-pagezero_size 10000 -image_base 100000000 $LUA_LIBS"
5205 fi 5207 fi
5206 fi 5208 fi
5207 if test "$fail_if_missing" = "yes" -a "$lua_ok" != "yes"; then 5209 if test "$fail_if_missing" = "yes" -a "$lua_ok" != "yes"; then
5402 $as_echo "not found" >&6; } 5404 $as_echo "not found" >&6; }
5403 fi 5405 fi
5404 5406
5405 for path in "${vi_cv_path_mzscheme_pfx}/lib" "${SCHEME_LIB}"; do 5407 for path in "${vi_cv_path_mzscheme_pfx}/lib" "${SCHEME_LIB}"; do
5406 if test "X$path" != "X"; then 5408 if test "X$path" != "X"; then
5407 if test "x$MACOSX" = "xyes"; then 5409 if test "x$MACOS_X" = "xyes"; then
5408 MZSCHEME_LIBS="-framework Racket" 5410 MZSCHEME_LIBS="-framework Racket"
5409 MZSCHEME_CFLAGS="-DMZ_PRECISE_GC" 5411 MZSCHEME_CFLAGS="-DMZ_PRECISE_GC"
5410 elif test -f "${path}/libmzscheme3m.a"; then 5412 elif test -f "${path}/libmzscheme3m.a"; then
5411 MZSCHEME_LIBS="${path}/libmzscheme3m.a" 5413 MZSCHEME_LIBS="${path}/libmzscheme3m.a"
5412 MZSCHEME_CFLAGS="-DMZ_PRECISE_GC" 5414 MZSCHEME_CFLAGS="-DMZ_PRECISE_GC"
5782 { $as_echo "$as_me:${as_lineno-$LINENO}: result: >>> too old; need Perl version 5.003_01 or later <<<" >&5 5784 { $as_echo "$as_me:${as_lineno-$LINENO}: result: >>> too old; need Perl version 5.003_01 or later <<<" >&5
5783 $as_echo ">>> too old; need Perl version 5.003_01 or later <<<" >&6; } 5785 $as_echo ">>> too old; need Perl version 5.003_01 or later <<<" >&6; }
5784 fi 5786 fi
5785 fi 5787 fi
5786 5788
5787 if test "x$MACOSX" = "xyes"; then 5789 if test "x$MACOS_X" = "xyes"; then
5788 dir=/System/Library/Perl 5790 dir=/System/Library/Perl
5789 darwindir=$dir/darwin 5791 darwindir=$dir/darwin
5790 if test -d $darwindir; then 5792 if test -d $darwindir; then
5791 PERL=/usr/bin/perl 5793 PERL=/usr/bin/perl
5792 else 5794 else
6000 @echo "python_PYTHONFRAMEWORKPREFIX='$(PYTHONFRAMEWORKPREFIX)'" 6002 @echo "python_PYTHONFRAMEWORKPREFIX='$(PYTHONFRAMEWORKPREFIX)'"
6001 @echo "python_PYTHONFRAMEWORKINSTALLDIR='$(PYTHONFRAMEWORKINSTALLDIR)'" 6003 @echo "python_PYTHONFRAMEWORKINSTALLDIR='$(PYTHONFRAMEWORKINSTALLDIR)'"
6002 eof 6004 eof
6003 eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`" 6005 eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
6004 rm -f -- "${tmp_mkf}" 6006 rm -f -- "${tmp_mkf}"
6005 if test "x$MACOSX" = "xyes" && test -n "${python_PYTHONFRAMEWORK}" && ${vi_cv_path_python} -c \ 6007 if test "x$MACOS_X" = "xyes" && test -n "${python_PYTHONFRAMEWORK}" && ${vi_cv_path_python} -c \
6006 "import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then 6008 "import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then
6007 vi_cv_path_python_plibs="-framework Python" 6009 vi_cv_path_python_plibs="-framework Python"
6008 if test "x${vi_cv_path_python}" != "x/usr/bin/python" && test -n "${python_PYTHONFRAMEWORKPREFIX}"; then 6010 if test "x${vi_cv_path_python}" != "x/usr/bin/python" && test -n "${python_PYTHONFRAMEWORKPREFIX}"; then
6009 vi_cv_path_python_plibs="-F${python_PYTHONFRAMEWORKPREFIX} -framework Python" 6011 vi_cv_path_python_plibs="-F${python_PYTHONFRAMEWORKPREFIX} -framework Python"
6010 fi 6012 fi
6963 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 -` 6965 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 -`
6964 tcldll=`echo 'puts libtcl[info tclversion][info sharedlibextension]' | $vi_cv_path_tcl -` 6966 tcldll=`echo 'puts libtcl[info tclversion][info sharedlibextension]' | $vi_cv_path_tcl -`
6965 6967
6966 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of Tcl include" >&5 6968 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of Tcl include" >&5
6967 $as_echo_n "checking for location of Tcl include... " >&6; } 6969 $as_echo_n "checking for location of Tcl include... " >&6; }
6968 if test "x$MACOSX" != "xyes"; then 6970 if test "x$MACOS_X" != "xyes"; then
6969 tclinc="$tclloc/include $tclloc/include/tcl $tclloc/include/tcl$tclver /usr/local/include /usr/local/include/tcl$tclver /usr/include /usr/include/tcl$tclver" 6971 tclinc="$tclloc/include $tclloc/include/tcl $tclloc/include/tcl$tclver /usr/local/include /usr/local/include/tcl$tclver /usr/include /usr/include/tcl$tclver"
6970 else 6972 else
6971 tclinc="/System/Library/Frameworks/Tcl.framework/Headers" 6973 tclinc="/System/Library/Frameworks/Tcl.framework/Headers"
6972 fi 6974 fi
6973 TCL_INC= 6975 TCL_INC=
6985 SKIP_TCL=YES 6987 SKIP_TCL=YES
6986 fi 6988 fi
6987 if test -z "$SKIP_TCL"; then 6989 if test -z "$SKIP_TCL"; then
6988 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of tclConfig.sh script" >&5 6990 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of tclConfig.sh script" >&5
6989 $as_echo_n "checking for location of tclConfig.sh script... " >&6; } 6991 $as_echo_n "checking for location of tclConfig.sh script... " >&6; }
6990 if test "x$MACOSX" != "xyes"; then 6992 if test "x$MACOS_X" != "xyes"; then
6991 tclcnf=`echo $tclinc | sed s/include/lib/g` 6993 tclcnf=`echo $tclinc | sed s/include/lib/g`
6992 tclcnf="$tclcnf `echo $tclinc | sed s/include/lib64/g`" 6994 tclcnf="$tclcnf `echo $tclinc | sed s/include/lib64/g`"
6993 else 6995 else
6994 tclcnf="/System/Library/Frameworks/Tcl.framework" 6996 tclcnf="/System/Library/Frameworks/Tcl.framework"
6995 fi 6997 fi
7565 7567
7566 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_fontset" >&5 7568 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_fontset" >&5
7567 $as_echo "$enable_fontset" >&6; } 7569 $as_echo "$enable_fontset" >&6; }
7568 7570
7569 test -z "$with_x" && with_x=yes 7571 test -z "$with_x" && with_x=yes
7570 test "${enable_gui-yes}" != no -a "x$MACOSX" != "xyes" -a "x$QNX" != "xyes" && with_x=yes 7572 test "${enable_gui-yes}" != no -a "x$MACOS_X" != "xyes" -a "x$QNX" != "xyes" && with_x=yes
7571 if test "$with_x" = no; then 7573 if test "$with_x" = no; then
7572 { $as_echo "$as_me:${as_lineno-$LINENO}: result: defaulting to: don't HAVE_X11" >&5 7574 { $as_echo "$as_me:${as_lineno-$LINENO}: result: defaulting to: don't HAVE_X11" >&5
7573 $as_echo "defaulting to: don't HAVE_X11" >&6; } 7575 $as_echo "defaulting to: don't HAVE_X11" >&6; }
7574 else 7576 else
7575 7577
8582 fi 8584 fi
8583 8585
8584 fi 8586 fi
8585 fi 8587 fi
8586 8588
8587 test "x$with_x" = xno -a "x$MACOSX" != "xyes" -a "x$QNX" != "xyes" && enable_gui=no 8589 test "x$with_x" = xno -a "x$MACOS_X" != "xyes" -a "x$QNX" != "xyes" && enable_gui=no
8588 8590
8589 { $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-gui argument" >&5 8591 { $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-gui argument" >&5
8590 $as_echo_n "checking --enable-gui argument... " >&6; } 8592 $as_echo_n "checking --enable-gui argument... " >&6; }
8591 # Check whether --enable-gui was given. 8593 # Check whether --enable-gui was given.
8592 if test "${enable_gui+set}" = set; then : 8594 if test "${enable_gui+set}" = set; then :
8624 *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: Sorry, $enable_gui GUI is not supported" >&5 8626 *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: Sorry, $enable_gui GUI is not supported" >&5
8625 $as_echo "Sorry, $enable_gui GUI is not supported" >&6; } 8627 $as_echo "Sorry, $enable_gui GUI is not supported" >&6; }
8626 SKIP_PHOTON=YES ;; 8628 SKIP_PHOTON=YES ;;
8627 esac 8629 esac
8628 8630
8629 elif test "x$MACOSX" = "xyes" -a "x$with_x" = "xno" ; then 8631 elif test "x$MACOS_X" = "xyes" -a "x$with_x" = "xno" ; then
8630 SKIP_CARBON= 8632 SKIP_CARBON=
8631 case "$enable_gui_canon" in 8633 case "$enable_gui_canon" in
8632 no) { $as_echo "$as_me:${as_lineno-$LINENO}: result: no GUI support" >&5 8634 no) { $as_echo "$as_me:${as_lineno-$LINENO}: result: no GUI support" >&5
8633 $as_echo "no GUI support" >&6; } 8635 $as_echo "no GUI support" >&6; }
8634 SKIP_CARBON=YES ;; 8636 SKIP_CARBON=YES ;;
8802 SKIP_CARBON=YES 8804 SKIP_CARBON=YES
8803 fi 8805 fi
8804 fi 8806 fi
8805 8807
8806 8808
8807 if test "x$MACOSX" = "xyes" -a -z "$SKIP_CARBON" -a "x$CARBON" = "xyes"; then 8809 if test "x$MACOS_X" = "xyes" -a -z "$SKIP_CARBON" -a "x$CARBON" = "xyes"; then
8808 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Carbon GUI" >&5 8810 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Carbon GUI" >&5
8809 $as_echo_n "checking for Carbon GUI... " >&6; } 8811 $as_echo_n "checking for Carbon GUI... " >&6; }
8810 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 8812 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
8811 $as_echo "yes" >&6; }; 8813 $as_echo "yes" >&6; };
8812 GUITYPE=CARBONGUI 8814 GUITYPE=CARBONGUI
10622 10624
10623 fi 10625 fi
10624 10626
10625 done 10627 done
10626 10628
10627 if test "x$MACOSX" = "xyes"; then 10629 if test "x$MACOS_X" = "xyes"; then
10628 $as_echo "#define NO_STRINGS_WITH_STRING_H 1" >>confdefs.h 10630 $as_echo "#define NO_STRINGS_WITH_STRING_H 1" >>confdefs.h
10629 10631
10630 else 10632 else
10631 10633
10632 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if strings.h can be included after string.h" >&5 10634 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if strings.h can be included after string.h" >&5
12074 getpwent getpwnam getpwuid getrlimit gettimeofday getwd lstat \ 12076 getpwent getpwnam getpwuid getrlimit gettimeofday getwd lstat \
12075 memset mkdtemp nanosleep opendir putenv qsort readlink select setenv \ 12077 memset mkdtemp nanosleep opendir putenv qsort readlink select setenv \
12076 getpgid setpgid setsid sigaltstack sigstack sigset sigsetjmp sigaction \ 12078 getpgid setpgid setsid sigaltstack sigstack sigset sigsetjmp sigaction \
12077 sigprocmask sigvec strcasecmp strerror strftime stricmp strncasecmp \ 12079 sigprocmask sigvec strcasecmp strerror strftime stricmp strncasecmp \
12078 strnicmp strpbrk strtol tgetent towlower towupper iswupper \ 12080 strnicmp strpbrk strtol tgetent towlower towupper iswupper \
12079 usleep utime utimes 12081 usleep utime utimes mblen
12080 do : 12082 do :
12081 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` 12083 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
12082 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" 12084 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
12083 if eval test \"x\$"$as_ac_var"\" = x"yes"; then : 12085 if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
12084 cat >>confdefs.h <<_ACEOF 12086 cat >>confdefs.h <<_ACEOF
14097 fi 14099 fi
14098 14100
14099 done 14101 done
14100 14102
14101 14103
14102 if test "x$MACOSX" = "xyes" -a -n "$PERL"; then 14104 if test "x$MACOS_X" = "xyes" -a -n "$PERL"; then
14103 if echo $LIBS | grep -e '-ldl' >/dev/null; then 14105 if echo $LIBS | grep -e '-ldl' >/dev/null; then
14104 LIBS=`echo $LIBS | sed s/-ldl//` 14106 LIBS=`echo $LIBS | sed s/-ldl//`
14105 PERL_LIBS="$PERL_LIBS -ldl" 14107 PERL_LIBS="$PERL_LIBS -ldl"
14106 fi 14108 fi
14107 fi 14109 fi
14108 14110
14109 if test "x$MACOSX" = "xyes"; then 14111 if test "$MACOS_X" = "yes"; then
14110 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need -framework Cocoa" >&5 14112 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need macOS frameworks" >&5
14111 $as_echo_n "checking whether we need -framework Cocoa... " >&6; } 14113 $as_echo_n "checking whether we need macOS frameworks... " >&6; }
14112 if test "x$features" != "xtiny" || test "x$enable_multibyte" = "xyes"; then 14114 if test "$GUITYPE" = "CARBONGUI"; then
14113 LIBS=$"$LIBS -framework Cocoa" 14115 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, we need Carbon" >&5
14114 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 14116 $as_echo "yes, we need Carbon" >&6; }
14115 $as_echo "yes" >&6; } 14117 LIBS="$LIBS -framework Carbon"
14118 elif test "$MACOS_X_DARWIN" = "yes"; then
14119 if test "$features" = "tiny"; then
14120 OS_EXTRA_SRC=`echo "$OS_EXTRA_SRC" | sed -e 's+os_macosx.m++'`
14121 OS_EXTRA_OBJ=`echo "$OS_EXTRA_OBJ" | sed -e 's+objects/os_macosx.o++'`
14122 if test "$enable_multibyte" = "yes"; then
14123 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, we need CoreServices" >&5
14124 $as_echo "yes, we need CoreServices" >&6; }
14125 LIBS="$LIBS -framework CoreServices"
14126 else
14127 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14128 $as_echo "no" >&6; }
14129 OS_EXTRA_SRC=`echo "$OS_EXTRA_SRC" | sed -e 's+os_mac_conv.c++'`
14130 OS_EXTRA_OBJ=`echo "$OS_EXTRA_OBJ" | sed -e 's+objects/os_mac_conv.o++'`
14131 CPPFLAGS=`echo "$CPPFLAGS" | sed -e 's+-DMACOS_X_DARWIN++'`
14132 fi
14133 else
14134 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, we need AppKit" >&5
14135 $as_echo "yes, we need AppKit" >&6; }
14136 LIBS="$LIBS -framework AppKit"
14137 if test "$features" = "small" -a "$enable_multibyte" = "no"; then
14138 { $as_echo "$as_me:${as_lineno-$LINENO}: +multi_byte will be set in favor of +clipboard" >&5
14139 $as_echo "$as_me: +multi_byte will be set in favor of +clipboard" >&6;}
14140 enable_multibyte=yes
14141 $as_echo "#define FEAT_MBYTE 1" >>confdefs.h
14142
14143 fi
14144 fi
14116 else 14145 else
14117 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 14146 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14118 $as_echo "no" >&6; } 14147 $as_echo "no" >&6; }
14119 fi
14120 if test "x$features" = "xtiny"; then
14121 OS_EXTRA_SRC=`echo "$OS_EXTRA_SRC" | sed -e 's+os_macosx.m++'`
14122 OS_EXTRA_OBJ=`echo "$OS_EXTRA_OBJ" | sed -e 's+objects/os_macosx.o++'`
14123 fi 14148 fi
14124 fi 14149 fi
14125 if test "x$MACARCH" = "xboth" && test "x$GUITYPE" = "xCARBONGUI"; then 14150 if test "x$MACARCH" = "xboth" && test "x$GUITYPE" = "xCARBONGUI"; then
14126 LDFLAGS="$LDFLAGS -isysroot $DEVELOPER_DIR/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc" 14151 LDFLAGS="$LDFLAGS -isysroot $DEVELOPER_DIR/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc"
14127 fi 14152 fi