Fix default build-from-Git on macOS

* configure.ac (NS_IMPL_COCOA): Do not default to "yes" if
src/macuvs.h is absent, which is possible in a build from Git.

diff --git a/configure.ac b/configure.ac
index be5c4e35b177bb1d36ffe2a99af23f53a2b6a9e0..c1c49700029f7be879cda4194f8d207d7dc2220c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1960,7 +1960,10 @@ CFLAGS="$CFLAGS -x objective-c"
 GNU_OBJC_CFLAGS=
 LIBS_GNUSTEP=
 if test "${with_ns}" != no; then
-  if test "${opsys}" = darwin; then
+  # macfont.o requires macuvs.h which is absent in the repository,
+  # so avoid NS_IMPL_COCOA if macuvs.h is absent.
+  # Even a headless Emacs can build macuvs.h, so this lets you bootstrap.
+  if test "${opsys}" = darwin && test -f "$srcdir/src/macuvs.h"; then
      NS_IMPL_COCOA=yes
      ns_appdir=`pwd`/nextstep/Emacs.app
      ns_appbindir=${ns_appdir}/Contents/MacOS