From b36e07917dbad9ecfad09b3941e0aabbdc9f3747 Mon Sep 17 00:00:00 2001
From: nijtmans <nijtmans>
Date: Thu, 19 Nov 2009 22:48:32 +0000
Subject: doc/GetHINSTANCE.3   Fix mentioned header file win/tcl.m4   Should
 have been checked in together with 	                the 2009-08-09 check
 in of "win/configure"

---
 ChangeLog          |  3 +++
 doc/GetHINSTANCE.3 |  4 ++--
 win/tcl.m4         | 20 ++++++++------------
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 40f2fe9..5e15605 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,9 @@
 
 2009-11-19  Jan Nijtmans  <nijtmans@users.sf.net>
 
+	* doc/GetHINSTANCE.3   Fix mentioned header file
+	* win/tcl.m4           Should have been checked in together with
+	                       the 2009-08-09 check in of "win/configure"
 	* unix/tcl.m4:         [Patch #2883533] tcl.m4 support for Haiku OS
 	* unix/configure       (regenerated)
 	* unix/Makefile.in     Fix library order in X11_LIB_SWITCHES
diff --git a/doc/GetHINSTANCE.3 b/doc/GetHINSTANCE.3
index 2e89475..10fd8a3 100644
--- a/doc/GetHINSTANCE.3
+++ b/doc/GetHINSTANCE.3
@@ -2,7 +2,7 @@
 '\" Copyright (c) 1998-2000 by Scriptics Corporation.
 '\" All rights reserved.
 '\" 
-'\" RCS: @(#) $Id: GetHINSTANCE.3,v 1.3 2008/06/30 22:57:01 dkf Exp $
+'\" RCS: @(#) $Id: GetHINSTANCE.3,v 1.4 2009/11/19 22:48:32 nijtmans Exp $
 '\" 
 .so man.macros
 .TH Tk_GetHISTANCE 3 "" Tk "Tk Library Procedures"
@@ -11,7 +11,7 @@
 Tk_GetHINSTANCE \- retrieve the global application instance handle
 .SH SYNOPSIS
 .nf
-\fB#include <tk.h>\fR
+\fB#include <tkPlatDecls.h>\fR
 .sp
 HINSTANCE
 \fBTk_GetHINSTANCE\fR()
diff --git a/win/tcl.m4 b/win/tcl.m4
index 4b55dc4..f0232de 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -490,7 +490,6 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
 	    # static
             AC_MSG_RESULT([using static flags])
 	    runtime=
-	    MAKE_DLL="echo "
 	    LIBSUFFIX="s\${DBGX}.a"
 	    LIBFLAGSUFFIX="s\${DBGX}"
 	    LIBRARIES="\${STATIC_LIBRARIES}"
@@ -506,20 +505,20 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
 	    fi
 
 	    runtime=
-	    # Link with gcc since ld does not link to default libs like
-	    # -luser32 and -lmsvcrt by default. Make sure CFLAGS is
-	    # included so -mno-cygwin passed the correct libs to the linker.
-	    SHLIB_LD='${CC} -shared ${CFLAGS}'
-	    SHLIB_LD_LIBS='${LIBS}'
 	    # Add SHLIB_LD_LIBS to the Make rule, not here.
-	    MAKE_DLL="\${SHLIB_LD} \$(LDFLAGS) -o \[$]@ ${extra_ldflags} \
-	        -Wl,--out-implib,\$(patsubst %.dll,lib%.a,\[$]@)"
 
 	    LIBSUFFIX="\${DBGX}.a"
 	    LIBFLAGSUFFIX="\${DBGX}"
 	    EXESUFFIX="\${DBGX}.exe"
 	    LIBRARIES="\${SHARED_LIBRARIES}"
 	fi
+	# Link with gcc since ld does not link to default libs like
+	# -luser32 and -lmsvcrt by default. Make sure CFLAGS is
+	# included so -mno-cygwin passed the correct libs to the linker.
+	SHLIB_LD='${CC} -shared ${CFLAGS}'
+	SHLIB_LD_LIBS='${LIBS}'
+	MAKE_DLL="\${SHLIB_LD} \$(LDFLAGS) -o \[$]@ ${extra_ldflags} \
+	    -Wl,--out-implib,\$(patsubst %.dll,lib%.a,\[$]@)"
 	# DLLSUFFIX is separate because it is the building block for
 	# users of tclConfig.sh that may build shared or static.
 	DLLSUFFIX="\${DBGX}.dll"
@@ -561,24 +560,21 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
 	    # static
             AC_MSG_RESULT([using static flags])
 	    runtime=-MT
-	    MAKE_DLL="echo "
 	    LIBSUFFIX="s\${DBGX}.lib"
 	    LIBFLAGSUFFIX="s\${DBGX}"
 	    LIBRARIES="\${STATIC_LIBRARIES}"
 	    EXESUFFIX="s\${DBGX}.exe"
-	    SHLIB_LD_LIBS=""
 	else
 	    # dynamic
             AC_MSG_RESULT([using shared flags])
 	    runtime=-MD
 	    # Add SHLIB_LD_LIBS to the Make rule, not here.
-	    MAKE_DLL="\${SHLIB_LD} \$(LDFLAGS) -out:\[$]@"
 	    LIBSUFFIX="\${DBGX}.lib"
 	    LIBFLAGSUFFIX="\${DBGX}"
 	    EXESUFFIX="\${DBGX}.exe"
 	    LIBRARIES="\${SHARED_LIBRARIES}"
-	    SHLIB_LD_LIBS='${LIBS}'
 	fi
+	MAKE_DLL="\${SHLIB_LD} \$(LDFLAGS) -out:\[$]@"
 	# DLLSUFFIX is separate because it is the building block for
 	# users of tclConfig.sh that may build shared or static.
 	DLLSUFFIX="\${DBGX}.dll"
-- 
cgit v0.12