diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-06-26 20:14:08 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-06-26 20:14:08 (GMT) |
| commit | 4690135e8bcf136cabe21150ca07278d98ef9f9c (patch) | |
| tree | 77e1c3aafc40e24bc4f194db4b0b0e195bbafcc0 /unix/configure.in | |
| parent | 25a5558049fcda3ff36affec97588be78f9ae13e (diff) | |
| parent | 7870ba909af7bdc7dcf22d3d2bac9a5c72146f6c (diff) | |
| download | tk-4690135e8bcf136cabe21150ca07278d98ef9f9c.zip tk-4690135e8bcf136cabe21150ca07278d98ef9f9c.tar.gz tk-4690135e8bcf136cabe21150ca07278d98ef9f9c.tar.bz2 | |
autoconf-2.59
Diffstat (limited to 'unix/configure.in')
| -rw-r--r-- | unix/configure.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/unix/configure.in b/unix/configure.in index 34b3f51..64a32fa 100644 --- a/unix/configure.in +++ b/unix/configure.in @@ -673,6 +673,7 @@ if test "$FRAMEWORK_BUILD" = "1" ; then TK_LIB_FILE="Tk" TK_LIB_FLAG="-framework Tk" TK_BUILD_LIB_SPEC="-F`pwd | sed -e 's/ /\\\\ /g'` -framework Tk" + WISH_BUILD_LIB_SPEC="-F`pwd | sed -e 's/ /\\\\ /g'` -framework Tk \${WISH_LIBS}" TK_LIB_SPEC="-F${libdir} -framework Tk" libdir="${libdir}/Tk.framework/Versions/\${VERSION}" TK_LIBRARY="${libdir}/Resources/Scripts" @@ -709,7 +710,6 @@ 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' @@ -741,6 +741,7 @@ if test $tk_aqua = carbon; then if test "$SHARED_BUILD" = 0; then EXTRA_INSTALL_BINARIES='@echo "Installing $(TK_RSRC_FILE) to $(LIB_INSTALL_DIR)" && $(INSTALL_DATA) $(TK_RSRC_FILE) "$(LIB_INSTALL_DIR)"' TK_BUILD_LIB_SPEC="$TK_BUILD_LIB_SPEC -sectcreate __TEXT __tk_rsrc `pwd | sed -e 's/ /\\\\ /g'`/\${TK_RSRC_FILE}" + WISH_BUILD_LIB_SPEC="$WISH_BUILD_LIB_SPEC -sectcreate __TEXT __tk_rsrc `pwd | sed -e 's/ /\\\\ /g'`/\${TK_RSRC_FILE}" TK_LIB_SPEC="$TK_LIB_SPEC -sectcreate __TEXT __tk_rsrc ${libdir}/\${TK_RSRC_FILE}" else TK_SHLIB_LD_EXTRAS="$TK_SHLIB_LD_EXTRAS -sectcreate __TEXT __tk_rsrc \${TK_RSRC_FILE}" |