merge updates from HEAD

6 files changed, 31 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index 35bfbef..a15ced6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2008-03-27  Daniel Steffen  <das@users.sourceforge.net>
+
+	* unix/tcl.m4 (SunOS-5.1x): fix 64bit support for Sun cc. [Bug 1921166]
+
+	* unix/configure: autoconf-2.59
+
+2008-03-27  Daniel Steffen  <das@users.sourceforge.net>
+
+	* generic/ttk/ttkStubLib.c:	ensure tcl stubs are used in libtkstub
+					even in a static build of Tk.
+	* generic/ttk/ttkDecls.h:	fix incorrect number of arguments in
+					Ttk_InitStubs macro definition.
+
 2008-03-26  Don Porter  <dgp@users.sourceforge.net>
 
 	* changes:	Updates for 8.5.2 release.
diff --git a/generic/tk.decls b/generic/tk.decls
index 1ef1e7d..810730a 100644
--- a/generic/tk.decls
+++ b/generic/tk.decls
@@ -11,7 +11,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 # 
-# RCS: @(#) $Id: tk.decls,v 1.32.2.2 2007/12/10 18:39:29 dgp Exp $
+# RCS: @(#) $Id: tk.decls,v 1.32.2.3 2008/03/27 20:33:45 dgp Exp $
 
 library tk
 
@@ -1159,7 +1159,7 @@ export {
 }
 export {
     CONST char *Tk_PkgInitStubsCheck(Tcl_Interp *interp, CONST char *version,
-	int exact);
+	    int exact)
 }
 
 # Global variables that need to be exported from the tcl shared library.
diff --git a/generic/ttk/ttkDecls.h b/generic/ttk/ttkDecls.h
index 9f84f3a..62f4c42 100644
--- a/generic/ttk/ttkDecls.h
+++ b/generic/ttk/ttkDecls.h
@@ -1,5 +1,5 @@
 /*
- * $Id: ttkDecls.h,v 1.3.2.1 2007/09/04 17:44:21 dgp Exp $
+ * $Id: ttkDecls.h,v 1.3.2.2 2008/03/27 20:33:46 dgp Exp $
  *
  * This file is (mostly) automatically generated from ttk.decls.
  */
@@ -15,7 +15,7 @@ extern const char *TtkInitializeStubs(
 	interp, TTK_VERSION, TTK_STUBS_EPOCH, TTK_STUBS_REVISION)
 #else
 
-#define Ttk_InitStubs(interp) Tcl_PkgRequire(interp,"Ttk",TTK_VERSION)
+#define Ttk_InitStubs(interp) Tcl_PkgRequire(interp, "Ttk", TTK_VERSION, 0)
 
 #endif
 
diff --git a/generic/ttk/ttkStubLib.c b/generic/ttk/ttkStubLib.c
index a693fcf..ee53898 100644
--- a/generic/ttk/ttkStubLib.c
+++ b/generic/ttk/ttkStubLib.c
@@ -1,15 +1,25 @@
 /*
- * $Id: ttkStubLib.c,v 1.2 2006/11/03 03:06:22 das Exp $
+ * $Id: ttkStubLib.c,v 1.2.2.1 2008/03/27 20:33:46 dgp Exp $
  * SOURCE: tk/generic/tkStubLib.c, version 1.9 2004/03/17
  */
 
+/*
+ * We need to ensure that we use the tcl stub macros so that this file
+ * contains no references to any of the tcl stub functions.
+ */
+
+#ifndef USE_TCL_STUBS
+#define USE_TCL_STUBS
+#endif
+#undef USE_TCL_STUB_PROCS
+
 #include "tk.h"
 
 #define USE_TTK_STUBS 1
 #include "ttkTheme.h"
 
 MODULE_SCOPE const TtkStubs *ttkStubsPtr;
-const TtkStubs *ttkStubsPtr;
+const TtkStubs *ttkStubsPtr = NULL;
 
 /*
  *----------------------------------------------------------------------
diff --git a/unix/configure b/unix/configure
index df4fbab..71b4a73 100755
--- a/unix/configure
+++ b/unix/configure
@@ -5643,14 +5643,6 @@ fi
   CFLAGS="$CFLAGS -fno-inline"
 fi
 
-
-	    # XIM peeking works under XFree86.
-
-cat >>confdefs.h <<\_ACEOF
-#define PEEK_XCLOSEIM 1
-_ACEOF
-
-
 	    ;;
 	GNU*)
 	    SHLIB_CFLAGS="-fPIC"
@@ -6685,7 +6677,7 @@ else
 
 		case $system in
 		    SunOS-5.[1-9][0-9]*)
-			SHLIB_LD='${CC} -G -z text';;
+			SHLIB_LD='${CC} -G -z text ${LDFLAGS}';;
 		    *)
 			SHLIB_LD='/usr/ccs/bin/ld -G -z text';;
 		esac
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 9476cae..6270d24 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1950,7 +1950,7 @@ dnl AC_CHECK_TOOL(AR, ar)
 	    ], [
 		case $system in
 		    SunOS-5.[[1-9]][[0-9]]*)
-			SHLIB_LD='${CC} -G -z text';;
+			SHLIB_LD='${CC} -G -z text ${LDFLAGS}';;
 		    *)
 			SHLIB_LD='/usr/ccs/bin/ld -G -z text';;
 		esac