summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authordas <das>2006-08-21 05:37:55 (GMT)
committerdas <das>2006-08-21 05:37:55 (GMT)
commit8b17034ed17fcb7217298e53fc949da0457fdf8e (patch)
treea174ef20a573df849721d71c986a1d15e22271e6 /unix
parent6e7117e439b8f95893db943499a84c6f32996451 (diff)
downloadtcl-8b17034ed17fcb7217298e53fc949da0457fdf8e.zip
tcl-8b17034ed17fcb7217298e53fc949da0457fdf8e.tar.gz
tcl-8b17034ed17fcb7217298e53fc949da0457fdf8e.tar.bz2
* 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]
Diffstat (limited to 'unix')
-rw-r--r--unix/tclUnixPort.h20
1 files changed, 13 insertions, 7 deletions
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