Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
d97fbcbe
Commit
d97fbcbe
authored
Jun 22, 2015
by
Glenn Morris
Browse files
* configure.ac (--with-ns): Enable by default on OS X.
; * etc/NEWS, nextstep/INSTALL: Mention this.
parent
eccfc0a4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
4 deletions
+14
-4
configure.ac
configure.ac
+8
-4
etc/NEWS
etc/NEWS
+4
-0
nextstep/INSTALL
nextstep/INSTALL
+2
-0
No files found.
configure.ac
View file @
d97fbcbe
...
...
@@ -341,7 +341,9 @@ OPTION_DEFAULT_ON([m17n-flt],[don't use m17n-flt for text shaping])
OPTION_DEFAULT_ON([toolkit-scroll-bars],[don't use Motif or Xaw3d scroll bars])
OPTION_DEFAULT_ON([xaw3d],[don't use Xaw3d])
OPTION_DEFAULT_ON([xim],[don't use X11 XIM])
OPTION_DEFAULT_OFF([ns],[use NeXTstep (Cocoa or GNUstep) windowing system])
AC_ARG_WITH([ns],[AS_HELP_STRING([--with-ns],
[use Nextstep (OS X Cocoa or GNUstep) windowing system.
On by default on Mac OS X.])],[],[with_ns=maybe])
OPTION_DEFAULT_OFF([w32], [use native MS Windows GUI in a Cygwin build])
OPTION_DEFAULT_ON([gpm],[don't use -lgpm for mouse support on a GNU/Linux console])
...
...
@@ -1746,6 +1748,7 @@ else
fi
fi
test "${with_ns}" = maybe && test "${opsys}" != darwin && with_ns=no
HAVE_NS=no
NS_GNUSTEP_CONFIG=no
NS_IMPL_COCOA=no
...
...
@@ -1816,8 +1819,9 @@ fail;
CFLAGS="$CFLAGS $GNU_OBJC_CFLAGS"
AC_CHECK_HEADER([AppKit/AppKit.h], [HAVE_NS=yes],
[AC_MSG_ERROR(['--with-ns' was specified, but the include
files are missing or cannot be compiled.])])
[AC_MSG_ERROR([The include files (AppKit/AppKit.h etc) that
are required for a Nextstep build are missing or cannot be compiled.
Either fix this, or re-configure with the option '--without-ns'.])])
macfont_file=""
if test "${NS_IMPL_COCOA}" = "yes"; then
...
...
@@ -2670,7 +2674,7 @@ NOTIFY_SUMMARY=no
dnl FIXME? Don't auto-detect on NS, but do allow someone to specify
dnl a particular library. This doesn't make much sense?
if test "${
with
_ns}" = yes && test ${with_file_notification} = yes; then
if test "${
HAVE
_ns}" = yes && test ${with_file_notification} = yes; then
with_file_notification=no
fi
...
...
etc/NEWS
View file @
d97fbcbe
...
...
@@ -1089,6 +1089,10 @@ of Windows starting with Windows 9X.
**
The
byte
counts
in
etags
-
generated
TAGS
files
are
now
the
same
on
MS
-
Windows
as
they
are
on
other
platforms
.
---
**
On
OS
X
,
configure
creates
a
Cocoa
(
"Nextstep"
)
build
by
default
.
Pass
'--without-ns'
to
configure
to
create
an
X11
build
,
the
old
default
.
**
OS
X
10.5
or
older
is
no
longer
supported
.
**
OS
X
on
PowerPC
is
no
longer
supported
.
...
...
nextstep/INSTALL
View file @
d97fbcbe
...
...
@@ -19,6 +19,8 @@ In the top-level directory, use:
./configure --with-ns
(On Mac OS X, --with-ns is enabled by default.)
This will compile all the files, but emacs will not be able to be run except
in -nw (terminal) mode.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment