summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-06-28 11:41:29 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-06-28 11:41:29 (GMT)
commitd244749081139cd68d5004e67c30a2ec6f99682e (patch)
treec1a8afe6d156883bccbdaabb82b6a4a8ce13459d
parent022dcdf1391c87fa59c87ed6efb740f84b4ae95d (diff)
parent5bf292f9ab0ddda2f59f652e94185832af078740 (diff)
downloadtk-d244749081139cd68d5004e67c30a2ec6f99682e.zip
tk-d244749081139cd68d5004e67c30a2ec6f99682e.tar.gz
tk-d244749081139cd68d5004e67c30a2ec6f99682e.tar.bz2
Link cygwin wish.exe with win32 tk.dll, only in combination with --enable-shared
-rw-r--r--ChangeLog9
-rw-r--r--unix/Makefile.in12
-rwxr-xr-xunix/configure6
-rw-r--r--unix/configure.in4
-rw-r--r--unix/tcl.m42
-rw-r--r--unix/tkUnixPort.h4
6 files changed, 28 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index da7caba..4d8e888 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,15 @@
+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.59
+
2012-06-22 Jan Nijtmans <nijtmans@users.sf.net>
* win/Makefile.in: [Bug 1844430]: cygwin make fails in 8.4.14-8.5b3
* unix/tcl.m4: Sync with Tcl version.
- * unix/configure: autoconf-2.13
+ * unix/configure: autoconf-2.59
2012-06-15 Donal K. Fellows <dkf@users.sf.net>
diff --git a/unix/Makefile.in b/unix/Makefile.in
index eb30d25..fbe7b97 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -607,8 +607,12 @@ objs: ${OBJS}
${WISH_EXE}: $(WISH_OBJS) $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) @APP_RSRC_FILE@
- ${CC} ${CFLAGS} ${LDFLAGS} $(WISH_OBJS) @TK_BUILD_LIB_SPEC@ \
- $(WISH_LIBS) $(CC_SEARCH_FLAGS) -o ${WISH_EXE}
+ @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@ \
+ $(CC_SEARCH_FLAGS) -o ${WISH_EXE}
# Resetting the LIB_RUNTIME_DIR below is required so that
# the generated tktest executable gets the build directory
@@ -734,6 +738,10 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) ${WISH_EXE}
@echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"
@@INSTALL_LIB@
@chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)"
+ @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
@echo "Installing ${WISH_EXE} as $(BIN_INSTALL_DIR)/wish$(VERSION)@EXEEXT@"
@$(INSTALL_PROGRAM) ${WISH_EXE} "$(BIN_INSTALL_DIR)/wish$(VERSION)@EXEEXT@"
@echo "Installing tkConfig.sh to $(CONFIG_INSTALL_DIR)/"
diff --git a/unix/configure b/unix/configure
index 9a3eec4..67e7cb3 100755
--- a/unix/configure
+++ b/unix/configure
@@ -5212,7 +5212,7 @@ echo "$as_me: error: ${CC} is not a cygwin compiler." >&2;}
echo "$as_me: error: CYGWIN compile is only supported with --enable-threads" >&2;}
{ (exit 1); exit 1; }; }
fi
- if test ! -f "../win/tcldde13.dll" -a ! -f "../win/tk85.dll"; then
+ if test "x${SHARED_BUILD}" = "x1" -a ! -f "../win/tcldde13.dll" -a ! -f "../win/tk85.dll"; then
{ { echo "$as_me:$LINENO: error: Please configure and make the ../win directory first." >&5
echo "$as_me: error: Please configure and make the ../win directory first." >&2;}
{ (exit 1); exit 1; }; }
@@ -11389,8 +11389,8 @@ else
TK_LIB_FLAG="-ltk`echo ${TK_VERSION} | tr -d .`"
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${TK_MAJOR_VERSION}${TK_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 c2421ca..a7bc887 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -687,8 +687,8 @@ else
TK_LIB_FLAG="-ltk`echo ${TK_VERSION} | tr -d .`"
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${TK_MAJOR_VERSION}${TK_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 4de157c..3974753 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1263,7 +1263,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
if test "x${TCL_THREADS}" = "x0"; then
AC_MSG_ERROR([CYGWIN compile is only supported with --enable-threads])
fi
- if test ! -f "../win/tcldde13.dll" -a ! -f "../win/tk85.dll"; then
+ if test "x${SHARED_BUILD}" = "x1" -a ! -f "../win/tcldde13.dll" -a ! -f "../win/tk85.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 8d8b050..38a8513 100644
--- a/unix/tkUnixPort.h
+++ b/unix/tkUnixPort.h
@@ -141,6 +141,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