summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhobbs <hobbs>2003-04-18 21:55:02 (GMT)
committerhobbs <hobbs>2003-04-18 21:55:02 (GMT)
commitac61e94f1ce8a66b3390232fd5ee69fa6e56ed38 (patch)
treea7d6c41505dd55efb3cf0042d76219ff08b96cf7
parentae2c4cb462b2445d5cb0153e187fe77c2c428abc (diff)
downloadtk-ac61e94f1ce8a66b3390232fd5ee69fa6e56ed38.zip
tk-ac61e94f1ce8a66b3390232fd5ee69fa6e56ed38.tar.gz
tk-ac61e94f1ce8a66b3390232fd5ee69fa6e56ed38.tar.bz2
* win/configure: regen
* win/configure.in (SHELL): force it to /bin/sh as autoconf 2.5x uses /bin/bash, which can fail to find exes in the path (ie: lib).
-rw-r--r--ChangeLog12
-rwxr-xr-xwin/configure5
-rw-r--r--win/configure.in7
3 files changed, 23 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d497a5f..cdf3ab1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2003-04-18 Jeff Hobbs <jeffh@ActiveState.com>
+
+ * win/configure: regen
+ * win/configure.in (SHELL): force it to /bin/sh as autoconf 2.5x
+ uses /bin/bash, which can fail to find exes in the path (ie: lib).
+
+ * generic/tkCanvBmap.c: s/CreateBitmap/TkcCreateBitmap as Windows
+ has a CreateBitmap function already.
+
+ * generic/tkCursor.c: s/GetCursor/TkcGetCursor as Windows has a
+ GetCursor func already, which causes compiler warnings.
+
2003-04-14 Mo DeJong <mdejong@users.sourceforge.net>
* win/tkWinMenu.c (TkpInitializeMenuBindings):
diff --git a/win/configure b/win/configure
index 768fde5..56e4200 100755
--- a/win/configure
+++ b/win/configure
@@ -1266,6 +1266,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+# The following define is needed when building with Cygwin since newer
+# versions of autoconf incorrectly set SHELL to /bin/bash instead of
+# /bin/sh. The bash shell seems to suffer from some strange failures.
+SHELL=/bin/sh
+
TK_VERSION=8.5
TK_MAJOR_VERSION=8
TK_MINOR_VERSION=5
diff --git a/win/configure.in b/win/configure.in
index 85fc7c9..f6e4c8d 100644
--- a/win/configure.in
+++ b/win/configure.in
@@ -3,11 +3,16 @@
# generate the file "configure", which is run during Tk installation
# to configure the system for the local environment.
#
-# RCS: @(#) $Id: configure.in,v 1.54 2003/04/03 02:31:31 mdejong Exp $
+# RCS: @(#) $Id: configure.in,v 1.55 2003/04/18 21:55:03 hobbs Exp $
AC_INIT(../generic/tk.h)
AC_PREREQ(2.57)
+# The following define is needed when building with Cygwin since newer
+# versions of autoconf incorrectly set SHELL to /bin/bash instead of
+# /bin/sh. The bash shell seems to suffer from some strange failures.
+SHELL=/bin/sh
+
TK_VERSION=8.5
TK_MAJOR_VERSION=8
TK_MINOR_VERSION=5