diff options
| author | hobbs <hobbs> | 2010-08-27 01:00:23 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 2010-08-27 01:00:23 (GMT) |
| commit | 21cfeef11470f8dddcaa9436870975b7960d259e (patch) | |
| tree | 686c4c1b59bacb749c96c6194ee837401443e058 /unix | |
| parent | ab4327494c1d007210ecb9fb27f6ed0a30e3b89b (diff) | |
| download | tk-21cfeef11470f8dddcaa9436870975b7960d259e.zip tk-21cfeef11470f8dddcaa9436870975b7960d259e.tar.gz tk-21cfeef11470f8dddcaa9436870975b7960d259e.tar.bz2 | |
* unix/Makefile.in: add valgrind target
* unix/configure, unix/tcl.m4: SHLIB_LD_LIBS='${LIBS}' for OSF1-V*.
Add /usr/lib64 to set of auto-search dirs. [Bug 1230554]
(SC_PATH_X): Correct syntax error when xincludes not found.
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/Makefile.in | 10 | ||||
| -rwxr-xr-x | unix/configure | 5 | ||||
| -rw-r--r-- | unix/tcl.m4 | 6 |
3 files changed, 16 insertions, 5 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index b2f9086..56fcaf3 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.169 2010/08/12 00:34:56 hobbs Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.170 2010/08/27 01:00:23 hobbs Exp $ # Current Tk version; used in various names. @@ -683,6 +683,14 @@ gdb: ${WISH_EXE} gdb ./${WISH_EXE} --command=gdb.run rm gdb.run +VALGRINDARGS=--tool=memcheck --num-callers=8 --leak-resolution=high --leak-check=yes --show-reachable=yes -v + +valgrind: tktest@EXEEXT@ + $(SHELL_ENV) valgrind $(VALGRINDARGS) ./tktest${EXE_SUFFIX} $(TEST_DIR)/all.tcl -geometry +0+0 -singleproc 1 $(TESTFLAGS) + +valgrindshell: tktest@EXEEXT@ + $(SHELL_ENV) valgrind $(VALGRINDARGS) ./tktest${EXE_SUFFIX} $(SCRIPT) + INSTALL_TARGETS = install-binaries install-libraries install-demos install-doc @EXTRA_INSTALL@ install: $(INSTALL_TARGETS) diff --git a/unix/configure b/unix/configure index a996dc4..4c08574 100755 --- a/unix/configure +++ b/unix/configure @@ -1433,6 +1433,7 @@ echo "$as_me: error: ${with_tclconfig} directory doesn't contain tclConfig.sh" > `ls -d /usr/local/lib 2>/dev/null` \ `ls -d /usr/contrib/lib 2>/dev/null` \ `ls -d /usr/lib 2>/dev/null` \ + `ls -d /usr/lib64 2>/dev/null` \ ; do if test -f "$i/tclConfig.sh" ; then ac_cv_c_tclconfig="`(cd $i; pwd)`" @@ -6215,7 +6216,7 @@ else fi - SHLIB_LD_LIBS="" + SHLIB_LD_LIBS='${LIBS}' SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" DL_LIBS="" @@ -9975,7 +9976,7 @@ echo "${ECHO_T}$i" >&6 found_xincludes="yes" fi fi - if test found_xincludes = "no"; then + if test "$found_xincludes" = "no"; then echo "$as_me:$LINENO: result: couldn't find any!" >&5 echo "${ECHO_T}couldn't find any!" >&6 fi diff --git a/unix/tcl.m4 b/unix/tcl.m4 index 22d4701..c86e994 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -94,6 +94,7 @@ AC_DEFUN([SC_PATH_TCLCONFIG], [ `ls -d /usr/local/lib 2>/dev/null` \ `ls -d /usr/contrib/lib 2>/dev/null` \ `ls -d /usr/lib 2>/dev/null` \ + `ls -d /usr/lib64 2>/dev/null` \ ; do if test -f "$i/tclConfig.sh" ; then ac_cv_c_tclconfig="`(cd $i; pwd)`" @@ -224,6 +225,7 @@ AC_DEFUN([SC_PATH_TKCONFIG], [ `ls -d /usr/local/lib 2>/dev/null` \ `ls -d /usr/contrib/lib 2>/dev/null` \ `ls -d /usr/lib 2>/dev/null` \ + `ls -d /usr/lib64 2>/dev/null` \ ; do if test -f "$i/tkConfig.sh" ; then ac_cv_c_tkconfig="`(cd $i; pwd)`" @@ -1773,7 +1775,7 @@ dnl AC_CHECK_TOOL(AR, ar) ], [ SHLIB_LD='ld -non_shared -expect_unresolved "*"' ]) - SHLIB_LD_LIBS="" + SHLIB_LD_LIBS='${LIBS}' SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" DL_LIBS="" @@ -2411,7 +2413,7 @@ AC_DEFUN([SC_PATH_X], [ found_xincludes="yes" fi fi - if test found_xincludes = "no"; then + if test "$found_xincludes" = "no"; then AC_MSG_RESULT([couldn't find any!]) fi |