From 8b17034ed17fcb7217298e53fc949da0457fdf8e Mon Sep 17 00:00:00 2001
From: das <das>
Date: Mon, 21 Aug 2006 05:37:55 +0000
Subject: 	* unix/tclUnixPort.h (Darwin): override potentially faulty
 configure 	detection of termios availability in all cases, since termios
 is known 	to be present on all Mac OS X releases since 10.0. [Bug
 497147]

---
 ChangeLog          |  6 +++++-
 unix/tclUnixPort.h | 20 +++++++++++++-------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 662137d..fa5447e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,10 @@
 	* unix/configure: autoconf-2.59
 	* unix/tclConfig.h.in: autoheader-2.59
 
+	* unix/tclUnixPort.h (Darwin): override potentially faulty configure
+	detection of termios availability in all cases, since termios is known
+	to be present on all Mac OS X releases since 10.0. [Bug 497147]
+
 2006-08-18  Daniel Steffen  <das@users.sourceforge.net>
 
 	* unix/tcl.m4 (Darwin): add support for --enable-64bit on x86_64, for
@@ -347,7 +351,7 @@
 	* generic/tclProc.c (ProcCompileProc): When a bump of the compile epoch
 	forces the re-compile of a proc body, take care not to overwrite any
 	Proc struct that may be referred to on the active call stack. This
-	fixes [Bug 148218]. Note that the fix will not be effective for code
+	fixes [Bug 1482718]. Note that the fix will not be effective for code
 	that calls the private routine TclProcCompileProc() directly.
 
 2006-05-13  Daniel Steffen  <das@users.sourceforge.net>
diff --git a/unix/tclUnixPort.h b/unix/tclUnixPort.h
index ed06e1d..6ac24a5 100644
--- a/unix/tclUnixPort.h
+++ b/unix/tclUnixPort.h
@@ -19,7 +19,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclUnixPort.h,v 1.50 2006/08/18 07:45:32 das Exp $
+ * RCS: @(#) $Id: tclUnixPort.h,v 1.51 2006/08/21 05:37:56 das Exp $
  */
 
 #ifndef _TCLUNIXPORT
@@ -506,7 +506,7 @@ extern double strtod();
  */
 
 #ifdef __APPLE__
-/* 
+/*
  * Support for fat compiles: configure runs only once for multiple architectures
  */
 #   if defined(__LP64__) && defined (NO_COREFOUNDATION_64)
@@ -519,18 +519,24 @@ extern double strtod();
 #       else
 #           define HAVE_PUTENV_THAT_COPIES 1
 #       endif
-#       define USE_TERMIOS 1
-#       undef USE_TERMIO
-#       undef USE_SGTTY
 #   endif /* __DARWIN_UNIX03 */
-/* 
+/*
+ * The termios configure test program relies on the configure script being run
+ * from a terminal, which is not the case e.g. when configuring from Xcode.
+ * Since termios is known to be present on all Mac OS X releases since 10.0,
+ * override the configure defines for serial API here. [Bug 497147]
+ */
+#   define USE_TERMIOS 1
+#   undef  USE_TERMIO
+#   undef  USE_SGTTY
+/*
  * Include AvailabilityMacros.h here (when available) to ensure any symbolic
  * MAC_OS_X_VERSION_* constants passed on the command line are translated.
  */
 #   ifdef HAVE_AVAILABILITYMACROS_H
 #       include <AvailabilityMacros.h>
 #   endif
-/* 
+/*
  * Support for weak import.
  */
 #   ifdef HAVE_WEAK_IMPORT
-- 
cgit v0.12