diff options
| author | dgp <dgp@users.sourceforge.net> | 2007-07-01 17:31:29 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2007-07-01 17:31:29 (GMT) |
| commit | f033a80514181e8c3c72adf49910b036334ece31 (patch) | |
| tree | 56fb7f0aa8f86fc78dd03c1a0cbbe8d3fe3b7244 /unix | |
| parent | a7f7c5e1a86b94cff3e98fa4ce842fbfdbf8cd6e (diff) | |
| download | tk-f033a80514181e8c3c72adf49910b036334ece31.zip tk-f033a80514181e8c3c72adf49910b036334ece31.tar.gz tk-f033a80514181e8c3c72adf49910b036334ece31.tar.bz2 | |
merge updates from HEAD
Diffstat (limited to 'unix')
| -rwxr-xr-x | unix/configure | 2 | ||||
| -rw-r--r-- | unix/configure.in | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/unix/configure b/unix/configure index 94682d3..437f3b4 100755 --- a/unix/configure +++ b/unix/configure @@ -9617,7 +9617,7 @@ if test $ac_cv_lib_Xss_XScreenSaverQueryInfo = yes; then if test "$tcl_cv_ld_weak_l" = yes; then # On Darwin, weak link libXss if possible, # as it is only available on Tiger or later. - XLIBSW="$XLIBSW -weak-lXss -lXext" + XLIBSW="$XLIBSW -Wl,-weak-lXss -lXext" else XLIBSW="$XLIBSW -lXss -lXext" fi diff --git a/unix/configure.in b/unix/configure.in index 3a4b26b..dbe8911 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.134.2.2 2007/06/12 16:22:44 dgp Exp $ +# RCS: @(#) $Id: configure.in,v 1.134.2.3 2007/07/01 17:31:40 dgp Exp $ AC_INIT([tk],[8.5]) AC_PREREQ(2.59) @@ -400,7 +400,7 @@ if test $tk_aqua = no; then if test "$tcl_cv_ld_weak_l" = yes; then # On Darwin, weak link libXss if possible, # as it is only available on Tiger or later. - XLIBSW="$XLIBSW -weak-lXss -lXext" + XLIBSW="$XLIBSW -Wl,-weak-lXss -lXext" else XLIBSW="$XLIBSW -lXss -lXext" fi |