* unix/config.h.in:

* unix/tclConfig.h.in:	renamed

* unix/Makefile.in:	Completed support for config header,
* unix/configure.in:	fixed building outside of the unix dir,
* unix/tclAppinit.c:	and reflected the name change of config.h.
* generic/tclInt.h:

* unix/configure:       generated

6 files changed, 21 insertions, 18 deletions

diff --git a/generic/tclInt.h b/generic/tclInt.h
index 6323c74..c0bd054 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -12,14 +12,14 @@
  * 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.194 2004/11/12 16:44:56 dkf Exp $
+ * RCS: @(#) $Id: tclInt.h,v 1.195 2004/11/12 18:07:49 rmax Exp $
  */
 
 #ifndef _TCLINT
 #define _TCLINT
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "tclConfig.h"
 #endif
 
 /*
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 643274e..7f64815 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.149 2004/11/12 16:44:56 dkf Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.150 2004/11/12 18:07:49 rmax Exp $
 
 VERSION 		= @TCL_VERSION@
 MAJOR_VERSION		= @TCL_MAJOR_VERSION@
@@ -240,6 +240,7 @@ AR			= @AR@
 RANLIB			= @RANLIB@
 SRC_DIR			= @srcdir@
 TOP_DIR			= @srcdir@/..
+BUILD_DIR		= @builddir@
 GENERIC_DIR		= $(TOP_DIR)/generic
 COMPAT_DIR		= $(TOP_DIR)/compat
 TOOL_DIR		= $(TOP_DIR)/tools
@@ -274,12 +275,12 @@ DDD			= ddd
 
 
 CC_SWITCHES = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \
--I${GENERIC_DIR} -I${UNIX_DIR} -I${SRC_DIR} \
+-I${GENERIC_DIR} -I${UNIX_DIR} -I${SRC_DIR} -I${BUILD_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${GENERIC_DIR} -I${SRC_DIR} -I${BUILD_DIR} \
 ${AC_FLAGS} ${MATH_FLAGS} ${GENERIC_FLAGS} ${PROTO_FLAGS} ${ENV_FLAGS}
 
 LIBS		= @TCL_LIBS@
@@ -758,7 +759,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 ; \
+		$(UNIX_DIR)/tclUnixPort.h $(BUILD_DIR)/tclConfig.h; \
 	    do \
 	    $(INSTALL_DATA) $$i $(PRIVATE_INCLUDE_INSTALL_DIR); \
 	    done;
@@ -1294,10 +1295,12 @@ DISTROOT = /tmp/dist
 DISTNAME = tcl${VERSION}${PATCH_LEVEL}
 ZIPNAME	 = tcl${MAJOR_VERSION}${MINOR_VERSION}${PATCH_LEVEL}-src.zip
 DISTDIR	 = $(DISTROOT)/$(DISTNAME)
-$(UNIX_DIR)/configure: $(UNIX_DIR)/configure.in
-	autoconf $(UNIX_DIR)/configure.in > $(UNIX_DIR)/configure
+$(UNIX_DIR)/configure: $(UNIX_DIR)/configure.in $(UNIX_DIR)/tcl.m4
+	cd $(UNIX_DIR); autoconf
+$(UNIX_DIR)/tclConfig.h.in: $(UNIX_DIR)/configure.in
+	cd $(UNIX_DIR); autoheader
 
-dist: $(UNIX_DIR)/configure mklinks
+dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tclConfig.h.in mklinks
 	rm -rf $(DISTDIR)
 	mkdir -p $(DISTDIR)/unix
 	cp -p $(UNIX_DIR)/*.c $(UNIX_DIR)/*.h $(DISTDIR)/unix
@@ -1307,7 +1310,7 @@ dist: $(UNIX_DIR)/configure mklinks
 		$(UNIX_DIR)/tcl.m4 $(UNIX_DIR)/aclocal.m4 \
 		$(UNIX_DIR)/tclConfig.sh.in $(UNIX_DIR)/install-sh \
 		$(UNIX_DIR)/README $(UNIX_DIR)/ldAix $(UNIX_DIR)/tcl.spec \
-		$(UNIX_DIR)/mkLinks \
+		$(UNIX_DIR)/tclConfig.h.in $(UNIX_DIR)/mkLinks \
 		$(DISTDIR)/unix
 	chmod 775 $(DISTDIR)/unix/configure $(DISTDIR)/unix/configure.in
 	chmod 775 $(DISTDIR)/unix/ldAix
diff --git a/unix/configure b/unix/configure
index a9276b2..572fd71 100755
--- a/unix/configure
+++ b/unix/configure
@@ -852,7 +852,7 @@ Optional Features:
   --enable-langinfo	  use nl_langinfo if possible to determine
 			  encoding at startup, otherwise use old heuristic
   --enable-framework      package shared libraries in MacOSX frameworks --disable-framework
-  --enable-dll-unloading  turn on the 'unload' command default: on
+  --enable-dll-unloading  turn on the 'unload' command (default: on)
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -1307,7 +1307,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-          ac_config_headers="$ac_config_headers config.h"
+          ac_config_headers="$ac_config_headers tclConfig.h"
 
 
 TCL_VERSION=8.5
@@ -15385,7 +15385,7 @@ do
   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
   "dltest/Makefile" ) CONFIG_FILES="$CONFIG_FILES dltest/Makefile" ;;
   "tclConfig.sh" ) CONFIG_FILES="$CONFIG_FILES tclConfig.sh" ;;
-  "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+  "tclConfig.h" ) CONFIG_HEADERS="$CONFIG_HEADERS tclConfig.h" ;;
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
diff --git a/unix/configure.in b/unix/configure.in
index fe8b3a8..9792274 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -3,11 +3,11 @@ dnl	This file is an input file used by the GNU "autoconf" program to
 dnl	generate the file "configure", which is run during Tcl installation
 dnl	to configure the system for the local environment.
 #
-# RCS: @(#) $Id: configure.in,v 1.116 2004/11/12 16:44:58 dkf Exp $
+# RCS: @(#) $Id: configure.in,v 1.117 2004/11/12 18:07:55 rmax Exp $
 
 AC_INIT(../generic/tcl.h)
 AC_PREREQ(2.57)
-AC_CONFIG_HEADERS(config.h)
+AC_CONFIG_HEADERS(tclConfig.h)
 
 TCL_VERSION=8.5
 TCL_MAJOR_VERSION=8
diff --git a/unix/tclAppInit.c b/unix/tclAppInit.c
index ec6f48d..1202a34 100644
--- a/unix/tclAppInit.c
+++ b/unix/tclAppInit.c
@@ -11,14 +11,14 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclAppInit.c,v 1.13 2004/11/12 16:44:59 dkf Exp $
+ * RCS: @(#) $Id: tclAppInit.c,v 1.14 2004/11/12 18:07:55 rmax Exp $
  */
 
 /*
  * The core stores all its #defs in config.h for clarity...
  */
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "tclConfig.h"
 #endif
 
 #include "tcl.h"
diff --git a/unix/config.h.in b/unix/tclConfig.h.in
index e12f57f..f931b23 100644
--- a/unix/config.h.in
+++ b/unix/tclConfig.h.in
@@ -1,4 +1,4 @@
-/* config.h.in.  Generated from configure.in by autoheader.  */
+/* tclConfig.h.in.  Generated from configure.in by autoheader.  */
 
 /* Is pthread_attr_get_np() declared in <pthread.h>? */
 #undef ATTRGETNP_NOT_DECLARED