diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2019-06-21 16:22:26 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2019-06-21 16:32:13 -0700 |
| commit | 9b170060ba80c62a3a38e39d0c9692bdddd6ae47 (patch) | |
| tree | 22749a010a46b2b2d0bf4491373755cb4fab6b8c | |
| parent | 7555f9321d0d2bd736965003dce235c12dedf04e (diff) | |
| download | emacs-9b170060ba80c62a3a38e39d0c9692bdddd6ae47.tar.gz | |
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.
| -rw-r--r-- | configure.ac | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index be5c4e35b17..c1c49700029 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 |