diff options
| author | das <das> | 2007-08-07 05:07:48 (GMT) |
|---|---|---|
| committer | das <das> | 2007-08-07 05:07:48 (GMT) |
| commit | dfacfc220f6b3a761c82e797e07939c48d64273c (patch) | |
| tree | bfeb5cc4af78a2ae295e73e1fc915ae7be859da4 /unix/configure.in | |
| parent | 06cbfb8e6af582eb4a59fee7868029b9d608bbe3 (diff) | |
| download | tk-dfacfc220f6b3a761c82e797e07939c48d64273c.zip tk-dfacfc220f6b3a761c82e797e07939c48d64273c.tar.gz tk-dfacfc220f6b3a761c82e797e07939c48d64273c.tar.bz2 | |
* unix/Makefile.in: add support for compile flags specific to
object files linked directly into executables.
* unix/configure.in (Darwin): only use -seg1addr flag when prebinding;
use -mdynamic-no-pic flag for object files linked directly into exes.
* unix/configure: autoconf-2.13
Diffstat (limited to 'unix/configure.in')
| -rw-r--r-- | unix/configure.in | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/unix/configure.in b/unix/configure.in index 56b5d82..8564ef5 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.40 2007/06/06 09:56:22 das Exp $ +# RCS: @(#) $Id: configure.in,v 1.83.2.41 2007/08/07 05:07:49 das Exp $ AC_INIT(../generic/tk.h) AC_PREREQ(2.13) @@ -417,10 +417,12 @@ WISH_RSRC_FILE='wish$(VERSION).rsrc' if test "`uname -s`" = "Darwin" ; then SC_ENABLE_FRAMEWORK TK_SHLIB_LD_EXTRAS="-compatibility_version ${TK_VERSION} -current_version ${TK_VERSION}`echo ${TK_PATCH_LEVEL} | awk ['{match($0, "\\\.[0-9]+"); print substr($0,RSTART,RLENGTH)}']`" - TK_SHLIB_LD_EXTRAS="${TK_SHLIB_LD_EXTRAS}"' -install_name ${DYLIB_INSTALL_DIR}/${TK_LIB_FILE} -seg1addr 0xb000000 -unexported_symbols_list $$(f=$(TCL_STUB_LIB_FILE).E && nm -gjp $(TCL_BIN_DIR)/$(TCL_STUB_LIB_FILE) | grep ^_[[^_]] > $$f && echo $$f)' + TK_SHLIB_LD_EXTRAS="${TK_SHLIB_LD_EXTRAS}"' -install_name ${DYLIB_INSTALL_DIR}/${TK_LIB_FILE} -unexported_symbols_list $$(f=$(TCL_STUB_LIB_FILE).E && nm -gjp $(TCL_BIN_DIR)/$(TCL_STUB_LIB_FILE) | grep ^_[[^_]] > $$f && echo $$f)' + echo "$LDFLAGS " | grep -q -- '-prebind ' && TK_SHLIB_LD_EXTRAS="${TK_SHLIB_LD_EXTRAS}"' -seg1addr 0xb000000' TK_SHLIB_LD_EXTRAS="${TK_SHLIB_LD_EXTRAS}"' -sectcreate __TEXT __info_plist Tk-Info.plist' EXTRA_WISH_LIBS='-sectcreate __TEXT __info_plist Wish-Info.plist' tk_config_files="${tk_config_files} [Tk-Info.plist:../macosx/Tk-Info.plist.in Wish-Info.plist:../macosx/Wish-Info.plist.in]" + EXTRA_APP_CC_SWITCHES='-mdynamic-no-pic' fi if test "$FRAMEWORK_BUILD" = "1" ; then @@ -577,6 +579,7 @@ AC_SUBST(PRIVATE_INCLUDE_DIR) AC_SUBST(HTML_DIR) AC_SUBST(EXTRA_CC_SWITCHES) +AC_SUBST(EXTRA_APP_CC_SWITCHES) AC_SUBST(EXTRA_INSTALL) AC_SUBST(EXTRA_INSTALL_BINARIES) AC_SUBST(EXTRA_BUILD_HTML) |