summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-06-28 13:27:43 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-06-28 13:27:43 (GMT)
commitc728c451a4b3e2e2166d49547c49f5e4132b8652 (patch)
treee80f950b22e0684bc52e4c2917eec9dded867cc1 /unix
parent59051e407213c7a42b2427b17338c30336b82845 (diff)
parentd244749081139cd68d5004e67c30a2ec6f99682e (diff)
downloadtk-c728c451a4b3e2e2166d49547c49f5e4132b8652.zip
tk-c728c451a4b3e2e2166d49547c49f5e4132b8652.tar.gz
tk-c728c451a4b3e2e2166d49547c49f5e4132b8652.tar.bz2
Link cygwin wish.exe with win32 tk.dll, only in combination with --enable-shared
Diffstat (limited to 'unix')
-rw-r--r--unix/Makefile.in12
-rwxr-xr-xunix/configure8
-rw-r--r--unix/configure.in6
-rw-r--r--unix/tcl.m42
4 files changed, 18 insertions, 10 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 9ae26e1..8d5d8c7 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -612,8 +612,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
@@ -741,6 +745,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) "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)${EXE_SUFFIX}"
@$(INSTALL_PROGRAM) ${WISH_EXE} "$(BIN_INSTALL_DIR)/wish$(VERSION)${EXE_SUFFIX}"
@echo "Installing tkConfig.sh to $(CONFIG_INSTALL_DIR)/"
diff --git a/unix/configure b/unix/configure
index ca35f30..ac62a5a 100755
--- a/unix/configure
+++ b/unix/configure
@@ -4969,7 +4969,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/tcldde14.dll" -a ! -f "../win/tk86.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; }; }
@@ -11234,10 +11234,10 @@ 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 -ltk86 \${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}"
+ WISH_BUILD_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TK_LIB_FLAG} \${WISH_LIBS}"
fi
TK_LIB_SPEC="-L${libdir} ${TK_LIB_FLAG}"
fi
diff --git a/unix/configure.in b/unix/configure.in
index 0b519a6..5759e04 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -722,10 +722,10 @@ 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 -ltk86 \${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}"
+ WISH_BUILD_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TK_LIB_FLAG} \${WISH_LIBS}"
fi
TK_LIB_SPEC="-L${libdir} ${TK_LIB_FLAG}"
fi
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 44475c2..a142baf 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1246,7 +1246,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/tcldde14.dll" -a ! -f "../win/tk86.dll"; then
+ if test "x${SHARED_BUILD}" = "x1" -a ! -f "../win/tcldde14.dll" -a ! -f "../win/tk86.dll"; then
AC_MSG_ERROR([Please configure and make the ../win directory first.])
fi
;;