Mercurial > vim

comparison src/auto/configure @ 21745:35921b7fc07a v8.2.1422

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.1422: the Mac GUI implementation is outdated Commit: https://github.com/vim/vim/commit/097148e849136b49052b1b5123c714fb1d74db9b Author: Bram Moolenaar <Bram@vim.org> Date: Tue Aug 11 21:58:20 2020 +0200 patch 8.2.1422: the Mac GUI implementation is outdated Problem: The Mac GUI implementation is outdated and probably doesn't even work. Solution: Remove the Mac GUI code. The MacVim project provides the supported Vim GUI version.
author Bram Moolenaar <Bram@vim.org>
date Tue, 11 Aug 2020 22:00:04 +0200
parents 13e0857cb114
children e86237409bd2
comparison
equal deleted inserted replaced
21744:805e8d18b78b 21745:35921b7fc07a
827 enable_gnome_check 827 enable_gnome_check
828 enable_gtk3_check 828 enable_gtk3_check
829 enable_motif_check 829 enable_motif_check
830 enable_athena_check 830 enable_athena_check
831 enable_nextaw_check 831 enable_nextaw_check
832 enable_carbon_check
833 enable_gtktest 832 enable_gtktest
834 with_gnome_includes 833 with_gnome_includes
835 with_gnome_libs 834 with_gnome_libs
836 with_gnome 835 with_gnome
837 enable_icon_cache_update 836 enable_icon_cache_update
1507 --enable-gnome-check If GTK GUI, check for GNOME default=no 1506 --enable-gnome-check If GTK GUI, check for GNOME default=no
1508 --enable-gtk3-check If auto-select GUI, check for GTK+ 3 default=yes 1507 --enable-gtk3-check If auto-select GUI, check for GTK+ 3 default=yes
1509 --enable-motif-check If auto-select GUI, check for Motif default=yes 1508 --enable-motif-check If auto-select GUI, check for Motif default=yes
1510 --enable-athena-check If auto-select GUI, check for Athena default=yes 1509 --enable-athena-check If auto-select GUI, check for Athena default=yes
1511 --enable-nextaw-check If auto-select GUI, check for neXtaw default=yes 1510 --enable-nextaw-check If auto-select GUI, check for neXtaw default=yes
1512 --enable-carbon-check If auto-select GUI, check for Carbon default=yes
1513 --disable-gtktest Do not try to compile and run a test GTK program 1511 --disable-gtktest Do not try to compile and run a test GTK program
1514 --disable-icon-cache-update update disabled 1512 --disable-icon-cache-update update disabled
1515 --disable-desktop-database-update update disabled 1513 --disable-desktop-database-update update disabled
1516 --disable-largefile omit support for large files 1514 --disable-largefile omit support for large files
1517 --disable-canberra Do not use libcanberra. 1515 --disable-canberra Do not use libcanberra.
4744 if test "$enable_darwin" = "yes"; then 4742 if test "$enable_darwin" = "yes"; then
4745 MACOS_X_DARWIN=yes 4743 MACOS_X_DARWIN=yes
4746 OS_EXTRA_SRC="os_macosx.m os_mac_conv.c"; 4744 OS_EXTRA_SRC="os_macosx.m os_mac_conv.c";
4747 OS_EXTRA_OBJ="objects/os_macosx.o objects/os_mac_conv.o" 4745 OS_EXTRA_OBJ="objects/os_macosx.o objects/os_mac_conv.o"
4748 CPPFLAGS="$CPPFLAGS -DMACOS_X_DARWIN" 4746 CPPFLAGS="$CPPFLAGS -DMACOS_X_DARWIN"
4749 4747 fi
4750 # On IRIX 5.3, sys/types and inttypes.h are conflicting. 4748
4749 if test "$MACARCH" = "intel" -o "$MACARCH" = "both"; then
4750 CFLAGS=`echo "$CFLAGS" | sed 's/-O[23456789]/-Oz/'`
4751 fi
4752
4753 else
4754 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4755 $as_echo "no" >&6; }
4756 fi
4757
4758 # On IRIX 5.3, sys/types and inttypes.h are conflicting.
4751 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ 4759 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
4752 inttypes.h stdint.h unistd.h 4760 inttypes.h stdint.h unistd.h
4753 do : 4761 do :
4754 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` 4762 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
4755 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default 4763 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
4761 4769
4762 fi 4770 fi
4763 4771
4764 done 4772 done
4765 4773
4766
4767 ac_fn_c_check_header_mongrel "$LINENO" "Carbon/Carbon.h" "ac_cv_header_Carbon_Carbon_h" "$ac_includes_default"
4768 if test "x$ac_cv_header_Carbon_Carbon_h" = xyes; then :
4769 CARBON=yes
4770 fi
4771
4772
4773 if test "x$CARBON" = "xyes"; then
4774 if test -z "$with_x" -a "X$enable_gui" != Xmotif -a "X$enable_gui" != Xathena -a "X$enable_gui" != Xgtk2 -a "X$enable_gui" != Xgtk3; then
4775 with_x=no
4776 fi
4777 fi
4778 fi
4779
4780 if test "$MACARCH" = "intel" -o "$MACARCH" = "both"; then
4781 CFLAGS=`echo "$CFLAGS" | sed 's/-O[23456789]/-Oz/'`
4782 fi
4783
4784 else
4785 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4786 $as_echo "no" >&6; }
4787 fi
4788 4774
4789 for ac_header in AvailabilityMacros.h 4775 for ac_header in AvailabilityMacros.h
4790 do : 4776 do :
4791 ac_fn_c_check_header_mongrel "$LINENO" "AvailabilityMacros.h" "ac_cv_header_AvailabilityMacros_h" "$ac_includes_default" 4777 ac_fn_c_check_header_mongrel "$LINENO" "AvailabilityMacros.h" "ac_cv_header_AvailabilityMacros_h" "$ac_includes_default"
4792 if test "x$ac_cv_header_AvailabilityMacros_h" = xyes; then : 4778 if test "x$ac_cv_header_AvailabilityMacros_h" = xyes; then :
9210 SKIP_MOTIF=YES 9196 SKIP_MOTIF=YES
9211 SKIP_ATHENA=YES 9197 SKIP_ATHENA=YES
9212 SKIP_NEXTAW=YES 9198 SKIP_NEXTAW=YES
9213 SKIP_PHOTON=YES 9199 SKIP_PHOTON=YES
9214 SKIP_HAIKU=YES 9200 SKIP_HAIKU=YES
9215 SKIP_CARBON=YES
9216 GUITYPE=NONE 9201 GUITYPE=NONE
9217 9202
9218 if test "x$HAIKU" = "xyes"; then 9203 if test "x$HAIKU" = "xyes"; then
9219 SKIP_HAIKU= 9204 SKIP_HAIKU=
9220 case "$enable_gui_canon" in 9205 case "$enable_gui_canon" in
9245 *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: Sorry, $enable_gui GUI is not supported" >&5 9230 *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: Sorry, $enable_gui GUI is not supported" >&5
9246 $as_echo "Sorry, $enable_gui GUI is not supported" >&6; } 9231 $as_echo "Sorry, $enable_gui GUI is not supported" >&6; }
9247 SKIP_PHOTON=YES ;; 9232 SKIP_PHOTON=YES ;;
9248 esac 9233 esac
9249 9234
9250 elif test "x$MACOS_X" = "xyes" -a "x$with_x" = "xno" ; then
9251 SKIP_CARBON=
9252 case "$enable_gui_canon" in
9253 no) { $as_echo "$as_me:${as_lineno-$LINENO}: result: no GUI support" >&5
9254 $as_echo "no GUI support" >&6; }
9255 SKIP_CARBON=YES ;;
9256 yes|"") { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes - automatic GUI support" >&5
9257 $as_echo "yes - automatic GUI support" >&6; }
9258 gui_auto=yes ;;
9259 auto) { $as_echo "$as_me:${as_lineno-$LINENO}: result: auto - Carbon GUI is outdated - disable GUI support" >&5
9260 $as_echo "auto - Carbon GUI is outdated - disable GUI support" >&6; }
9261 SKIP_CARBON=YES ;;
9262 carbon) { $as_echo "$as_me:${as_lineno-$LINENO}: result: Carbon GUI support" >&5
9263 $as_echo "Carbon GUI support" >&6; } ;;
9264 *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: Sorry, $enable_gui GUI is not supported" >&5
9265 $as_echo "Sorry, $enable_gui GUI is not supported" >&6; }
9266 SKIP_CARBON=YES ;;
9267 esac
9268
9269 else 9235 else
9270 9236
9271 case "$enable_gui_canon" in 9237 case "$enable_gui_canon" in
9272 no|none) { $as_echo "$as_me:${as_lineno-$LINENO}: result: no GUI support" >&5 9238 no|none) { $as_echo "$as_me:${as_lineno-$LINENO}: result: no GUI support" >&5
9273 $as_echo "no GUI support" >&6; } ;; 9239 $as_echo "no GUI support" >&6; } ;;
9276 gui_auto=yes 9242 gui_auto=yes
9277 SKIP_GTK2= 9243 SKIP_GTK2=
9278 SKIP_GNOME= 9244 SKIP_GNOME=
9279 SKIP_MOTIF= 9245 SKIP_MOTIF=
9280 SKIP_ATHENA= 9246 SKIP_ATHENA=
9281 SKIP_NEXTAW= 9247 SKIP_NEXTAW=;;
9282 SKIP_CARBON=;;
9283 gtk2) { $as_echo "$as_me:${as_lineno-$LINENO}: result: GTK+ 2.x GUI support" >&5 9248 gtk2) { $as_echo "$as_me:${as_lineno-$LINENO}: result: GTK+ 2.x GUI support" >&5
9284 $as_echo "GTK+ 2.x GUI support" >&6; } 9249 $as_echo "GTK+ 2.x GUI support" >&6; }
9285 SKIP_GTK2=;; 9250 SKIP_GTK2=;;
9286 gnome2) { $as_echo "$as_me:${as_lineno-$LINENO}: result: GNOME 2.x GUI support" >&5 9251 gnome2) { $as_echo "$as_me:${as_lineno-$LINENO}: result: GNOME 2.x GUI support" >&5
9287 $as_echo "GNOME 2.x GUI support" >&6; } 9252 $as_echo "GNOME 2.x GUI support" >&6; }
9405 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_nextaw_check" >&5 9370 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_nextaw_check" >&5
9406 $as_echo "$enable_nextaw_check" >&6; }; 9371 $as_echo "$enable_nextaw_check" >&6; };
9407 if test "x$enable_nextaw_check" = "xno"; then 9372 if test "x$enable_nextaw_check" = "xno"; then
9408 SKIP_NEXTAW=YES 9373 SKIP_NEXTAW=YES
9409 fi 9374 fi
9410 fi
9411
9412 if test "x$SKIP_CARBON" != "xYES" -a "$enable_gui_canon" != "carbon"; then
9413 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether or not to look for Carbon" >&5
9414 $as_echo_n "checking whether or not to look for Carbon... " >&6; }
9415 # Check whether --enable-carbon-check was given.
9416 if test "${enable_carbon_check+set}" = set; then :
9417 enableval=$enable_carbon_check;
9418 else
9419 enable_carbon_check="yes"
9420 fi
9421
9422 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_carbon_check" >&5
9423 $as_echo "$enable_carbon_check" >&6; };
9424 if test "x$enable_carbon_check" = "xno"; then
9425 SKIP_CARBON=YES
9426 fi
9427 fi
9428
9429
9430 if test "x$MACOS_X" = "xyes" -a -z "$SKIP_CARBON" -a "x$CARBON" = "xyes"; then
9431 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Carbon GUI" >&5
9432 $as_echo_n "checking for Carbon GUI... " >&6; }
9433 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
9434 $as_echo "yes" >&6; };
9435 GUITYPE=CARBONGUI
9436 if test "$VIMNAME" = "vim"; then
9437 VIMNAME=Vim
9438 fi
9439
9440 if test "x$MACARCH" = "xboth"; then
9441 CPPFLAGS="$CPPFLAGS -I$DEVELOPER_DIR/SDKs/MacOSX10.4u.sdk/Developer/Headers/FlatCarbon"
9442 else
9443 CPPFLAGS="$CPPFLAGS -I$DEVELOPER_DIR/Headers/FlatCarbon"
9444 fi
9445
9446 if test x$prefix = xNONE; then
9447 prefix=/Applications
9448 fi
9449
9450 datadir='${prefix}/Vim.app/Contents/Resources'
9451
9452 SKIP_GTK2=YES;
9453 SKIP_GNOME=YES;
9454 SKIP_MOTIF=YES;
9455 SKIP_ATHENA=YES;
9456 SKIP_NEXTAW=YES;
9457 SKIP_PHOTON=YES;
9458 SKIP_HAIKU=YES;
9459 SKIP_CARBON=YES
9460 fi 9375 fi
9461 9376
9462 9377
9463 9378
9464 9379
14858 fi 14773 fi
14859 14774
14860 if test "$MACOS_X" = "yes"; then 14775 if test "$MACOS_X" = "yes"; then
14861 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need macOS frameworks" >&5 14776 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need macOS frameworks" >&5
14862 $as_echo_n "checking whether we need macOS frameworks... " >&6; } 14777 $as_echo_n "checking whether we need macOS frameworks... " >&6; }
14863 if test "$GUITYPE" = "CARBONGUI"; then 14778 if test "$MACOS_X_DARWIN" = "yes"; then
14864 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, we need Carbon" >&5
14865 $as_echo "yes, we need Carbon" >&6; }
14866 LIBS="$LIBS -framework Carbon"
14867 elif test "$MACOS_X_DARWIN" = "yes"; then
14868 if test "$features" = "tiny"; then 14779 if test "$features" = "tiny"; then
14869 OS_EXTRA_SRC=`echo "$OS_EXTRA_SRC" | sed -e 's+os_macosx.m++'` 14780 OS_EXTRA_SRC=`echo "$OS_EXTRA_SRC" | sed -e 's+os_macosx.m++'`
14870 OS_EXTRA_OBJ=`echo "$OS_EXTRA_OBJ" | sed -e 's+objects/os_macosx.o++'` 14781 OS_EXTRA_OBJ=`echo "$OS_EXTRA_OBJ" | sed -e 's+objects/os_macosx.o++'`
14871 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, we need CoreServices" >&5 14782 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, we need CoreServices" >&5
14872 $as_echo "yes, we need CoreServices" >&6; } 14783 $as_echo "yes, we need CoreServices" >&6; }
14878 fi 14789 fi
14879 else 14790 else
14880 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 14791 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14881 $as_echo "no" >&6; } 14792 $as_echo "no" >&6; }
14882 fi 14793 fi
14883 fi
14884 if test "x$MACARCH" = "xboth" && test "x$GUITYPE" = "xCARBONGUI"; then
14885 LDFLAGS="$LDFLAGS -isysroot $DEVELOPER_DIR/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc"
14886 fi 14794 fi
14887 14795
14888 DEPEND_CFLAGS_FILTER= 14796 DEPEND_CFLAGS_FILTER=
14889 if test "$GCC" = yes; then 14797 if test "$GCC" = yes; then
14890 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCC 3 or later" >&5 14798 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCC 3 or later" >&5