[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 9b17006: Fix default build-from-Git on macOS
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] master 9b17006: Fix default build-from-Git on macOS |
Date: |
Fri, 21 Jun 2019 19:32:18 -0400 (EDT) |
branch: master
commit 9b170060ba80c62a3a38e39d0c9692bdddd6ae47
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>
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.
---
configure.ac | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index be5c4e3..c1c4970 100644
--- 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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 9b17006: Fix default build-from-Git on macOS,
Paul Eggert <=