From: Bjorn Winckler Date: Sat, 27 Mar 2010 17:16:50 +0000 (+0100) Subject: Merge branch 'vim' X-Git-Url: https://repo.or.cz/w/MacVim.git/commitdiff_plain/1006d615d02ce8b50ce47ef5cdc77d73e876b596 Merge branch 'vim' Conflicts: src/auto/configure src/configure.in src/if_ruby.c src/vim.h --- 1006d615d02ce8b50ce47ef5cdc77d73e876b596 diff --cc src/auto/configure index 16374664,d8d80103..9372ea4d --- a/src/auto/configure +++ b/src/auto/configure @@@ -613,142 -635,197 +613,143 @@@ ac_includes_default=" # include #endif" -ac_subst_vars='LTLIBOBJS -LIBOBJS -DEPEND_CFLAGS_FILTER -MAKEMO -MSGFMT -INSTALL_TOOL_LANGS -INSTALL_LANGS -TAGPRG -HANGULIN_OBJ -HANGULIN_SRC -GUI_X_LIBS -GUITYPE -GUI_LIB_LOC -GUI_INC_LOC -NARROW_PROTO -MOTIF_LIBNAME -GNOME_CONFIG -GNOME_INCLUDEDIR -GNOME_LIBDIR -GNOME_LIBS -GTK_LIBNAME -GTK_LIBS -GTK_CFLAGS -PKG_CONFIG -GTK12_CONFIG -GTK_CONFIG -X_LIB -X_EXTRA_LIBS -X_LIBS -X_PRE_LIBS -X_CFLAGS -XMKMF -xmkmfpath -SNIFF_OBJ -SNIFF_SRC -NETBEANS_OBJ -NETBEANS_SRC -WORKSHOP_OBJ -WORKSHOP_SRC -RUBY_LIBS -RUBY_CFLAGS -RUBY_PRO -RUBY_OBJ -RUBY_SRC -vi_cv_path_ruby -TCL_LIBS -TCL_CFLAGS -TCL_PRO -TCL_OBJ -TCL_SRC -vi_cv_path_tcl -PYTHON_OBJ -PYTHON_SRC -PYTHON_CFLAGS -PYTHON_GETPATH_CFLAGS -PYTHON_LIBS -PYTHON_CONFDIR -vi_cv_path_python -PERL_LIBS -PERL_CFLAGS -PERL_PRO -PERL_OBJ -PERL_SRC -shrpenv -vi_cv_perllib -vi_cv_path_perl -MZSCHEME_MZC -MZSCHEME_EXTRA -MZSCHEME_CFLAGS -MZSCHEME_LIBS -MZSCHEME_PRO -MZSCHEME_OBJ -MZSCHEME_SRC -vi_cv_path_mzscheme -compiledby -dogvimdiff -dovimdiff -line_break -VIEWNAME -EXNAME -VIMNAME -OS_EXTRA_OBJ -OS_EXTRA_SRC -XCODE_SELECT -CPP_MM -STRIP -AWK -EGREP -GREP -CPP -OBJEXT -EXEEXT -ac_ct_CC -CPPFLAGS -LDFLAGS -CFLAGS -CC -SET_MAKE -target_alias -host_alias -build_alias -LIBS -ECHO_T -ECHO_N -ECHO_C -DEFS -mandir -localedir -libdir -psdir -pdfdir -dvidir -htmldir -infodir -docdir -oldincludedir -includedir -localstatedir -sharedstatedir -sysconfdir -datadir -datarootdir -libexecdir -sbindir -bindir -program_transform_name -prefix -exec_prefix -PACKAGE_BUGREPORT -PACKAGE_STRING -PACKAGE_VERSION -PACKAGE_TARNAME -PACKAGE_NAME +ac_subst_vars='SHELL PATH_SEPARATOR -SHELL' +PACKAGE_NAME +PACKAGE_TARNAME +PACKAGE_VERSION +PACKAGE_STRING +PACKAGE_BUGREPORT +exec_prefix +prefix +program_transform_name +bindir +sbindir +libexecdir +datarootdir +datadir +sysconfdir +sharedstatedir +localstatedir +includedir +oldincludedir +docdir +infodir +htmldir +dvidir +pdfdir +psdir +libdir +localedir +mandir +DEFS +ECHO_C +ECHO_N +ECHO_T +LIBS +build_alias +host_alias +target_alias +SET_MAKE +CC +CFLAGS +LDFLAGS +CPPFLAGS +ac_ct_CC +EXEEXT +OBJEXT +CPP +GREP +EGREP +AWK +STRIP +CPP_MM ++XCODE_SELECT +OS_EXTRA_SRC +OS_EXTRA_OBJ +VIMNAME +EXNAME +VIEWNAME +line_break +dovimdiff +dogvimdiff +compiledby +vi_cv_path_mzscheme +MZSCHEME_SRC +MZSCHEME_OBJ +MZSCHEME_PRO +MZSCHEME_LIBS +MZSCHEME_CFLAGS +MZSCHEME_EXTRA +MZSCHEME_MZC +vi_cv_path_perl +vi_cv_perllib +shrpenv +PERL_SRC +PERL_OBJ +PERL_PRO +PERL_CFLAGS +PERL_LIBS +vi_cv_path_python +PYTHON_CONFDIR +PYTHON_LIBS +PYTHON_GETPATH_CFLAGS +PYTHON_CFLAGS +PYTHON_SRC +PYTHON_OBJ +vi_cv_path_tcl +TCL_SRC +TCL_OBJ +TCL_PRO +TCL_CFLAGS +TCL_LIBS +vi_cv_path_ruby +RUBY_SRC +RUBY_OBJ +RUBY_PRO +RUBY_CFLAGS +RUBY_LIBS +WORKSHOP_SRC +WORKSHOP_OBJ +NETBEANS_SRC +NETBEANS_OBJ +SNIFF_SRC +SNIFF_OBJ +xmkmfpath +XMKMF +X_CFLAGS +X_PRE_LIBS +X_LIBS +X_EXTRA_LIBS +X_LIB +GTK_CONFIG +GTK12_CONFIG +PKG_CONFIG +GTK_CFLAGS +GTK_LIBS +GTK_LIBNAME +GNOME_LIBS +GNOME_LIBDIR +GNOME_INCLUDEDIR +GNOME_CONFIG +MOTIF_LIBNAME +NARROW_PROTO +GUI_INC_LOC +GUI_LIB_LOC +GUITYPE +GUI_X_LIBS +HANGULIN_SRC +HANGULIN_OBJ +TAGPRG +INSTALL_LANGS +INSTALL_TOOL_LANGS +MSGFMT +MAKEMO +XCODEFLAGS +DEPEND_CFLAGS_FILTER +LIBOBJS +LTLIBOBJS' ac_subst_files='' -ac_user_opts=' -enable_option_checking -enable_darwin -with_mac_arch -with_developer_dir -with_local_dir -with_vim_name -with_ex_name -with_view_name -with_global_runtime -with_modified_by -enable_selinux -with_features -with_compiledby -enable_xsmp -enable_xsmp_interact -enable_mzschemeinterp -with_plthome -enable_perlinterp -enable_pythoninterp -with_python_config_dir -enable_tclinterp -with_tclsh -enable_rubyinterp -with_ruby_command -enable_cscope -enable_workshop -enable_netbeans -enable_sniff -enable_multibyte -enable_hangulinput -enable_xim -enable_fontset -with_x -enable_gui -enable_gtk_check -enable_gtk2_check -enable_gnome_check -enable_motif_check -enable_athena_check -enable_nextaw_check -enable_carbon_check -with_gtk_prefix -with_gtk_exec_prefix -enable_gtktest -with_gnome_includes -with_gnome_libs -with_gnome -with_motif_lib -with_tlib -enable_acl -enable_gpm -enable_sysmouse -enable_nls -' ac_precious_vars='build_alias host_alias target_alias @@@ -1366,8 -1493,8 +1367,9 @@@ Optional Features Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-mac-arch=ARCH current, intel, ppc or both + --with-developer-dir=PATH use PATH as location for Xcode developer tools + --with-macsdk=SDK SDK version (10.4, 10.5, 10.6, ...) + --with-macarchs=ARCHS space separated list of archs (i386 x86_64 ppc ...) --with-local-dir=PATH search PATH instead of /usr/local for local libraries. --without-local-dir do not search /usr/local for local libraries. --with-vim-name=NAME what to call the Vim executable @@@ -3674,36 -3819,95 +3676,100 @@@ echo "${ECHO_T}no, Darwin support disab enable_darwin=no fi else - { $as_echo "$as_me:$LINENO: result: yes, Darwin support excluded" >&5 -$as_echo "yes, Darwin support excluded" >&6; } + { echo "$as_me:$LINENO: result: yes, Darwin support excluded" >&5 +echo "${ECHO_T}yes, Darwin support excluded" >&6; } fi - { $as_echo "$as_me:$LINENO: checking --with-mac-arch argument" >&5 -$as_echo_n "checking --with-mac-arch argument... " >&6; } - -# Check whether --with-mac-arch was given. -if test "${with_mac_arch+set}" = set; then - withval=$with_mac_arch; MACARCH="$withval"; { $as_echo "$as_me:$LINENO: result: $MACARCH" >&5 -$as_echo "$MACARCH" >&6; } -else - MACARCH="current"; { $as_echo "$as_me:$LINENO: result: defaulting to $MACARCH" >&5 -$as_echo "defaulting to $MACARCH" >&6; } -fi - - - { $as_echo "$as_me:$LINENO: checking --with-developer-dir argument" >&5 -$as_echo_n "checking --with-developer-dir argument... " >&6; } ++ { echo "$as_me:$LINENO: checking --with-developer-dir argument" >&5 ++echo $ECHO_N "checking --with-developer-dir argument... $ECHO_C" >&6; } + + # Check whether --with-developer-dir was given. + if test "${with_developer_dir+set}" = set; then - withval=$with_developer_dir; DEVELOPER_DIR="$withval"; { $as_echo "$as_me:$LINENO: result: $DEVELOPER_DIR" >&5 -$as_echo "$DEVELOPER_DIR" >&6; } ++ withval=$with_developer_dir; DEVELOPER_DIR="$withval"; { echo "$as_me:$LINENO: result: $DEVELOPER_DIR" >&5 ++echo "${ECHO_T}$DEVELOPER_DIR" >&6; } + else - DEVELOPER_DIR=""; { $as_echo "$as_me:$LINENO: result: not present" >&5 -$as_echo "not present" >&6; } ++ DEVELOPER_DIR=""; { echo "$as_me:$LINENO: result: not present" >&5 ++echo "${ECHO_T}not present" >&6; } + fi + + + if test "x$DEVELOPER_DIR" = "x"; then + # Extract the first word of "xcode-select", so it can be a program name with args. + set dummy xcode-select; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_path_XCODE_SELECT+set}" = set; then - $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + case $XCODE_SELECT in + [\\/]* | ?:[\\/]*) + ac_cv_path_XCODE_SELECT="$XCODE_SELECT" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_XCODE_SELECT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + + ;; + esac + fi + XCODE_SELECT=$ac_cv_path_XCODE_SELECT + if test -n "$XCODE_SELECT"; then - { $as_echo "$as_me:$LINENO: result: $XCODE_SELECT" >&5 -$as_echo "$XCODE_SELECT" >&6; } ++ { echo "$as_me:$LINENO: result: $XCODE_SELECT" >&5 ++echo "${ECHO_T}$XCODE_SELECT" >&6; } + else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + + if test "x$XCODE_SELECT" != "x"; then - { $as_echo "$as_me:$LINENO: checking for developer dir using xcode-select" >&5 -$as_echo_n "checking for developer dir using xcode-select... " >&6; } ++ { echo "$as_me:$LINENO: checking for developer dir using xcode-select" >&5 ++echo $ECHO_N "checking for developer dir using xcode-select... $ECHO_C" >&6; } + DEVELOPER_DIR=`$XCODE_SELECT -print-path` - { $as_echo "$as_me:$LINENO: result: $DEVELOPER_DIR" >&5 -$as_echo "$DEVELOPER_DIR" >&6; } ++ { echo "$as_me:$LINENO: result: $DEVELOPER_DIR" >&5 ++echo "${ECHO_T}$DEVELOPER_DIR" >&6; } + else + DEVELOPER_DIR=/Developer + fi + fi - if test "x$MACARCH" = "xboth"; then - { $as_echo "$as_me:$LINENO: checking for 10.4 universal SDK" >&5 -$as_echo_n "checking for 10.4 universal SDK... " >&6; } - save_cppflags="$CPPFLAGS" + { echo "$as_me:$LINENO: checking --with-macsdk argument" >&5 +echo $ECHO_N "checking --with-macsdk argument... $ECHO_C" >&6; } + +# Check whether --with-macsdk was given. +if test "${with_macsdk+set}" = set; then + withval=$with_macsdk; MACSDK="$withval"; { echo "$as_me:$LINENO: result: $MACSDK" >&5 +echo "${ECHO_T}$MACSDK" >&6; } +else + MACSDK=""; { echo "$as_me:$LINENO: result: using default" >&5 +echo "${ECHO_T}using default" >&6; } +fi + + + if test -n "$MACSDK"; then + { echo "$as_me:$LINENO: checking if SDK is supported" >&5 +echo $ECHO_N "checking if SDK is supported... $ECHO_C" >&6; } save_cflags="$CFLAGS" save_ldflags="$LDFLAGS" - sdkflags="/Developer/SDKs/MacOSX$MACSDK" - CFLAGS="$CFLAGS -isysroot $DEVELOPER_DIR/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc" ++ sdkflags="$DEVELOPER_DIR/SDKs/MacOSX$MACSDK" + if test "x$MACSDK" = "x10.4"; then + sdkflags="$sdkflags""u" + fi + sdkflags="$sdkflags.sdk -mmacosx-version-min=$MACSDK" + CFLAGS="$CFLAGS -isysroot $sdkflags" + LDFLAGS="$LDFLAGS -Wl,-syslibroot,$sdkflags" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@@ -8266,27 -8416,7 +8332,27 @@@ if test "x$MACOSX" = "xyes"; the prefix=/Applications fi - datadir='${prefix}/Vim.app/Contents/Resources' + if test -z "$SKIP_MACVIM" -a "x$COCOA" = "xyes"; then + { echo "$as_me:$LINENO: checking for MacVim GUI" >&5 +echo $ECHO_N "checking for MacVim GUI... $ECHO_C" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; }; + GUITYPE=MACVIMGUI + datadir='${prefix}/MacVim.app/Contents/Resources' + elif test -z "$SKIP_CARBON" -a "x$CARBON" = "xyes"; then + { echo "$as_me:$LINENO: checking for Carbon GUI" >&5 +echo $ECHO_N "checking for Carbon GUI... $ECHO_C" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; }; + GUITYPE=CARBONGUI + datadir='${prefix}/Vim.app/Contents/Resources' + - CPPFLAGS="$CPPFLAGS -I/Developer/Headers/FlatCarbon" ++ CPPFLAGS="$CPPFLAGS -I$DEVELOPER_DIR/Headers/FlatCarbon" + fi + + if test "$VIMNAME" = "vim"; then + VIMNAME=Vim + fi SKIP_GTK=YES; SKIP_GTK2=YES; @@@ -17349,204 -18060,46 +17415,205 @@@ $debug | { (exit 1); exit 1; } } -# Set up the scripts for CONFIG_FILES section. -# No need to generate them if there are no CONFIG_FILES. -# This happens for instance with `./config.status config.h'. +# +# Set up the sed scripts for CONFIG_FILES section. +# + +# No need to generate the scripts if there are no CONFIG_FILES. +# This happens for instance when ./config.status config.h if test -n "$CONFIG_FILES"; then +_ACEOF + -ac_cr=' ' -ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` -if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then - ac_cs_awk_cr='\\r' -else - ac_cs_awk_cr=$ac_cr + +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF +SHELL!$SHELL$ac_delim +PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim +PACKAGE_NAME!$PACKAGE_NAME$ac_delim +PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim +PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim +PACKAGE_STRING!$PACKAGE_STRING$ac_delim +PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim +exec_prefix!$exec_prefix$ac_delim +prefix!$prefix$ac_delim +program_transform_name!$program_transform_name$ac_delim +bindir!$bindir$ac_delim +sbindir!$sbindir$ac_delim +libexecdir!$libexecdir$ac_delim +datarootdir!$datarootdir$ac_delim +datadir!$datadir$ac_delim +sysconfdir!$sysconfdir$ac_delim +sharedstatedir!$sharedstatedir$ac_delim +localstatedir!$localstatedir$ac_delim +includedir!$includedir$ac_delim +oldincludedir!$oldincludedir$ac_delim +docdir!$docdir$ac_delim +infodir!$infodir$ac_delim +htmldir!$htmldir$ac_delim +dvidir!$dvidir$ac_delim +pdfdir!$pdfdir$ac_delim +psdir!$psdir$ac_delim +libdir!$libdir$ac_delim +localedir!$localedir$ac_delim +mandir!$mandir$ac_delim +DEFS!$DEFS$ac_delim +ECHO_C!$ECHO_C$ac_delim +ECHO_N!$ECHO_N$ac_delim +ECHO_T!$ECHO_T$ac_delim +LIBS!$LIBS$ac_delim +build_alias!$build_alias$ac_delim +host_alias!$host_alias$ac_delim +target_alias!$target_alias$ac_delim +SET_MAKE!$SET_MAKE$ac_delim +CC!$CC$ac_delim +CFLAGS!$CFLAGS$ac_delim +LDFLAGS!$LDFLAGS$ac_delim +CPPFLAGS!$CPPFLAGS$ac_delim +ac_ct_CC!$ac_ct_CC$ac_delim +EXEEXT!$EXEEXT$ac_delim +OBJEXT!$OBJEXT$ac_delim +CPP!$CPP$ac_delim +GREP!$GREP$ac_delim +EGREP!$EGREP$ac_delim +AWK!$AWK$ac_delim +STRIP!$STRIP$ac_delim +CPP_MM!$CPP_MM$ac_delim ++XCODE_SELECT!$XCODE_SELECT$ac_delim +OS_EXTRA_SRC!$OS_EXTRA_SRC$ac_delim +OS_EXTRA_OBJ!$OS_EXTRA_OBJ$ac_delim +VIMNAME!$VIMNAME$ac_delim +EXNAME!$EXNAME$ac_delim +VIEWNAME!$VIEWNAME$ac_delim +line_break!$line_break$ac_delim +dovimdiff!$dovimdiff$ac_delim +dogvimdiff!$dogvimdiff$ac_delim +compiledby!$compiledby$ac_delim +vi_cv_path_mzscheme!$vi_cv_path_mzscheme$ac_delim +MZSCHEME_SRC!$MZSCHEME_SRC$ac_delim +MZSCHEME_OBJ!$MZSCHEME_OBJ$ac_delim +MZSCHEME_PRO!$MZSCHEME_PRO$ac_delim +MZSCHEME_LIBS!$MZSCHEME_LIBS$ac_delim +MZSCHEME_CFLAGS!$MZSCHEME_CFLAGS$ac_delim +MZSCHEME_EXTRA!$MZSCHEME_EXTRA$ac_delim +MZSCHEME_MZC!$MZSCHEME_MZC$ac_delim +vi_cv_path_perl!$vi_cv_path_perl$ac_delim +vi_cv_perllib!$vi_cv_perllib$ac_delim +shrpenv!$shrpenv$ac_delim +PERL_SRC!$PERL_SRC$ac_delim +PERL_OBJ!$PERL_OBJ$ac_delim +PERL_PRO!$PERL_PRO$ac_delim +PERL_CFLAGS!$PERL_CFLAGS$ac_delim +PERL_LIBS!$PERL_LIBS$ac_delim +vi_cv_path_python!$vi_cv_path_python$ac_delim +PYTHON_CONFDIR!$PYTHON_CONFDIR$ac_delim +PYTHON_LIBS!$PYTHON_LIBS$ac_delim +PYTHON_GETPATH_CFLAGS!$PYTHON_GETPATH_CFLAGS$ac_delim +PYTHON_CFLAGS!$PYTHON_CFLAGS$ac_delim +PYTHON_SRC!$PYTHON_SRC$ac_delim +PYTHON_OBJ!$PYTHON_OBJ$ac_delim +vi_cv_path_tcl!$vi_cv_path_tcl$ac_delim +TCL_SRC!$TCL_SRC$ac_delim +TCL_OBJ!$TCL_OBJ$ac_delim +TCL_PRO!$TCL_PRO$ac_delim +TCL_CFLAGS!$TCL_CFLAGS$ac_delim +TCL_LIBS!$TCL_LIBS$ac_delim +vi_cv_path_ruby!$vi_cv_path_ruby$ac_delim +RUBY_SRC!$RUBY_SRC$ac_delim +RUBY_OBJ!$RUBY_OBJ$ac_delim +RUBY_PRO!$RUBY_PRO$ac_delim +RUBY_CFLAGS!$RUBY_CFLAGS$ac_delim +RUBY_LIBS!$RUBY_LIBS$ac_delim +WORKSHOP_SRC!$WORKSHOP_SRC$ac_delim - WORKSHOP_OBJ!$WORKSHOP_OBJ$ac_delim +_ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done + +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +if test -n "$ac_eof"; then + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` + ac_eof=`expr $ac_eof + 1` fi -echo 'BEGIN {' >"$tmp/subs1.awk" && +cat >>$CONFIG_STATUS <<_ACEOF +cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +_ACEOF +sed ' +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +s/^/s,@/; s/!/@,|#_!!_#|/ +:n +t n +s/'"$ac_delim"'$/,g/; t +s/$/\\/; p +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF +CEOF$ac_eof _ACEOF -{ - echo "cat >conf$$subs.awk <<_ACEOF" && - echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && - echo "_ACEOF" -} >conf$$subs.sh || - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } -ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do - . ./conf$$subs.sh || - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } - - ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` - if test $ac_delim_n = $ac_delim_num; then + cat >conf$$subs.sed <<_ACEOF ++WORKSHOP_OBJ!$WORKSHOP_OBJ$ac_delim +NETBEANS_SRC!$NETBEANS_SRC$ac_delim +NETBEANS_OBJ!$NETBEANS_OBJ$ac_delim +SNIFF_SRC!$SNIFF_SRC$ac_delim +SNIFF_OBJ!$SNIFF_OBJ$ac_delim +xmkmfpath!$xmkmfpath$ac_delim +XMKMF!$XMKMF$ac_delim +X_CFLAGS!$X_CFLAGS$ac_delim +X_PRE_LIBS!$X_PRE_LIBS$ac_delim +X_LIBS!$X_LIBS$ac_delim +X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim +X_LIB!$X_LIB$ac_delim +GTK_CONFIG!$GTK_CONFIG$ac_delim +GTK12_CONFIG!$GTK12_CONFIG$ac_delim +PKG_CONFIG!$PKG_CONFIG$ac_delim +GTK_CFLAGS!$GTK_CFLAGS$ac_delim +GTK_LIBS!$GTK_LIBS$ac_delim +GTK_LIBNAME!$GTK_LIBNAME$ac_delim +GNOME_LIBS!$GNOME_LIBS$ac_delim +GNOME_LIBDIR!$GNOME_LIBDIR$ac_delim +GNOME_INCLUDEDIR!$GNOME_INCLUDEDIR$ac_delim +GNOME_CONFIG!$GNOME_CONFIG$ac_delim +MOTIF_LIBNAME!$MOTIF_LIBNAME$ac_delim +NARROW_PROTO!$NARROW_PROTO$ac_delim +GUI_INC_LOC!$GUI_INC_LOC$ac_delim +GUI_LIB_LOC!$GUI_LIB_LOC$ac_delim +GUITYPE!$GUITYPE$ac_delim +GUI_X_LIBS!$GUI_X_LIBS$ac_delim +HANGULIN_SRC!$HANGULIN_SRC$ac_delim +HANGULIN_OBJ!$HANGULIN_OBJ$ac_delim +TAGPRG!$TAGPRG$ac_delim +INSTALL_LANGS!$INSTALL_LANGS$ac_delim +INSTALL_TOOL_LANGS!$INSTALL_TOOL_LANGS$ac_delim +MSGFMT!$MSGFMT$ac_delim +MAKEMO!$MAKEMO$ac_delim +XCODEFLAGS!$XCODEFLAGS$ac_delim +DEPEND_CFLAGS_FILTER!$DEPEND_CFLAGS_FILTER$ac_delim +LIBOBJS!$LIBOBJS$ac_delim +LTLIBOBJS!$LTLIBOBJS$ac_delim +_ACEOF + - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 38; then ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 39; then break elif $ac_last_try; then - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} { (exit 1); exit 1; }; } else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " diff --cc src/configure index 7abab31c,d8d80103..9bcf38b9 --- a/src/configure +++ b/src/configure @@@ -613,142 -635,197 +613,143 @@@ ac_includes_default=" # include #endif" -ac_subst_vars='LTLIBOBJS -LIBOBJS -DEPEND_CFLAGS_FILTER -MAKEMO -MSGFMT -INSTALL_TOOL_LANGS -INSTALL_LANGS -TAGPRG -HANGULIN_OBJ -HANGULIN_SRC -GUI_X_LIBS -GUITYPE -GUI_LIB_LOC -GUI_INC_LOC -NARROW_PROTO -MOTIF_LIBNAME -GNOME_CONFIG -GNOME_INCLUDEDIR -GNOME_LIBDIR -GNOME_LIBS -GTK_LIBNAME -GTK_LIBS -GTK_CFLAGS -PKG_CONFIG -GTK12_CONFIG -GTK_CONFIG -X_LIB -X_EXTRA_LIBS -X_LIBS -X_PRE_LIBS -X_CFLAGS -XMKMF -xmkmfpath -SNIFF_OBJ -SNIFF_SRC -NETBEANS_OBJ -NETBEANS_SRC -WORKSHOP_OBJ -WORKSHOP_SRC -RUBY_LIBS -RUBY_CFLAGS -RUBY_PRO -RUBY_OBJ -RUBY_SRC -vi_cv_path_ruby -TCL_LIBS -TCL_CFLAGS -TCL_PRO -TCL_OBJ -TCL_SRC -vi_cv_path_tcl -PYTHON_OBJ -PYTHON_SRC -PYTHON_CFLAGS -PYTHON_GETPATH_CFLAGS -PYTHON_LIBS -PYTHON_CONFDIR -vi_cv_path_python -PERL_LIBS -PERL_CFLAGS -PERL_PRO -PERL_OBJ -PERL_SRC -shrpenv -vi_cv_perllib -vi_cv_path_perl -MZSCHEME_MZC -MZSCHEME_EXTRA -MZSCHEME_CFLAGS -MZSCHEME_LIBS -MZSCHEME_PRO -MZSCHEME_OBJ -MZSCHEME_SRC -vi_cv_path_mzscheme -compiledby -dogvimdiff -dovimdiff -line_break -VIEWNAME -EXNAME -VIMNAME -OS_EXTRA_OBJ -OS_EXTRA_SRC -XCODE_SELECT -CPP_MM -STRIP -AWK -EGREP -GREP -CPP -OBJEXT -EXEEXT -ac_ct_CC -CPPFLAGS -LDFLAGS -CFLAGS -CC -SET_MAKE -target_alias -host_alias -build_alias -LIBS -ECHO_T -ECHO_N -ECHO_C -DEFS -mandir -localedir -libdir -psdir -pdfdir -dvidir -htmldir -infodir -docdir -oldincludedir -includedir -localstatedir -sharedstatedir -sysconfdir -datadir -datarootdir -libexecdir -sbindir -bindir -program_transform_name -prefix -exec_prefix -PACKAGE_BUGREPORT -PACKAGE_STRING -PACKAGE_VERSION -PACKAGE_TARNAME -PACKAGE_NAME +ac_subst_vars='SHELL PATH_SEPARATOR -SHELL' +PACKAGE_NAME +PACKAGE_TARNAME +PACKAGE_VERSION +PACKAGE_STRING +PACKAGE_BUGREPORT +exec_prefix +prefix +program_transform_name +bindir +sbindir +libexecdir +datarootdir +datadir +sysconfdir +sharedstatedir +localstatedir +includedir +oldincludedir +docdir +infodir +htmldir +dvidir +pdfdir +psdir +libdir +localedir +mandir +DEFS +ECHO_C +ECHO_N +ECHO_T +LIBS +build_alias +host_alias +target_alias +SET_MAKE +CC +CFLAGS +LDFLAGS +CPPFLAGS +ac_ct_CC +EXEEXT +OBJEXT +CPP +GREP +EGREP +AWK +STRIP +CPP_MM ++XCODE_SELECT +OS_EXTRA_SRC +OS_EXTRA_OBJ +VIMNAME +EXNAME +VIEWNAME +line_break +dovimdiff +dogvimdiff +compiledby +vi_cv_path_mzscheme +MZSCHEME_SRC +MZSCHEME_OBJ +MZSCHEME_PRO +MZSCHEME_LIBS +MZSCHEME_CFLAGS +MZSCHEME_EXTRA +MZSCHEME_MZC +vi_cv_path_perl +vi_cv_perllib +shrpenv +PERL_SRC +PERL_OBJ +PERL_PRO +PERL_CFLAGS +PERL_LIBS +vi_cv_path_python +PYTHON_CONFDIR +PYTHON_LIBS +PYTHON_GETPATH_CFLAGS +PYTHON_CFLAGS +PYTHON_SRC +PYTHON_OBJ +vi_cv_path_tcl +TCL_SRC +TCL_OBJ +TCL_PRO +TCL_CFLAGS +TCL_LIBS +vi_cv_path_ruby +RUBY_SRC +RUBY_OBJ +RUBY_PRO +RUBY_CFLAGS +RUBY_LIBS +WORKSHOP_SRC +WORKSHOP_OBJ +NETBEANS_SRC +NETBEANS_OBJ +SNIFF_SRC +SNIFF_OBJ +xmkmfpath +XMKMF +X_CFLAGS +X_PRE_LIBS +X_LIBS +X_EXTRA_LIBS +X_LIB +GTK_CONFIG +GTK12_CONFIG +PKG_CONFIG +GTK_CFLAGS +GTK_LIBS +GTK_LIBNAME +GNOME_LIBS +GNOME_LIBDIR +GNOME_INCLUDEDIR +GNOME_CONFIG +MOTIF_LIBNAME +NARROW_PROTO +GUI_INC_LOC +GUI_LIB_LOC +GUITYPE +GUI_X_LIBS +HANGULIN_SRC +HANGULIN_OBJ +TAGPRG +INSTALL_LANGS +INSTALL_TOOL_LANGS +MSGFMT +MAKEMO +XCODEFLAGS +DEPEND_CFLAGS_FILTER +LIBOBJS +LTLIBOBJS' ac_subst_files='' -ac_user_opts=' -enable_option_checking -enable_darwin -with_mac_arch -with_developer_dir -with_local_dir -with_vim_name -with_ex_name -with_view_name -with_global_runtime -with_modified_by -enable_selinux -with_features -with_compiledby -enable_xsmp -enable_xsmp_interact -enable_mzschemeinterp -with_plthome -enable_perlinterp -enable_pythoninterp -with_python_config_dir -enable_tclinterp -with_tclsh -enable_rubyinterp -with_ruby_command -enable_cscope -enable_workshop -enable_netbeans -enable_sniff -enable_multibyte -enable_hangulinput -enable_xim -enable_fontset -with_x -enable_gui -enable_gtk_check -enable_gtk2_check -enable_gnome_check -enable_motif_check -enable_athena_check -enable_nextaw_check -enable_carbon_check -with_gtk_prefix -with_gtk_exec_prefix -enable_gtktest -with_gnome_includes -with_gnome_libs -with_gnome -with_motif_lib -with_tlib -enable_acl -enable_gpm -enable_sysmouse -enable_nls -' ac_precious_vars='build_alias host_alias target_alias @@@ -1366,8 -1493,8 +1367,9 @@@ Optional Features Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-mac-arch=ARCH current, intel, ppc or both + --with-developer-dir=PATH use PATH as location for Xcode developer tools + --with-macsdk=SDK SDK version (10.4, 10.5, 10.6, ...) + --with-macarchs=ARCHS space separated list of archs (i386 x86_64 ppc ...) --with-local-dir=PATH search PATH instead of /usr/local for local libraries. --without-local-dir do not search /usr/local for local libraries. --with-vim-name=NAME what to call the Vim executable @@@ -3673,36 -3819,95 +3676,100 @@@ echo "${ECHO_T}no, Darwin support disab enable_darwin=no fi else - { $as_echo "$as_me:$LINENO: result: yes, Darwin support excluded" >&5 -$as_echo "yes, Darwin support excluded" >&6; } + { echo "$as_me:$LINENO: result: yes, Darwin support excluded" >&5 +echo "${ECHO_T}yes, Darwin support excluded" >&6; } fi - { $as_echo "$as_me:$LINENO: checking --with-mac-arch argument" >&5 -$as_echo_n "checking --with-mac-arch argument... " >&6; } - -# Check whether --with-mac-arch was given. -if test "${with_mac_arch+set}" = set; then - withval=$with_mac_arch; MACARCH="$withval"; { $as_echo "$as_me:$LINENO: result: $MACARCH" >&5 -$as_echo "$MACARCH" >&6; } -else - MACARCH="current"; { $as_echo "$as_me:$LINENO: result: defaulting to $MACARCH" >&5 -$as_echo "defaulting to $MACARCH" >&6; } -fi - - - { $as_echo "$as_me:$LINENO: checking --with-developer-dir argument" >&5 -$as_echo_n "checking --with-developer-dir argument... " >&6; } ++ { echo "$as_me:$LINENO: checking --with-developer-dir argument" >&5 ++echo $ECHO_N "checking --with-developer-dir argument... $ECHO_C" >&6; } + + # Check whether --with-developer-dir was given. + if test "${with_developer_dir+set}" = set; then - withval=$with_developer_dir; DEVELOPER_DIR="$withval"; { $as_echo "$as_me:$LINENO: result: $DEVELOPER_DIR" >&5 -$as_echo "$DEVELOPER_DIR" >&6; } ++ withval=$with_developer_dir; DEVELOPER_DIR="$withval"; { echo "$as_me:$LINENO: result: $DEVELOPER_DIR" >&5 ++echo "${ECHO_T}$DEVELOPER_DIR" >&6; } + else - DEVELOPER_DIR=""; { $as_echo "$as_me:$LINENO: result: not present" >&5 -$as_echo "not present" >&6; } ++ DEVELOPER_DIR=""; { echo "$as_me:$LINENO: result: not present" >&5 ++echo "${ECHO_T}not present" >&6; } + fi + + + if test "x$DEVELOPER_DIR" = "x"; then + # Extract the first word of "xcode-select", so it can be a program name with args. + set dummy xcode-select; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + if test "${ac_cv_path_XCODE_SELECT+set}" = set; then - $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + case $XCODE_SELECT in + [\\/]* | ?:[\\/]*) + ac_cv_path_XCODE_SELECT="$XCODE_SELECT" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_XCODE_SELECT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + IFS=$as_save_IFS + + ;; + esac + fi + XCODE_SELECT=$ac_cv_path_XCODE_SELECT + if test -n "$XCODE_SELECT"; then - { $as_echo "$as_me:$LINENO: result: $XCODE_SELECT" >&5 -$as_echo "$XCODE_SELECT" >&6; } ++ { echo "$as_me:$LINENO: result: $XCODE_SELECT" >&5 ++echo "${ECHO_T}$XCODE_SELECT" >&6; } + else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + + + if test "x$XCODE_SELECT" != "x"; then - { $as_echo "$as_me:$LINENO: checking for developer dir using xcode-select" >&5 -$as_echo_n "checking for developer dir using xcode-select... " >&6; } ++ { echo "$as_me:$LINENO: checking for developer dir using xcode-select" >&5 ++echo $ECHO_N "checking for developer dir using xcode-select... $ECHO_C" >&6; } + DEVELOPER_DIR=`$XCODE_SELECT -print-path` - { $as_echo "$as_me:$LINENO: result: $DEVELOPER_DIR" >&5 -$as_echo "$DEVELOPER_DIR" >&6; } ++ { echo "$as_me:$LINENO: result: $DEVELOPER_DIR" >&5 ++echo "${ECHO_T}$DEVELOPER_DIR" >&6; } + else + DEVELOPER_DIR=/Developer + fi + fi - if test "x$MACARCH" = "xboth"; then - { $as_echo "$as_me:$LINENO: checking for 10.4 universal SDK" >&5 -$as_echo_n "checking for 10.4 universal SDK... " >&6; } - save_cppflags="$CPPFLAGS" + { echo "$as_me:$LINENO: checking --with-macsdk argument" >&5 +echo $ECHO_N "checking --with-macsdk argument... $ECHO_C" >&6; } + +# Check whether --with-macsdk was given. +if test "${with_macsdk+set}" = set; then + withval=$with_macsdk; MACSDK="$withval"; { echo "$as_me:$LINENO: result: $MACSDK" >&5 +echo "${ECHO_T}$MACSDK" >&6; } +else + MACSDK=""; { echo "$as_me:$LINENO: result: using default" >&5 +echo "${ECHO_T}using default" >&6; } +fi + + + if test -n "$MACSDK"; then + { echo "$as_me:$LINENO: checking if SDK is supported" >&5 +echo $ECHO_N "checking if SDK is supported... $ECHO_C" >&6; } save_cflags="$CFLAGS" save_ldflags="$LDFLAGS" - sdkflags="/Developer/SDKs/MacOSX$MACSDK" - CFLAGS="$CFLAGS -isysroot $DEVELOPER_DIR/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc" ++ sdkflags="$DEVELOPER_DIR/SDKs/MacOSX$MACSDK" + if test "x$MACSDK" = "x10.4"; then + sdkflags="$sdkflags""u" + fi + sdkflags="$sdkflags.sdk -mmacosx-version-min=$MACSDK" + CFLAGS="$CFLAGS -isysroot $sdkflags" + LDFLAGS="$LDFLAGS -Wl,-syslibroot,$sdkflags" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@@ -5693,16 -5770,28 +5760,28 @@@ els enable_rubyinterp="no" fi -{ $as_echo "$as_me:$LINENO: result: $enable_rubyinterp" >&5 -$as_echo "$enable_rubyinterp" >&6; } +{ echo "$as_me:$LINENO: result: $enable_rubyinterp" >&5 +echo "${ECHO_T}$enable_rubyinterp" >&6; } if test "$enable_rubyinterp" = "yes"; then - { $as_echo "$as_me:$LINENO: checking --with-ruby-command argument" >&5 -$as_echo_n "checking --with-ruby-command argument... " >&6; } ++ { echo "$as_me:$LINENO: checking --with-ruby-command argument" >&5 ++echo $ECHO_N "checking --with-ruby-command argument... $ECHO_C" >&6; } + + # Check whether --with-ruby-command was given. + if test "${with_ruby_command+set}" = set; then - withval=$with_ruby_command; RUBY_CMD="$withval"; { $as_echo "$as_me:$LINENO: result: $RUBY_CMD" >&5 -$as_echo "$RUBY_CMD" >&6; } ++ withval=$with_ruby_command; RUBY_CMD="$withval"; { echo "$as_me:$LINENO: result: $RUBY_CMD" >&5 ++echo "${ECHO_T}$RUBY_CMD" >&6; } + else - RUBY_CMD="ruby"; { $as_echo "$as_me:$LINENO: result: defaulting to $RUBY_CMD" >&5 -$as_echo "defaulting to $RUBY_CMD" >&6; } ++ RUBY_CMD="ruby"; { echo "$as_me:$LINENO: result: defaulting to $RUBY_CMD" >&5 ++echo "${ECHO_T}defaulting to $RUBY_CMD" >&6; } + fi + - # Extract the first word of "ruby", so it can be a program name with args. - set dummy ruby; ac_word=$2 + # Extract the first word of "$RUBY_CMD", so it can be a program name with args. + set dummy $RUBY_CMD; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_vi_cv_path_ruby+set}" = set; then - $as_echo_n "(cached) " >&6 + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $vi_cv_path_ruby in [\\/]* | ?:[\\/]*) @@@ -5738,18 -5827,24 +5817,24 @@@ f if test "X$vi_cv_path_ruby" != "X"; then - { $as_echo "$as_me:$LINENO: checking Ruby version" >&5 -$as_echo_n "checking Ruby version... " >&6; } + { echo "$as_me:$LINENO: checking Ruby version" >&5 +echo $ECHO_N "checking Ruby version... $ECHO_C" >&6; } if $vi_cv_path_ruby -e '(VERSION rescue RUBY_VERSION) >= "1.6.0" or exit 1' >/dev/null 2>/dev/null; then - { $as_echo "$as_me:$LINENO: result: OK" >&5 -$as_echo "OK" >&6; } - { $as_echo "$as_me:$LINENO: checking Ruby header files" >&5 -$as_echo_n "checking Ruby header files... " >&6; } + { echo "$as_me:$LINENO: result: OK" >&5 +echo "${ECHO_T}OK" >&6; } + { echo "$as_me:$LINENO: checking Ruby header files" >&5 +echo $ECHO_N "checking Ruby header files... $ECHO_C" >&6; } - rubyhdrdir=`$vi_cv_path_ruby -r mkmf -e 'print Config::CONFIG["archdir"] || $hdrdir' 2>/dev/null` + rubyhdrdir=`$vi_cv_path_ruby -r mkmf -e 'print Config::CONFIG["rubyhdrdir"] || Config::CONFIG["archdir"] || $hdrdir' 2>/dev/null` if test "X$rubyhdrdir" != "X"; then - { $as_echo "$as_me:$LINENO: result: $rubyhdrdir" >&5 -$as_echo "$rubyhdrdir" >&6; } + { echo "$as_me:$LINENO: result: $rubyhdrdir" >&5 +echo "${ECHO_T}$rubyhdrdir" >&6; } RUBY_CFLAGS="-I$rubyhdrdir" + rubyarch=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG["arch"]'` + if test -d "$rubyhdrdir/$rubyarch"; then + RUBY_CFLAGS="$RUBY_CFLAGS -I$rubyhdrdir/$rubyarch" + fi + rubyversion=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG["ruby_version"].gsub(/\./, "")[0,2]'` + RUBY_CFLAGS="$RUBY_CFLAGS -DRUBY_VERSION=$rubyversion" rubylibs=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG["LIBS"]'` if test "X$rubylibs" != "X"; then RUBY_LIBS="$rubylibs" @@@ -5791,12 -5881,12 +5876,12 @@@ _ACEOF else - { echo "$as_me:$LINENO: result: not found" >&5 - echo "${ECHO_T}not found" >&6; } - { $as_echo "$as_me:$LINENO: result: not found; disabling Ruby" >&5 -$as_echo "not found; disabling Ruby" >&6; } ++ { echo "$as_me:$LINENO: result: not found; disabling Ruby" >&5 ++echo "${ECHO_T}not found; disabling Ruby" >&6; } fi else - { $as_echo "$as_me:$LINENO: result: too old; need Ruby version 1.6.0 or later" >&5 -$as_echo "too old; need Ruby version 1.6.0 or later" >&6; } + { echo "$as_me:$LINENO: result: too old; need Ruby version 1.6.0 or later" >&5 +echo "${ECHO_T}too old; need Ruby version 1.6.0 or later" >&6; } fi fi fi @@@ -8247,27 -8416,7 +8332,27 @@@ if test "x$MACOSX" = "xyes"; the prefix=/Applications fi - datadir='${prefix}/Vim.app/Contents/Resources' + if test -z "$SKIP_MACVIM" -a "x$COCOA" = "xyes"; then + { echo "$as_me:$LINENO: checking for MacVim GUI" >&5 +echo $ECHO_N "checking for MacVim GUI... $ECHO_C" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; }; + GUITYPE=MACVIMGUI + datadir='${prefix}/MacVim.app/Contents/Resources' + elif test -z "$SKIP_CARBON" -a "x$CARBON" = "xyes"; then + { echo "$as_me:$LINENO: checking for Carbon GUI" >&5 +echo $ECHO_N "checking for Carbon GUI... $ECHO_C" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; }; + GUITYPE=CARBONGUI + datadir='${prefix}/Vim.app/Contents/Resources' + - CPPFLAGS="$CPPFLAGS -I/Developer/Headers/FlatCarbon" ++ CPPFLAGS="$CPPFLAGS -I$DEVELOPER_DIR/Headers/FlatCarbon" + fi + + if test "$VIMNAME" = "vim"; then + VIMNAME=Vim + fi SKIP_GTK=YES; SKIP_GTK2=YES; @@@ -13262,12 -13802,12 +13347,12 @@@ eval "echo \"\$as_me:$LINENO: $ac_try_e if test "x$vim_cv_tty_mode" = "x" ; then vim_cv_tty_mode=0620 fi - { $as_echo "$as_me:$LINENO: result: pty mode: $vim_cv_tty_mode, group: $vim_cv_tty_group" >&5 -$as_echo "pty mode: $vim_cv_tty_mode, group: $vim_cv_tty_group" >&6; } + { echo "$as_me:$LINENO: result: pty mode: $vim_cv_tty_mode, group: $vim_cv_tty_group" >&5 +echo "${ECHO_T}pty mode: $vim_cv_tty_mode, group: $vim_cv_tty_group" >&6; } else vim_cv_tty_group=world - { echo "$as_me:$LINENO: result: ptys are world accessable" >&5 - echo "${ECHO_T}ptys are world accessable" >&6; } - { $as_echo "$as_me:$LINENO: result: ptys are world accessible" >&5 -$as_echo "ptys are world accessible" >&6; } ++ { echo "$as_me:$LINENO: result: ptys are world accessible" >&5 ++echo "${ECHO_T}ptys are world accessible" >&6; } fi else @@@ -13278,10 -13818,11 +13363,10 @@@ sed 's/^/| /' conftest.$ac_ext >& ( exit $ac_status ) vim_cv_tty_group=world - { echo "$as_me:$LINENO: result: can't determine - assume ptys are world accessable" >&5 - echo "${ECHO_T}can't determine - assume ptys are world accessable" >&6; } - { $as_echo "$as_me:$LINENO: result: can't determine - assume ptys are world accessible" >&5 -$as_echo "can't determine - assume ptys are world accessible" >&6; } ++ { echo "$as_me:$LINENO: result: can't determine - assume ptys are world accessible" >&5 ++echo "${ECHO_T}can't determine - assume ptys are world accessible" >&6; } fi -rm -rf conftest.dSYM rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi @@@ -13660,9 -14212,141 +13744,129 @@@ _ACEO fi done -{ $as_echo "$as_me:$LINENO: checking for _LARGEFILE_SOURCE value needed for large files" >&5 -$as_echo_n "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; } ++{ echo "$as_me:$LINENO: checking for _LARGEFILE_SOURCE value needed for large files" >&5 ++echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6; } + if test "${ac_cv_sys_largefile_source+set}" = set; then - $as_echo_n "(cached) " >&6 ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + while :; do + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ -#include /* for off_t */ - #include ++#include + int + main () + { -int (*fp) (FILE *, off_t, int) = fseeko; - return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); ++return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (ac_try="$ac_link" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_sys_largefile_source=no; break + else - $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + + fi + -rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + #define _LARGEFILE_SOURCE 1 -#include /* for off_t */ - #include ++#include + int + main () + { -int (*fp) (FILE *, off_t, int) = fseeko; - return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); ++return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0); + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (ac_try="$ac_link" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then + ac_cv_sys_largefile_source=1; break + else - $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + + fi + -rm -rf conftest.dSYM + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + ac_cv_sys_largefile_source=unknown + break + done + fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_source" >&5 -$as_echo "$ac_cv_sys_largefile_source" >&6; } ++{ echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_source" >&5 ++echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6; } + case $ac_cv_sys_largefile_source in #( + no | unknown) ;; + *) + cat >>confdefs.h <<_ACEOF + #define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source + _ACEOF + ;; + esac -rm -rf conftest* ++rm -f -r conftest* + + # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug + # in glibc 2.1.3, but that breaks too many other things. + # If you want fseeko and ftello with glibc, upgrade to a fixed glibc. + if test $ac_cv_sys_largefile_source != unknown; then + + cat >>confdefs.h <<\_ACEOF + #define HAVE_FSEEKO 1 + _ACEOF + + fi + -{ $as_echo "$as_me:$LINENO: checking for st_blksize" >&5 -$as_echo_n "checking for st_blksize... " >&6; } +{ echo "$as_me:$LINENO: checking for st_blksize" >&5 +echo $ECHO_N "checking for st_blksize... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@@ -14648,12 -15388,64 +14852,63 @@@ _ACEO fi else - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } fi -{ $as_echo "$as_me:$LINENO: checking for FD_CLOEXEC" >&5 -$as_echo_n "checking for FD_CLOEXEC... " >&6; } ++{ echo "$as_me:$LINENO: checking for FD_CLOEXEC" >&5 ++echo $ECHO_N "checking for FD_CLOEXEC... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + #if HAVE_FCNTL_H + # include + #endif + int + main () + { + int flag = FD_CLOEXEC; + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext + if { (ac_try="$ac_compile" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; }; cat >>confdefs.h <<\_ACEOF ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; }; cat >>confdefs.h <<\_ACEOF + #define HAVE_FD_CLOEXEC 1 + _ACEOF + + else - $as_echo "$as_me: failed program was:" >&5 ++ echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + - { $as_echo "$as_me:$LINENO: result: not usable" >&5 -$as_echo "not usable" >&6; } ++ { echo "$as_me:$LINENO: result: not usable" >&5 ++echo "${ECHO_T}not usable" >&6; } + fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + -{ $as_echo "$as_me:$LINENO: checking for rename" >&5 -$as_echo_n "checking for rename... " >&6; } +{ echo "$as_me:$LINENO: checking for rename" >&5 +echo $ECHO_N "checking for rename... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@@ -16539,21 -17397,21 +16794,21 @@@ echo $ECHO_N "checking for GCC 3 or lat gccmajor=`echo "$gccversion" | sed -e 's/^\([1-9]\)\..*$/\1/g'` if test "$gccmajor" -gt "2"; then DEPEND_CFLAGS_FILTER="| sed 's+-I */+-isystem /+g'" - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - { echo "$as_me:$LINENO: checking whether we need -D_FORTIFY_SOURCE=1" >&5 - { $as_echo "$as_me:$LINENO: checking whether we need -D_FORTIFY_SOURCE=1" >&5 -$as_echo_n "checking whether we need -D_FORTIFY_SOURCE=1... " >&6; } ++ { echo "$as_me:$LINENO: checking whether we need -D_FORTIFY_SOURCE=1" >&5 +echo $ECHO_N "checking whether we need -D_FORTIFY_SOURCE=1... $ECHO_C" >&6; } if test "$gccmajor" -gt "3"; then - CFLAGS=`echo "$CFLAGS -D_FORTIFY_SOURCE=1" | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//g' -e 's/-D_FORTIFY_SOURCE=2//g'` + CFLAGS=`echo "$CFLAGS" | sed -e 's/-Wp,-D_FORTIFY_SOURCE=.//g' -e 's/-D_FORTIFY_SOURCE=.//g' -e 's/$/ -D_FORTIFY_SOURCE=1/'` - { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi fi @@@ -17160,204 -18060,46 +17415,205 @@@ $debug | { (exit 1); exit 1; } } -# Set up the scripts for CONFIG_FILES section. -# No need to generate them if there are no CONFIG_FILES. -# This happens for instance with `./config.status config.h'. +# +# Set up the sed scripts for CONFIG_FILES section. +# + +# No need to generate the scripts if there are no CONFIG_FILES. +# This happens for instance when ./config.status config.h if test -n "$CONFIG_FILES"; then +_ACEOF + -ac_cr=' ' -ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` -if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then - ac_cs_awk_cr='\\r' -else - ac_cs_awk_cr=$ac_cr + +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF +SHELL!$SHELL$ac_delim +PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim +PACKAGE_NAME!$PACKAGE_NAME$ac_delim +PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim +PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim +PACKAGE_STRING!$PACKAGE_STRING$ac_delim +PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim +exec_prefix!$exec_prefix$ac_delim +prefix!$prefix$ac_delim +program_transform_name!$program_transform_name$ac_delim +bindir!$bindir$ac_delim +sbindir!$sbindir$ac_delim +libexecdir!$libexecdir$ac_delim +datarootdir!$datarootdir$ac_delim +datadir!$datadir$ac_delim +sysconfdir!$sysconfdir$ac_delim +sharedstatedir!$sharedstatedir$ac_delim +localstatedir!$localstatedir$ac_delim +includedir!$includedir$ac_delim +oldincludedir!$oldincludedir$ac_delim +docdir!$docdir$ac_delim +infodir!$infodir$ac_delim +htmldir!$htmldir$ac_delim +dvidir!$dvidir$ac_delim +pdfdir!$pdfdir$ac_delim +psdir!$psdir$ac_delim +libdir!$libdir$ac_delim +localedir!$localedir$ac_delim +mandir!$mandir$ac_delim +DEFS!$DEFS$ac_delim +ECHO_C!$ECHO_C$ac_delim +ECHO_N!$ECHO_N$ac_delim +ECHO_T!$ECHO_T$ac_delim +LIBS!$LIBS$ac_delim +build_alias!$build_alias$ac_delim +host_alias!$host_alias$ac_delim +target_alias!$target_alias$ac_delim +SET_MAKE!$SET_MAKE$ac_delim +CC!$CC$ac_delim +CFLAGS!$CFLAGS$ac_delim +LDFLAGS!$LDFLAGS$ac_delim +CPPFLAGS!$CPPFLAGS$ac_delim +ac_ct_CC!$ac_ct_CC$ac_delim +EXEEXT!$EXEEXT$ac_delim +OBJEXT!$OBJEXT$ac_delim +CPP!$CPP$ac_delim +GREP!$GREP$ac_delim +EGREP!$EGREP$ac_delim +AWK!$AWK$ac_delim +STRIP!$STRIP$ac_delim +CPP_MM!$CPP_MM$ac_delim ++XCODE_SELECT!$XCODE_SELECT$ac_delim +OS_EXTRA_SRC!$OS_EXTRA_SRC$ac_delim +OS_EXTRA_OBJ!$OS_EXTRA_OBJ$ac_delim +VIMNAME!$VIMNAME$ac_delim +EXNAME!$EXNAME$ac_delim +VIEWNAME!$VIEWNAME$ac_delim +line_break!$line_break$ac_delim +dovimdiff!$dovimdiff$ac_delim +dogvimdiff!$dogvimdiff$ac_delim +compiledby!$compiledby$ac_delim +vi_cv_path_mzscheme!$vi_cv_path_mzscheme$ac_delim +MZSCHEME_SRC!$MZSCHEME_SRC$ac_delim +MZSCHEME_OBJ!$MZSCHEME_OBJ$ac_delim +MZSCHEME_PRO!$MZSCHEME_PRO$ac_delim +MZSCHEME_LIBS!$MZSCHEME_LIBS$ac_delim +MZSCHEME_CFLAGS!$MZSCHEME_CFLAGS$ac_delim +MZSCHEME_EXTRA!$MZSCHEME_EXTRA$ac_delim +MZSCHEME_MZC!$MZSCHEME_MZC$ac_delim +vi_cv_path_perl!$vi_cv_path_perl$ac_delim +vi_cv_perllib!$vi_cv_perllib$ac_delim +shrpenv!$shrpenv$ac_delim +PERL_SRC!$PERL_SRC$ac_delim +PERL_OBJ!$PERL_OBJ$ac_delim +PERL_PRO!$PERL_PRO$ac_delim +PERL_CFLAGS!$PERL_CFLAGS$ac_delim +PERL_LIBS!$PERL_LIBS$ac_delim +vi_cv_path_python!$vi_cv_path_python$ac_delim +PYTHON_CONFDIR!$PYTHON_CONFDIR$ac_delim +PYTHON_LIBS!$PYTHON_LIBS$ac_delim +PYTHON_GETPATH_CFLAGS!$PYTHON_GETPATH_CFLAGS$ac_delim +PYTHON_CFLAGS!$PYTHON_CFLAGS$ac_delim +PYTHON_SRC!$PYTHON_SRC$ac_delim +PYTHON_OBJ!$PYTHON_OBJ$ac_delim +vi_cv_path_tcl!$vi_cv_path_tcl$ac_delim +TCL_SRC!$TCL_SRC$ac_delim +TCL_OBJ!$TCL_OBJ$ac_delim +TCL_PRO!$TCL_PRO$ac_delim +TCL_CFLAGS!$TCL_CFLAGS$ac_delim +TCL_LIBS!$TCL_LIBS$ac_delim +vi_cv_path_ruby!$vi_cv_path_ruby$ac_delim +RUBY_SRC!$RUBY_SRC$ac_delim +RUBY_OBJ!$RUBY_OBJ$ac_delim +RUBY_PRO!$RUBY_PRO$ac_delim +RUBY_CFLAGS!$RUBY_CFLAGS$ac_delim +RUBY_LIBS!$RUBY_LIBS$ac_delim +WORKSHOP_SRC!$WORKSHOP_SRC$ac_delim - WORKSHOP_OBJ!$WORKSHOP_OBJ$ac_delim +_ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done + +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +if test -n "$ac_eof"; then + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` + ac_eof=`expr $ac_eof + 1` fi -echo 'BEGIN {' >"$tmp/subs1.awk" && +cat >>$CONFIG_STATUS <<_ACEOF +cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +_ACEOF +sed ' +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +s/^/s,@/; s/!/@,|#_!!_#|/ +:n +t n +s/'"$ac_delim"'$/,g/; t +s/$/\\/; p +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF +CEOF$ac_eof _ACEOF -{ - echo "cat >conf$$subs.awk <<_ACEOF" && - echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && - echo "_ACEOF" -} >conf$$subs.sh || - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } -ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do - . ./conf$$subs.sh || - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } - - ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` - if test $ac_delim_n = $ac_delim_num; then + cat >conf$$subs.sed <<_ACEOF ++WORKSHOP_OBJ!$WORKSHOP_OBJ$ac_delim +NETBEANS_SRC!$NETBEANS_SRC$ac_delim +NETBEANS_OBJ!$NETBEANS_OBJ$ac_delim +SNIFF_SRC!$SNIFF_SRC$ac_delim +SNIFF_OBJ!$SNIFF_OBJ$ac_delim +xmkmfpath!$xmkmfpath$ac_delim +XMKMF!$XMKMF$ac_delim +X_CFLAGS!$X_CFLAGS$ac_delim +X_PRE_LIBS!$X_PRE_LIBS$ac_delim +X_LIBS!$X_LIBS$ac_delim +X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim +X_LIB!$X_LIB$ac_delim +GTK_CONFIG!$GTK_CONFIG$ac_delim +GTK12_CONFIG!$GTK12_CONFIG$ac_delim +PKG_CONFIG!$PKG_CONFIG$ac_delim +GTK_CFLAGS!$GTK_CFLAGS$ac_delim +GTK_LIBS!$GTK_LIBS$ac_delim +GTK_LIBNAME!$GTK_LIBNAME$ac_delim +GNOME_LIBS!$GNOME_LIBS$ac_delim +GNOME_LIBDIR!$GNOME_LIBDIR$ac_delim +GNOME_INCLUDEDIR!$GNOME_INCLUDEDIR$ac_delim +GNOME_CONFIG!$GNOME_CONFIG$ac_delim +MOTIF_LIBNAME!$MOTIF_LIBNAME$ac_delim +NARROW_PROTO!$NARROW_PROTO$ac_delim +GUI_INC_LOC!$GUI_INC_LOC$ac_delim +GUI_LIB_LOC!$GUI_LIB_LOC$ac_delim +GUITYPE!$GUITYPE$ac_delim +GUI_X_LIBS!$GUI_X_LIBS$ac_delim +HANGULIN_SRC!$HANGULIN_SRC$ac_delim +HANGULIN_OBJ!$HANGULIN_OBJ$ac_delim +TAGPRG!$TAGPRG$ac_delim +INSTALL_LANGS!$INSTALL_LANGS$ac_delim +INSTALL_TOOL_LANGS!$INSTALL_TOOL_LANGS$ac_delim +MSGFMT!$MSGFMT$ac_delim +MAKEMO!$MAKEMO$ac_delim +XCODEFLAGS!$XCODEFLAGS$ac_delim +DEPEND_CFLAGS_FILTER!$DEPEND_CFLAGS_FILTER$ac_delim +LIBOBJS!$LIBOBJS$ac_delim +LTLIBOBJS!$LTLIBOBJS$ac_delim +_ACEOF + - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 38; then ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 39; then break elif $ac_last_try; then - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} { (exit 1); exit 1; }; } else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " diff --cc src/configure.in index a233de18,b7ebe449..85df7da9 --- a/src/configure.in +++ b/src/configure.in @@@ -111,59 -111,61 +111,74 @@@ if test "`(uname) 2>/dev/null`" = Darwi AC_MSG_RESULT([yes, Darwin support excluded]) fi - AC_MSG_CHECKING(--with-mac-arch argument) - AC_ARG_WITH(mac-arch, [ --with-mac-arch=ARCH current, intel, ppc or both], - MACARCH="$withval"; AC_MSG_RESULT($MACARCH), - MACARCH="current"; AC_MSG_RESULT(defaulting to $MACARCH)) - + AC_MSG_CHECKING(--with-developer-dir argument) + AC_ARG_WITH(developer-dir, [ --with-developer-dir=PATH use PATH as location for Xcode developer tools], + DEVELOPER_DIR="$withval"; AC_MSG_RESULT($DEVELOPER_DIR), + DEVELOPER_DIR=""; AC_MSG_RESULT(not present)) + + if test "x$DEVELOPER_DIR" = "x"; then + AC_PATH_PROG(XCODE_SELECT, xcode-select) + if test "x$XCODE_SELECT" != "x"; then + AC_MSG_CHECKING(for developer dir using xcode-select) + DEVELOPER_DIR=`$XCODE_SELECT -print-path` + AC_MSG_RESULT([$DEVELOPER_DIR]) + else + DEVELOPER_DIR=/Developer + fi + fi - if test "x$MACARCH" = "xboth"; then - AC_MSG_CHECKING(for 10.4 universal SDK) - dnl There is a terrible inconsistency (but we appear to get away with it): - dnl $CFLAGS uses the 10.4u SDK library for the headers, while $CPPFLAGS - dnl doesn't, because "gcc -E" doesn't grok it. That means the configure - dnl tests using the preprocessor are actually done with the wrong header - dnl files. $LDFLAGS is set at the end, because configure uses it together - dnl with $CFLAGS and we can only have one -sysroot argument. - save_cppflags="$CPPFLAGS" + AC_MSG_CHECKING(--with-macsdk argument) + AC_ARG_WITH(macsdk, + [ --with-macsdk=SDK SDK version (10.4, 10.5, 10.6, ...)], + [ MACSDK="$withval"; AC_MSG_RESULT($MACSDK) ], + [ MACSDK=""; AC_MSG_RESULT(using default) ]) + + if test -n "$MACSDK"; then + AC_MSG_CHECKING(if SDK is supported) save_cflags="$CFLAGS" save_ldflags="$LDFLAGS" - sdkflags="/Developer/SDKs/MacOSX$MACSDK" - CFLAGS="$CFLAGS -isysroot $DEVELOPER_DIR/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc" ++ sdkflags="$DEVELOPER_DIR/SDKs/MacOSX$MACSDK" + if test "x$MACSDK" = "x10.4"; then + sdkflags="$sdkflags""u" + fi + sdkflags="$sdkflags.sdk -mmacosx-version-min=$MACSDK" + CFLAGS="$CFLAGS -isysroot $sdkflags" + LDFLAGS="$LDFLAGS -Wl,-syslibroot,$sdkflags" AC_TRY_LINK([ ], [ ], - AC_MSG_RESULT(found, will make universal binary), + [ AC_MSG_RESULT([yes]) + XCODEFLAGS="$XCODEFLAGS -sdk macosx$MACSDK MACOSX_DEPLOYMENT_TARGET=$MACSDK" ], + [ AC_MSG_RESULT([no]) + dnl Important to clear MACSDK so later on in the script we can assume + dnl that no SDK was chosen if it is empty. + MACSDK="" + CFLAGS="$save_cflags" + LDFLAGS="$save_ldflags" ]) + fi - AC_MSG_RESULT(not found) - CFLAGS="$save_cflags" - AC_MSG_CHECKING(if Intel architecture is supported) - CPPFLAGS="$CPPFLAGS -arch i386" - LDFLAGS="$save_ldflags -arch i386" - AC_TRY_LINK([ ], [ ], - AC_MSG_RESULT(yes); MACARCH="intel", - AC_MSG_RESULT(no, using PowerPC) - MACARCH="ppc" - CPPFLAGS="$save_cppflags -arch ppc" - LDFLAGS="$save_ldflags -arch ppc")) - elif test "x$MACARCH" = "xintel"; then - CPPFLAGS="$CPPFLAGS -arch intel" - LDFLAGS="$LDFLAGS -arch intel" - elif test "x$MACARCH" = "xppc"; then - CPPFLAGS="$CPPFLAGS -arch ppc" - LDFLAGS="$LDFLAGS -arch ppc" + + AC_MSG_CHECKING(--with-macarchs argument) + AC_ARG_WITH(macarchs, + [ --with-macarchs=ARCHS space separated list of archs (i386 x86_64 ppc ...)], + [ ARCHS="$withval"; AC_MSG_RESULT($ARCHS) ], + [ ARCHS=""; AC_MSG_RESULT(defaulting to native arch) ]) + + if test -n "$ARCHS"; then + AC_MSG_CHECKING(if architectures are supported) + save_cflags="$CFLAGS" + save_ldflags="$LDFLAGS" + archflags=`echo "$ARCHS" | sed -e 's/[[[:<:]]]/-arch /g'` + CFLAGS="$CFLAGS $archflags" + LDFLAGS="$LDFLAGS $archflags" + AC_TRY_LINK([ ], [ ], + [ AC_MSG_RESULT([yes]) + XCODEFLAGS="$XCODEFLAGS ARCHS=\"$ARCHS\" ONLY_ACTIVE_ARCH=\"NO\"" ], + [ AC_MSG_RESULT([no, will build for native arch only]) + ARCHS="" + CFLAGS="$save_cflags" + LDFLAGS="$save_ldflags" ]) fi + if test "$enable_darwin" = "yes"; then MACOSX=yes OS_EXTRA_SRC="os_macosx.c os_mac_conv.c"; @@@ -1482,27 -1453,8 +1497,27 @@@ if test "x$MACOSX" = "xyes"; the prefix=/Applications fi - dnl Sorry for the hard coded default - datadir='${prefix}/Vim.app/Contents/Resources' + if test -z "$SKIP_MACVIM" -a "x$COCOA" = "xyes"; then + AC_MSG_CHECKING(for MacVim GUI) + dnl already did the check, just give the message + AC_MSG_RESULT(yes); + GUITYPE=MACVIMGUI + dnl Sorry for the hard coded default + datadir='${prefix}/MacVim.app/Contents/Resources' + elif test -z "$SKIP_CARBON" -a "x$CARBON" = "xyes"; then + AC_MSG_CHECKING(for Carbon GUI) + dnl already did the check, just give the message + AC_MSG_RESULT(yes); + GUITYPE=CARBONGUI + dnl Sorry for the hard coded default + datadir='${prefix}/Vim.app/Contents/Resources' + - CPPFLAGS="$CPPFLAGS -I/Developer/Headers/FlatCarbon" ++ CPPFLAGS="$CPPFLAGS -I$DEVELOPER_DIR/Headers/FlatCarbon" + fi + + if test "$VIMNAME" = "vim"; then + VIMNAME=Vim + fi dnl skip everything else SKIP_GTK=YES; diff --cc src/ex_docmd.c index c1d5fc23,f8795fa1..c964887e --- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@@ -3819,15 -3809,10 +3819,18 @@@ set_one_cmd_context(xp, buff set_context_in_profile_cmd(xp, arg); break; #endif + case CMD_behave: + xp->xp_context = EXPAND_BEHAVE; + break; +#ifdef FEAT_GUI_MACVIM + case CMD_macaction: + xp->xp_context = EXPAND_MACACTION; + xp->xp_pattern = arg; + break; +#endif + + #endif /* FEAT_CMDL_COMPL */ default: diff --cc src/if_ruby.c index ef8af721,2ee329bc..af6eae26 --- a/src/if_ruby.c +++ b/src/if_ruby.c @@@ -53,12 -53,20 +53,25 @@@ # undef _WIN32_WINNT #endif + #if (defined(RUBY_VERSION) && RUBY_VERSION >= 19) \ + || (defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 19) + # define RUBY19_OR_LATER 1 + #endif + + #if defined(DYNAMIC_RUBY_VER) && DYNAMIC_RUBY_VER >= 19 + /* Ruby 1.9 defines a number of static functions which use rb_num2long and + * rb_int2big */ + # define rb_num2long rb_num2long_stub + # define rb_int2big rb_int2big_stub + #endif + -#include +#ifdef FEAT_GUI_MACVIM +# include +#else +# include +#endif - #if defined(RUBY_VERSION) && RUBY_VERSION >= 19 ++ + #ifdef RUBY19_OR_LATER # include #endif diff --cc src/vim.h index af4af6f6,b6b4e1e9..108375fa --- a/src/vim.h +++ b/src/vim.h @@@ -723,7 -738,7 +740,8 @@@ extern char *(*dyn_libintl_textdomain)( #define EXPAND_CSCOPE 33 #define EXPAND_SIGN 34 #define EXPAND_PROFILE 35 - #define EXPAND_MACACTION 36 + #define EXPAND_BEHAVE 36 ++#define EXPAND_MACACTION 37 /* Values for exmode_active (0 is no exmode) */ #define EXMODE_NORMAL 1