diff options
| author | das <das> | 2005-05-26 11:20:08 (GMT) |
|---|---|---|
| committer | das <das> | 2005-05-26 11:20:08 (GMT) |
| commit | 977f577b341fb9cd0aab1d1e446b848f0b7af5e9 (patch) | |
| tree | 023036afa4136f7b0c8d74629597e43ebb8ffc8d /unix/configure.in | |
| parent | aa1be7ab30d1c2ca8e670adf84553da846c1fc07 (diff) | |
| download | tk-977f577b341fb9cd0aab1d1e446b848f0b7af5e9.zip tk-977f577b341fb9cd0aab1d1e446b848f0b7af5e9.tar.gz tk-977f577b341fb9cd0aab1d1e446b848f0b7af5e9.tar.bz2 | |
* macosx/tkMacOSXInit.c (TkpInit): fixed resource file extraction
from __tk_rsrc section to work with non-prebound .dylib and .bundle.
* macosx/Makefile: corrected EMBEDDED_BUILD check, use separate tcl
and tk version vars to properly support tk/x11 framework version
overriding, rewrite tkConfig.sh when overriding tk version, corrected
Wish.app symlink in tk build dir.
* unix/configure.in: corrected framework finalization to softlink
stub library to Versions/8.x subdir instead of Versions/Current.
* unix/configure: autoconf-2.13
Diffstat (limited to 'unix/configure.in')
| -rw-r--r-- | unix/configure.in | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/unix/configure.in b/unix/configure.in index 9905d35..b39df64 100644 --- a/unix/configure.in +++ b/unix/configure.in @@ -3,7 +3,7 @@ dnl This file is an input file used by the GNU "autoconf" program to dnl generate the file "configure", which is run during Tk installation dnl to configure the system for the local environment. # -# RCS: @(#) $Id: configure.in,v 1.83.2.16 2005/05/25 18:49:49 hobbs Exp $ +# RCS: @(#) $Id: configure.in,v 1.83.2.17 2005/05/26 11:20:09 das Exp $ AC_INIT(../generic/tk.h) AC_PREREQ(2.13) @@ -249,7 +249,6 @@ if test $tk_aqua = yes; then AC_DEFINE(MAC_OSX_TK) LIBS="$LIBS -framework Carbon" CFLAGS="$CFLAGS -fpascal-strings" - AC_CHECK_FUNCS(_dyld_get_image_header_containing_address) TK_WINDOWINGSYSTEM=AQUA else #-------------------------------------------------------------------- @@ -415,8 +414,8 @@ if test "$FRAMEWORK_BUILD" = "1" ; then tk_config_files="${tk_config_files} [Tk-Info.plist:../macosx/Tk-Info.plist.in]" # Construct a fake local framework structure to make linking with # '-framework Tk' and running of tktest work - AC_OUTPUT_COMMANDS([test "$FRAMEWORK_BUILD" = "1" && - n=Tk && f=$n.framework && v=Versions/$VERSION && + AC_OUTPUT_COMMANDS([test "$FRAMEWORK_BUILD" = "1" && n=Tk && + f=$n.framework && v=Versions/$VERSION && echo "creating $f" && rm -rf $f && mkdir -p $f/$v/Resources && ln -s $v/$n $v/Resources $f && ln -s ../../../$n $f/$v && ln -s ../../../../$n-Info.plist $f/$v/Resources/Info.plist && @@ -452,7 +451,7 @@ if test "$FRAMEWORK_BUILD" = "1" ; then EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing Wish.icns to $(BIN_INSTALL_DIR)/../Resources" && mkdir -p "$(BIN_INSTALL_DIR)/../Resources" && $(INSTALL_DATA) "'\$\(MAC\_OSX_DIR\)'/Wish.icns" "$(BIN_INSTALL_DIR)/../Resources"' EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing ${WISH_RSRC_FILE} to $(BIN_INSTALL_DIR)/../Resources" && $(INSTALL_DATA) "${WISH_RSRC_FILE}" "$(BIN_INSTALL_DIR)/../Resources"' fi - EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Finalizing Tk.framework" && rm -f "$(LIB_INSTALL_DIR)/../Current" && ln -s "$(VERSION)" "$(LIB_INSTALL_DIR)/../Current" && for f in "$(LIB_FILE)" "$(STUB_LIB_FILE)" tkConfig.sh Resources Headers PrivateHeaders; do rm -f "$(LIB_INSTALL_DIR)/../../$$f" && ln -s "Versions/Current/$$f" "$(LIB_INSTALL_DIR)/../.."; done' + EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Finalizing Tk.framework" && rm -f "$(LIB_INSTALL_DIR)/../Current" && ln -s "$(VERSION)" "$(LIB_INSTALL_DIR)/../Current" && for f in "$(LIB_FILE)" tkConfig.sh Resources Headers PrivateHeaders; do rm -f "$(LIB_INSTALL_DIR)/../../$$f" && ln -s "Versions/Current/$$f" "$(LIB_INSTALL_DIR)/../.."; done && f="$(STUB_LIB_FILE)" && rm -f "$(LIB_INSTALL_DIR)/../../$$f" && ln -s "Versions/$(VERSION)/$$f" "$(LIB_INSTALL_DIR)/../.."' TK_YEAR="`date +%Y`" # Don't use AC_DEFINE for the following as the framework version define # needs to go into the Makefile even when using autoheader, so that we |