diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-08-11 23:08:48 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-08-11 23:08:48 +0200 |
| commit | 040f975fc1de14ada5e0a7324bb5e51e461be2dd (patch) | |
| tree | 9d768b3c622d6806853b7d884792788dba36d1d7 /src/auto | |
| parent | 035d6e91bd83574cab5a913c5c3a924d9011696b (diff) | |
patch 8.2.1424: Mac build failsv8.2.1424
Problem: Mac build fails.
Solution: Adjust configure to not fall back to Athena. Adjust some other
files.
Diffstat (limited to 'src/auto')
| -rwxr-xr-x | src/auto/configure | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/src/auto/configure b/src/auto/configure index fcb2f40e8c..5cef555485 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -4744,6 +4744,10 @@ rm -f core conftest.err conftest.$ac_objext \ OS_EXTRA_SRC="os_macosx.m os_mac_conv.c"; OS_EXTRA_OBJ="objects/os_macosx.o objects/os_mac_conv.o" CPPFLAGS="$CPPFLAGS -DMACOS_X_DARWIN" + + 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 + with_x=no + fi fi if test "$MACARCH" = "intel" -o "$MACARCH" = "both"; then @@ -9232,6 +9236,19 @@ $as_echo "Sorry, $enable_gui GUI is not supported" >&6; } SKIP_PHOTON=YES ;; esac +elif test "x$MACOS_X" = "xyes" -a "x$with_x" = "xno" ; then + case "$enable_gui_canon" in + no) { $as_echo "$as_me:${as_lineno-$LINENO}: result: no GUI support" >&5 +$as_echo "no GUI support" >&6; } ;; + yes|"") { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes - automatic GUI support" >&5 +$as_echo "yes - automatic GUI support" >&6; } + gui_auto=yes ;; + auto) { $as_echo "$as_me:${as_lineno-$LINENO}: result: auto - disable GUI support for Mac OS" >&5 +$as_echo "auto - disable GUI support for Mac OS" >&6; } ;; + *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: Sorry, $enable_gui GUI is not supported" >&5 +$as_echo "Sorry, $enable_gui GUI is not supported" >&6; } + SKIP_CARBON=YES ;; + esac else case "$enable_gui_canon" in |