summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-06-28 11:13:54 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-06-28 11:13:54 (GMT)
commit5bf292f9ab0ddda2f59f652e94185832af078740 (patch)
tree2c1ed6aeac43100a4b7ad6192471250ff83bc847
parente309f08cc258675d9627d27fbb8c16bf5a215534 (diff)
downloadtk-5bf292f9ab0ddda2f59f652e94185832af078740.zip
tk-5bf292f9ab0ddda2f59f652e94185832af078740.tar.gz
tk-5bf292f9ab0ddda2f59f652e94185832af078740.tar.bz2
Link cygwin wish.exe with win32 tk.dll, only in combination with --enable-shared
-rw-r--r--ChangeLog7
-rw-r--r--unix/Makefile.in5
-rwxr-xr-xunix/configure6
-rw-r--r--unix/configure.in4
-rwxr-xr-xunix/tcl.m42
-rw-r--r--unix/tkUnixPort.h4
6 files changed, 20 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 9a346d8..64e8bf1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-06-26 Jan Nijtmans <nijtmans@users.sf.net>
+
+ * unix/configure.in: Link cygwin wish.exe with win32 tk.dll, only
+ * unix/Makefile.in: in combination with --enable-shared.
+ * unix/tcl.m4:
+ * unix/configure: autoconf-2.13
+
2012-06-22 Jan Nijtmans <nijtmans@users.sf.net>
* win/Makefile.in: [Bug 1844430]: cygwin make fails in 8.4.14-8.5b3
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 2559750..8388f1f 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -551,7 +551,8 @@ objs: ${OBJS}
${WISH_EXE}: $(WISH_OBJS) $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) @APP_RSRC_FILE@
- @if test -f "${TOP_DIR}/win/tk${MAJOR_VERSION}${MINOR_VERSION}.dll"; then \
+ @if test "x$(TK_SHARED_BUILD)" = "x1" -a \
+ -f "${TOP_DIR}/win/tk${MAJOR_VERSION}${MINOR_VERSION}.dll"; then \
cp "${TOP_DIR}/win/tk${MAJOR_VERSION}${MINOR_VERSION}.dll" .; \
fi
${CC} ${CFLAGS} ${LDFLAGS} $(WISH_OBJS) @WISH_BUILD_LIB_SPEC@ \
@@ -677,7 +678,7 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) ${WISH
@echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"
@@INSTALL_LIB@
@chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)"
- @if test -f "${TOP_DIR}/win/tk${MAJOR_VERSION}${MINOR_VERSION}.dll"; then \
+ @if test -f "tk${MAJOR_VERSION}${MINOR_VERSION}.dll"; then \
$(INSTALL_LIBRARY) "${TOP_DIR}/win/tk${MAJOR_VERSION}${MINOR_VERSION}.dll" "$(DLL_INSTALL_DIR)";\
chmod 555 "$(DLL_INSTALL_DIR)/tk${MAJOR_VERSION}${MINOR_VERSION}.dll";\
fi
diff --git a/unix/configure b/unix/configure
index 8cac4c0..d7c3805 100755
--- a/unix/configure
+++ b/unix/configure
@@ -2385,7 +2385,7 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
if test "x${TCL_THREADS}" = "x0"; then
{ echo "configure: error: CYGWIN compile is only supported with --enable-threads" 1>&2; exit 1; }
fi
- if test ! -f "../win/tcldde12.dll" -a ! -f "../win/tk84.dll"; then
+ if test "x${SHARED_BUILD}" = "x1" -a ! -f "../win/tcldde12.dll" -a ! -f "../win/tk84.dll"; then
{ echo "configure: error: Please configure and make the ../win directory first." 1>&2; exit 1; }
fi
;;
@@ -6207,8 +6207,8 @@ else
eval TK_LIB_FLAG="-ltk`echo ${VERSION} | tr -d .`\${TK_DBGX}"
fi
TK_BUILD_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TK_LIB_FLAG}"
- if test "${ac_cv_cygwin+set}" = set; then
- WISH_BUILD_LIB_SPEC="-L\$(TOP_DIR)/win -ltk84 \${TCL_LIB_SPEC}"
+ if test "${ac_cv_cygwin}" = "yes" -a "$SHARED_BUILD" = "1"; then
+ WISH_BUILD_LIB_SPEC="-L\$(TOP_DIR)/win -ltk\${MAJOR_VERSION}\${MINOR_VERSION} \${TCL_LIB_SPEC}"
else
WISH_BUILD_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TK_LIB_FLAG} \${WISH_LIBS}"
fi
diff --git a/unix/configure.in b/unix/configure.in
index 1542638..a5fef0c 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -503,8 +503,8 @@ else
eval TK_LIB_FLAG="-ltk`echo ${VERSION} | tr -d .`\${TK_DBGX}"
fi
TK_BUILD_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TK_LIB_FLAG}"
- if test "${ac_cv_cygwin+set}" = set; then
- WISH_BUILD_LIB_SPEC="-L\$(TOP_DIR)/win -ltk84 \${TCL_LIB_SPEC}"
+ if test "${ac_cv_cygwin}" = "yes" -a "$SHARED_BUILD" = "1"; then
+ WISH_BUILD_LIB_SPEC="-L\$(TOP_DIR)/win -ltk\${MAJOR_VERSION}\${MINOR_VERSION} \${TCL_LIB_SPEC}"
else
WISH_BUILD_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TK_LIB_FLAG} \${WISH_LIBS}"
fi
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index ac9b3bf..2dc6576 100755
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1229,7 +1229,7 @@ dnl AC_CHECK_TOOL(AR, ar)
if test "x${TCL_THREADS}" = "x0"; then
AC_MSG_ERROR([CYGWIN compile is only supported with --enable-threads])
fi
- if test ! -f "../win/tcldde12.dll" -a ! -f "../win/tk84.dll"; then
+ if test "x${SHARED_BUILD}" = "x1" -a ! -f "../win/tcldde12.dll" -a ! -f "../win/tk84.dll"; then
AC_MSG_ERROR([Please configure and make the ../win directory first.])
fi
;;
diff --git a/unix/tkUnixPort.h b/unix/tkUnixPort.h
index c4053b9..27787ce 100644
--- a/unix/tkUnixPort.h
+++ b/unix/tkUnixPort.h
@@ -138,6 +138,10 @@
# define WPARAM void *
# define LPARAM void *
# define LRESULT void *
+
+ extern int TkPutImage(unsigned long *, int, Display *, Drawable,
+ GC, XImage *, int, int, int, int, unsigned int, unsigned int);
+
#else /* !__CYGWIN__ */
/*
* The TkPutImage macro strips off the color table information, which isn't