summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2004-11-12 20:20:20 (GMT)
committerdgp <dgp@users.sourceforge.net>2004-11-12 20:20:20 (GMT)
commit15db0cfaf8db72f2cd37a9379f11ccd9efb3ae7d (patch)
tree9ff4968256f4ea379c1be93d08c266ec070d0e86
parent76bdda652755702f1fe6c33d2cabfbd403ec9bfa (diff)
downloadtcl-15db0cfaf8db72f2cd37a9379f11ccd9efb3ae7d.zip
tcl-15db0cfaf8db72f2cd37a9379f11ccd9efb3ae7d.tar.gz
tcl-15db0cfaf8db72f2cd37a9379f11ccd9efb3ae7d.tar.bz2
* unix/Makefile.in: Be sure -I{BUILD_DIR} comes first so that
we #include the correct tclConfig.h file for the correct build. * generic/tclPort.h: Make sure tclConfig.h is #include'd so that its configuration values can guide portability support.
-rw-r--r--ChangeLog6
-rw-r--r--generic/tclPort.h5
-rw-r--r--unix/Makefile.in6
3 files changed, 13 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 96c5588..259c017 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2004-11-12 Don Porter <dgp@users.sourceforge.net>
+ * unix/Makefile.in: Be sure -I{BUILD_DIR} comes first so that
+ we #include the correct tclConfig.h file for the correct build.
+
+ * generic/tclPort.h: Make sure tclConfig.h is #include'd so that
+ its configuration values can guide portability support.
+
* generic/tclInt.h: Moved verification of ptrdiff_t typedef from
* generic/tclExecute.c: multiple .c files into one common header where
* generic/tclVar.c: it is verifiably after tclConfig.h inclusion.
diff --git a/generic/tclPort.h b/generic/tclPort.h
index 5cea76b..e4c0d40 100644
--- a/generic/tclPort.h
+++ b/generic/tclPort.h
@@ -10,13 +10,16 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclPort.h,v 1.9 2004/04/24 05:59:18 das Exp $
+ * RCS: @(#) $Id: tclPort.h,v 1.10 2004/11/12 20:20:24 dgp Exp $
*/
#ifndef _TCLPORT
#define _TCLPORT
#include "tcl.h"
+#ifdef HAVE_CONFIG_H
+#include "tclConfig.h"
+#endif
#if defined(__WIN32__)
# include "tclWinPort.h"
diff --git a/unix/Makefile.in b/unix/Makefile.in
index a2e18f4..c10f040 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -5,7 +5,7 @@
# "autoconf" program (constructs like "@foo@" will get replaced in the
# actual Makefile.
#
-# RCS: @(#) $Id: Makefile.in,v 1.152 2004/11/12 19:03:23 rmax Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.153 2004/11/12 20:20:24 dgp Exp $
VERSION = @TCL_VERSION@
MAJOR_VERSION = @TCL_MAJOR_VERSION@
@@ -275,12 +275,12 @@ DDD = ddd
CC_SWITCHES = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \
--I${GENERIC_DIR} -I${SRC_DIR} -I${BUILD_DIR} \
+-I${BUILD_DIR} -I${GENERIC_DIR} -I${SRC_DIR} \
${AC_FLAGS} ${MATH_FLAGS} ${GENERIC_FLAGS} ${PROTO_FLAGS} \
${NO_DEPRECATED_FLAGS} ${ENV_FLAGS}
STUB_CC_SWITCHES = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \
--I${GENERIC_DIR} -I${SRC_DIR} -I${BUILD_DIR} \
+-I${BUILD_DIR} -I${GENERIC_DIR} -I${SRC_DIR} \
${AC_FLAGS} ${MATH_FLAGS} ${GENERIC_FLAGS} ${PROTO_FLAGS} ${ENV_FLAGS}
LIBS = @TCL_LIBS@