diff options
| author | Glenn Morris <rgm@gnu.org> | 2008-07-16 08:09:53 +0000 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2008-07-16 08:09:53 +0000 |
| commit | 6ba72723bbb8bfe644bb67137aa1b9483dbe9ee4 (patch) | |
| tree | 874ff868d202a08f7a690333dd614d6c2023b857 | |
| parent | 132d04752a194336e0ea965245294af64f27226f (diff) | |
| download | emacs-6ba72723bbb8bfe644bb67137aa1b9483dbe9ee4.tar.gz | |
(with_ns): Remove dead code, since OPTION_DEFAULT_OFF means never unset.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.in | 16 |
2 files changed, 6 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog index 3885a21dcd2..6dce58cba97 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2008-07-16 Glenn Morris <rgm@gnu.org> + * configure.in (with_kerberos, with_kerberos5, with_hesiod): + Fix tests for OPTION_DEFAULT_OFF (variables never unset). + (with_carbon, with_ns): Remove dead code, since OPTION_DEFAULT_OFF means + never unset. + * make-dist: Add nextstep/ directories. (src, lib-src): Add .m files. diff --git a/configure.in b/configure.in index 9b9789713b3..e6db75750fc 100644 --- a/configure.in +++ b/configure.in @@ -1241,22 +1241,8 @@ if test "${with_ns}" != no; then fi AC_CHECK_HEADER(AppKit/AppKit.h, HAVE_NS=yes) fi -if test "${window_system}" = x11 && test "${HAVE_NS}" = yes; then - if test "${with_ns+set}" != set \ - && test "${ns_appdir_x+set}" != set; then - HAVE_NS=no - fi -fi - -if test "${window_system}" = mac && test "${HAVE_NS}" = yes; then - if test "${with_ns+set}" != set \ - && test "${ns_appdir_x+set}" != set; then - HAVE_NS=no - else - HAVE_CARBON=no - fi -fi if test "${HAVE_NS}" = yes; then + test "${window_system}" = mac && HAVE_CARBON=no window_system=nextstep with_xft=no with_freetype=no |