* generic/tcl.h:

	* generic/tclInt.h:
	* unix/Makefile.in: include tclConfig.h from tcl.h and install it
	as a public header. Normalized compiler include path order to
	-I${BUILD_DIR} -I${UNIX_DIR} -I${GENERIC_DIR}.

	* unix/dltest/Makefile.in: add ${BUILD_DIR}/.. to include path
	to pick up tclConfig.h.

5 files changed, 28 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index 259c017..57c509d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2004-11-12  Daniel Steffen  <das@users.sourceforge.net>
+
+	* generic/tcl.h:
+	* generic/tclInt.h:
+	* unix/Makefile.in: include tclConfig.h from tcl.h and install it
+	as a public header. Normalized compiler include path order to 
+	-I${BUILD_DIR} -I${UNIX_DIR} -I${GENERIC_DIR}.
+	
+	* unix/dltest/Makefile.in: add ${BUILD_DIR}/.. to include path
+	to pick up tclConfig.h.
+
 2004-11-12  Don Porter  <dgp@users.sourceforge.net>
 
 	* unix/Makefile.in:	Be sure -I{BUILD_DIR} comes first so that
diff --git a/generic/tcl.h b/generic/tcl.h
index e29ee48..71ef242 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -13,12 +13,16 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tcl.h,v 1.187 2004/11/03 19:13:33 davygrvy Exp $
+ * RCS: @(#) $Id: tcl.h,v 1.188 2004/11/12 20:27:28 das Exp $
  */
 
 #ifndef _TCL
 #define _TCL
 
+#ifdef HAVE_CONFIG_H
+#include "tclConfig.h"
+#endif
+
 /*
  * The following defines are used to indicate the various release levels.
  */
diff --git a/generic/tclInt.h b/generic/tclInt.h
index fa128aa..c2019a3 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -12,16 +12,12 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclInt.h,v 1.196 2004/11/12 19:16:52 dgp Exp $
+ * RCS: @(#) $Id: tclInt.h,v 1.197 2004/11/12 20:27:28 das Exp $
  */
 
 #ifndef _TCLINT
 #define _TCLINT
 
-#ifdef HAVE_CONFIG_H
-#include "tclConfig.h"
-#endif
-
 /*
  * Common include files needed by most of the Tcl source files are
  * included here, so that system-dependent personalizations for the
diff --git a/unix/Makefile.in b/unix/Makefile.in
index c10f040..746d49b 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.153 2004/11/12 20:20:24 dgp Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.154 2004/11/12 20:27:29 das Exp $
 
 VERSION 		= @TCL_VERSION@
 MAJOR_VERSION		= @TCL_MAJOR_VERSION@
@@ -275,17 +275,17 @@ DDD			= ddd
 
 
 CC_SWITCHES = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \
--I${BUILD_DIR} -I${GENERIC_DIR} -I${SRC_DIR} \
+-I${BUILD_DIR} -I${UNIX_DIR} -I${GENERIC_DIR} \
 ${AC_FLAGS} ${MATH_FLAGS} ${GENERIC_FLAGS} ${PROTO_FLAGS} \
 ${NO_DEPRECATED_FLAGS} ${ENV_FLAGS}
 
 STUB_CC_SWITCHES = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \
--I${BUILD_DIR} -I${GENERIC_DIR} -I${SRC_DIR} \
+-I${BUILD_DIR} -I${UNIX_DIR} -I${GENERIC_DIR} \
 ${AC_FLAGS} ${MATH_FLAGS} ${GENERIC_FLAGS} ${PROTO_FLAGS} ${ENV_FLAGS}
 
 LIBS		= @TCL_LIBS@
 
-DEPEND_SWITCHES	= ${CFLAGS} -I${GENERIC_DIR} -I${SRC_DIR} \
+DEPEND_SWITCHES	= ${CFLAGS} -I${UNIX_DIR} -I${GENERIC_DIR} \
 ${AC_FLAGS} ${MATH_FLAGS} \
 ${GENERIC_FLAGS} ${PROTO_FLAGS}
 
@@ -331,7 +331,8 @@ GENERIC_HDRS = \
 	$(GENERIC_DIR)/tclPatch.h \
 	$(GENERIC_DIR)/tclPlatDecls.h \
 	$(GENERIC_DIR)/tclPort.h \
-	$(GENERIC_DIR)/tclRegexp.h
+	$(GENERIC_DIR)/tclRegexp.h \
+	$(BUILD_DIR)/tclConfig.h
 
 GENERIC_SRCS = \
 	$(GENERIC_DIR)/regcomp.c \
@@ -649,7 +650,7 @@ install-libraries: libraries install-tzdata install-msgs
 	    fi
 	@echo "Installing header files";
 	@for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h \
-		$(GENERIC_DIR)/tclPlatDecls.h ; \
+		$(GENERIC_DIR)/tclPlatDecls.h $(BUILD_DIR)/tclConfig.h; \
 	    do \
 	    $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
 	    done;
@@ -759,7 +760,7 @@ install-private-headers: libraries
 	@echo "Installing private header files";
 	@for i in $(GENERIC_DIR)/tclInt.h $(GENERIC_DIR)/tclIntDecls.h \
 		$(GENERIC_DIR)/tclIntPlatDecls.h $(GENERIC_DIR)/tclPort.h \
-		$(UNIX_DIR)/tclUnixPort.h $(BUILD_DIR)/tclConfig.h; \
+		$(UNIX_DIR)/tclUnixPort.h; \
 	    do \
 	    $(INSTALL_DATA) $$i $(PRIVATE_INCLUDE_INSTALL_DIR); \
 	    done;
diff --git a/unix/dltest/Makefile.in b/unix/dltest/Makefile.in
index 06f4345..378c721 100644
--- a/unix/dltest/Makefile.in
+++ b/unix/dltest/Makefile.in
@@ -1,7 +1,7 @@
 # This Makefile is used to create several test cases for Tcl's load
 # command.  It also illustrates how to take advantage of configuration
 # exported by Tcl to set up Makefiles for shared libraries.
-# RCS: @(#) $Id: Makefile.in,v 1.15 2004/09/23 20:02:50 mdejong Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.16 2004/11/12 20:27:29 das Exp $
 
 TCL_DBGX =		@TCL_DBGX@
 CC = @CC@
@@ -12,13 +12,14 @@ SHLIB_LD =		@SHLIB_LD@
 SHLIB_LD_LIBS =		@SHLIB_LD_LIBS@
 SHLIB_SUFFIX =		@SHLIB_SUFFIX@
 SRC_DIR =		@srcdir@
+BUILD_DIR =		@builddir@
 TCL_VERSION=		@TCL_VERSION@
 
 CFLAGS_DEBUG		= @CFLAGS_DEBUG@
 CFLAGS_OPTIMIZE		= @CFLAGS_OPTIMIZE@
 
 CFLAGS = @CFLAGS@ @CFLAGS_DEFAULT@
-CC_SWITCHES = $(CFLAGS) -I${SRC_DIR}/../../generic -DTCL_MEM_DEBUG \
+CC_SWITCHES = $(CFLAGS) -I${SRC_DIR}/../../generic -I${BUILD_DIR}/.. -DTCL_MEM_DEBUG \
 	${SHLIB_CFLAGS} -DUSE_TCL_STUBS ${AC_FLAGS}
 
 all: pkga${SHLIB_SUFFIX} pkgb${SHLIB_SUFFIX} pkgc${SHLIB_SUFFIX} pkgd${SHLIB_SUFFIX} pkge${SHLIB_SUFFIX} pkgua${SHLIB_SUFFIX}