diff options
| author | dkf <dkf@noemail.net> | 2010-03-23 10:45:12 (GMT) |
|---|---|---|
| committer | dkf <dkf@noemail.net> | 2010-03-23 10:45:12 (GMT) |
| commit | f21284a784fa2c163f523be17868c04811bc9314 (patch) | |
| tree | 32f5e2fa78a58a4922a2757b6d70b79868f6a858 | |
| parent | 1ea412c45b1b6df875f89b117978dfdb765cc095 (diff) | |
| download | tk-f21284a784fa2c163f523be17868c04811bc9314.zip tk-f21284a784fa2c163f523be17868c04811bc9314.tar.gz tk-f21284a784fa2c163f523be17868c04811bc9314.tar.bz2 | |
* unix/configure.in, unix/Makefile.in: [Bug 2965133]: Get rid of the
spurious NONE and some pointless quotes that were causing problems
with building Tk on OSX. Overall bug might not yet be solved.
FossilOrigin-Name: 335a62271cc388d9fea07084ef8717e7f8cc8eb2
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | unix/Makefile.in | 4 | ||||
| -rw-r--r-- | unix/configure.in | 4 |
3 files changed, 11 insertions, 3 deletions
@@ -1,3 +1,9 @@ +2010-03-23 Donal K. Fellows <dkf@users.sf.net> + + * unix/configure.in, unix/Makefile.in: [Bug 2965133]: Get rid of the + spurious NONE and some pointless quotes that were causing problems + with building Tk on OSX. Overall bug might not yet be solved. + 2010-03-17 Donal K. Fellows <dkf@users.sf.net> * library/entry.tcl: [Bug 2971663]: Make the <Up> and <Down> keys diff --git a/unix/Makefile.in b/unix/Makefile.in index f7b55ed..1081c12 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -5,7 +5,7 @@ # "autoconf" program (constructs like "@foo@" will get replaced in the # actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.167 2010/02/22 23:38:53 nijtmans Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.168 2010/03/23 10:45:13 dkf Exp $ # Current Tk version; used in various names. @@ -679,7 +679,7 @@ demo: # This target can be used to run wish inside either gdb or insight gdb: ${WISH_EXE} - @echo "set env @LD_LIBRARY_PATH_VAR@=\"`pwd`:${TCL_BIN_DIR}:$${@LD_LIBRARY_PATH_VAR@}\"" > gdb.run + @echo "set env @LD_LIBRARY_PATH_VAR@=`pwd`:${TCL_BIN_DIR}:$${@LD_LIBRARY_PATH_VAR@}" > gdb.run @echo "set env TCL_LIBRARY=@TCL_SRC_DIR@/library" >> gdb.run @echo "set env TK_LIBRARY=@TK_SRC_DIR@/library" >> gdb.run gdb ./${WISH_EXE} --command=gdb.run diff --git a/unix/configure.in b/unix/configure.in index 6f49152..8187c92 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.170 2010/02/22 23:38:53 nijtmans Exp $ +# RCS: @(#) $Id: configure.in,v 1.171 2010/03/23 10:45:13 dkf Exp $ AC_INIT([tk],[8.6]) AC_PREREQ(2.59) @@ -418,7 +418,9 @@ fi #-------------------------------------------------------------------- if test "x${x_libraries}" != "x"; then + if test "x${x_libraries}" != "xNONE"; then LIB_RUNTIME_DIR="${LIB_RUNTIME_DIR}:${x_libraries}" + fi fi if test "${TCL_LD_SEARCH_FLAGS}" = '-L${LIB_RUNTIME_DIR}'; then LIB_RUNTIME_DIR=`echo ${LIB_RUNTIME_DIR} |sed -e 's/:/ -L/g'` |