diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-06-26 16:52:46 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-06-26 16:52:46 (GMT) |
| commit | 25a5558049fcda3ff36affec97588be78f9ae13e (patch) | |
| tree | 91c0fde7e2178c40ed9c7ff0e7a952a3a20b7644 /unix/configure.in | |
| parent | 9a1a943fe5ebf90b2c0845159ea5226f1275f7d8 (diff) | |
| download | tk-25a5558049fcda3ff36affec97588be78f9ae13e.zip tk-25a5558049fcda3ff36affec97588be78f9ae13e.tar.gz tk-25a5558049fcda3ff36affec97588be78f9ae13e.tar.bz2 | |
link cygwin wish8.6 with tk86.dll (configuration part)
Diffstat (limited to 'unix/configure.in')
| -rw-r--r-- | unix/configure.in | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/unix/configure.in b/unix/configure.in index 3458dd0..34b3f51 100644 --- a/unix/configure.in +++ b/unix/configure.in @@ -709,6 +709,7 @@ if test "$FRAMEWORK_BUILD" = "1" ; then # can pick up a potential make override of VERSION. Also, don't put this # into CFLAGS as it should not go into tkConfig.sh EXTRA_CC_SWITCHES="$EXTRA_CC_SWITCHES"' -DTK_FRAMEWORK_VERSION=\"$(VERSION)\"' + WISH_BUILD_LIB_SPEC="${TK_BUILD_LIB_SPEC} ${WISH_LIBS}" else if test $tk_aqua = yes; then EXTRA_INSTALL_BINARIES='@echo "Installing Images to $(LIB_INSTALL_DIR)" && mkdir -p "$(LIB_INSTALL_DIR)" && for i in Tk.tiff Tk.icns; do $(INSTALL_DATA) "$(MAC_OSX_DIR)/$$i" "$(LIB_INSTALL_DIR)"; done' @@ -721,6 +722,11 @@ 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}" + else + 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 @@ -793,6 +799,7 @@ AC_SUBST(TK_SHARED_BUILD) AC_SUBST(LD_LIBRARY_PATH_VAR) AC_SUBST(TK_BUILD_LIB_SPEC) +AC_SUBST(WISH_BUILD_LIB_SPEC) AC_SUBST(TCL_STUB_FLAGS) AC_SUBST(XINCLUDES) |