From 1318232a2f5374634ca72cc501c9b189a51386b4 Mon Sep 17 00:00:00 2001
From: das <das>
Date: Sun, 29 May 2005 07:53:08 +0000
Subject: 	* unix/configure.in: added description of HAVE_XSS for
 autoheader. 	* unix/configure: autoconf-2.59 	* unix/tkConfig.h.in:
 autoheader-2.59

	* macosx/Wish.pbproj/project.pbxproj:
	* macosx/Wish.xcode/project.pbxproj: added missing FRAMEWORK defines
	introduced with configure/make based build.
---
 ChangeLog                          | 8 ++++++++
 macosx/Wish.pbproj/project.pbxproj | 2 +-
 macosx/Wish.xcode/project.pbxproj  | 2 +-
 unix/configure                     | 3 ++-
 unix/configure.in                  | 4 ++--
 unix/tkConfig.h.in                 | 5 ++---
 6 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0da2478..6e49b48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2005-05-29  Daniel Steffen  <das@users.sourceforge.net>
 
+	* unix/configure.in: added description of HAVE_XSS for autoheader.
+	* unix/configure: autoconf-2.59
+	* unix/tkConfig.h.in: autoheader-2.59
+
+	* macosx/Wish.pbproj/project.pbxproj:
+	* macosx/Wish.xcode/project.pbxproj: added missing FRAMEWORK defines
+	introduced with configure/make based build.
+
 	* macosx/tkMacOSXInit.c:
 	* macosx/tkMacOSXNotify.c: fixed warnings.
 
diff --git a/macosx/Wish.pbproj/project.pbxproj b/macosx/Wish.pbproj/project.pbxproj
index fb758e1..c389ba3 100644
--- a/macosx/Wish.pbproj/project.pbxproj
+++ b/macosx/Wish.pbproj/project.pbxproj
@@ -1938,7 +1938,7 @@
 				INSTALL_PATH = "${DYLIB_INSTALL_PATH}";
 				LIBRARY_SEARCH_PATHS = "\"$(TCL_FRAMEWORK_DIR)/Tcl.framework\"";
 				OPTIMIZATION_CFLAGS = "-O0";
-				OTHER_CFLAGS = "-DMAC_OSX_TK -DUSE_TCL_STUBS -DTCL_WIDE_INT_TYPE=\"long long\"";
+				OTHER_CFLAGS = "-DMAC_OSX_TK -DUSE_TCL_STUBS -DTCL_WIDE_INT_TYPE=\"long long\" -DTK_FRAMEWORK -DTK_FRAMEWORK_VERSION=\\\\\\\"$(FRAMEWORK_VERSION)\\\\\\\"";
 				OTHER_LDFLAGS = "-ltclstub${FRAMEWORK_VERSION} -seg1addr 0xb000000 -Wl,-search_paths_first -Wl,-unexported_symbols_list \"${TEMP_DIR}/tclstub.exp\"";
 				OTHER_LIBTOOL_FLAGS = "";
 				OTHER_REZFLAGS = "-i \"$(TCL_FRAMEWORK_DIR)/Tcl.framework/Headers\" -i \"../generic\"";
diff --git a/macosx/Wish.xcode/project.pbxproj b/macosx/Wish.xcode/project.pbxproj
index fae189b..ce5d9ab 100644
--- a/macosx/Wish.xcode/project.pbxproj
+++ b/macosx/Wish.xcode/project.pbxproj
@@ -2475,7 +2475,7 @@
 				FRAMEWORK_SEARCH_PATHS = "$(TCL_FRAMEWORK_DIR)";
 				FRAMEWORK_VERSION = 8.5;
 				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = "MAC_OSX_TK USE_TCL_STUBS HAVE_TCL_CONFIG_H";
+				GCC_PREPROCESSOR_DEFINITIONS = "MAC_OSX_TK USE_TCL_STUBS HAVE_TCL_CONFIG_H TK_FRAMEWORK TK_FRAMEWORK_VERSION=\\\"$(FRAMEWORK_VERSION)\\\"";
 				HEADER_SEARCH_PATHS = "$(TCL_FRAMEWORK_DIR)/Tcl.framework/Headers $(TCL_FRAMEWORK_DIR)/Tcl.framework/PrivateHeaders . ../bitmaps ../generic ../xlib";
 				INFOPLIST_FILE = "Tk-Info.plist";
 				INSTALL_PATH = "${DYLIB_INSTALL_PATH}";
diff --git a/unix/configure b/unix/configure
index af043c8..c97999a 100755
--- a/unix/configure
+++ b/unix/configure
@@ -9333,7 +9333,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
         echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
         XLIBSW="$XLIBSW -lXss -lXext"
-        cat >>confdefs.h <<\_ACEOF
+
+cat >>confdefs.h <<\_ACEOF
 #define HAVE_XSS 1
 _ACEOF
 
diff --git a/unix/configure.in b/unix/configure.in
index b94c4ce..1e18a59 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -3,7 +3,7 @@ dnl	This file is an input file used by the GNU "autoconf" program to
 dnl	generate the file "configure", which is run during Tk installation
 dnl	to configure the system for the local environment.
 #
-# RCS: @(#) $Id: configure.in,v 1.106 2005/05/29 06:47:05 das Exp $
+# RCS: @(#) $Id: configure.in,v 1.107 2005/05/29 07:53:09 das Exp $
 
 AC_INIT([tk],[8.5])
 AC_PREREQ(2.57)
@@ -344,7 +344,7 @@ if test $tk_aqua = no; then
     ], [
         AC_MSG_RESULT(yes)
         XLIBSW="$XLIBSW -lXss -lXext"
-        AC_DEFINE([HAVE_XSS])
+        AC_DEFINE(HAVE_XSS, 1, [Is XScreenSaver available?])
     ], AC_MSG_RESULT(no))
     CFLAGS=$tk_oldCFlags
     LIBS=$tk_oldLibs
diff --git a/unix/tkConfig.h.in b/unix/tkConfig.h.in
index 7eaf365..b272c02 100644
--- a/unix/tkConfig.h.in
+++ b/unix/tkConfig.h.in
@@ -84,9 +84,8 @@
 /* Have we turned on XFT (antialiased fonts)? */
 #undef HAVE_XFT
 
-/* Define to 1 if you have the `_dyld_get_image_header_containing_address'
-   function. */
-#undef HAVE__DYLD_GET_IMAGE_HEADER_CONTAINING_ADDRESS
+/* Is XScreenSaver available? */
+#undef HAVE_XSS
 
 /* Is this a Mac I see before me? */
 #undef MAC_OSX_TCL
-- 
cgit v0.12