From: Glenn Morris <rgm@gnu.org>
Date: Wed, 16 Jul 2008 08:09:53 +0000 (+0000)
Subject: (with_ns): Remove dead code, since OPTION_DEFAULT_OFF means never unset.
X-Git-Tag: emacs-pretest-23.0.90~4138
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6ba72723bbb8bfe644bb67137aa1b9483dbe9ee4;p=emacs.git

(with_ns): Remove dead code, since OPTION_DEFAULT_OFF means never unset.
---

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