From 700e2c73e2c8d5ebb712e7c2694d0bf2246c8b65 Mon Sep 17 00:00:00 2001 From: Jeff Hobbs Date: Sat, 19 Mar 2005 01:43:47 +0000 Subject: [PATCH] * Makefile.in (AR): use @AR@ * configure, tclconfig/tcl.m4: TEA 3.2 patch update --- ChangeLog | 5 +++++ Makefile.in | 2 +- configure | 24 ++++++++++-------------- tclconfig/tcl.m4 | 24 ++++++++++-------------- 4 files changed, 26 insertions(+), 29 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5c21ae3..75a31c4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-03-18 Jeff Hobbs + + * Makefile.in (AR): use @AR@ + * configure, tclconfig/tcl.m4: TEA 3.2 patch update + 2005-02-14 Jean-Claude Wippler * configure, configure.in, tclconfig/tcl.m4: update from sample diff --git a/Makefile.in b/Makefile.in index de14878..1d68c35 100644 --- a/Makefile.in +++ b/Makefile.in @@ -141,7 +141,7 @@ CONFIG_CLEAN_FILES = Makefile CPPFLAGS = @CPPFLAGS@ LIBS = @PKG_LIBS@ @LIBS@ -AR = ar +AR = @AR@ ## need to include the tcl source dir here for tclPort.h CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) diff --git a/configure b/configure index 6da4502..4bb5f95 100755 --- a/configure +++ b/configure @@ -6895,13 +6895,12 @@ echo $ECHO_N "checking for tclsh... $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test "${TEA_PLATFORM}" = "windows" -a "$do64bit_ok" = "yes" \ - -o "$doWince" != "no" ; then - # A Windows cross-compile build - restrict target tclsh + search_path=`echo ${PATH} | sed -e 's/:/ /g'` + if test "${TEA_PLATFORM}" != "windows" -o \ + \( "$do64bit_ok" = "no" -a "$doWince" = "no" \) ; then + # Do not allow target tclsh in known cross-compile builds, # as we need one we can run on this system - search_path=`echo ${PATH} | sed -e 's/:/ /g'` - else - search_path=`echo ${TCL_BIN_DIR}:${TCL_BIN_DIR}/../bin:${exec_prefix}/bin:${prefix}/bin:${PATH} | sed -e 's/:/ /g'` + search_path="${TCL_BIN_DIR} ${TCL_BIN_DIR}/../bin ${exec_prefix}/bin ${prefix}/bin ${search_path}" fi for dir in $search_path ; do for j in `ls -r $dir/tclsh[8-9]*${EXEEXT} 2> /dev/null` \ @@ -7778,7 +7777,6 @@ fi if test "$GCC" = "yes" ; then SHLIB_LD="gcc -shared" SHLIB_LD_LIBS='${LIBS}' - LD_SEARCH_FLAGS='' fi # Users may want PA-RISC 1.1/2.0 portable code - needs HP cc @@ -7794,7 +7792,6 @@ fi do64bit_ok=yes SHLIB_LD="${CC} -shared" SHLIB_LD_LIBS='${LIBS}' - LD_SEARCH_FLAGS='' ;; *) { echo "$as_me:$LINENO: WARNING: \"64bit mode not supported with GCC on $system\"" >&5 @@ -9902,13 +9899,12 @@ echo $ECHO_N "checking for tclsh... $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test "${TEA_PLATFORM}" = "windows" -a "$do64bit_ok" = "yes" \ - -o "$doWince" != "no" ; then - # A Windows cross-compile build - restrict target tclsh + search_path=`echo ${PATH} | sed -e 's/:/ /g'` + if test "${TEA_PLATFORM}" != "windows" -o \ + \( "$do64bit_ok" = "no" -a "$doWince" = "no" \) ; then + # Do not allow target tclsh in known cross-compile builds, # as we need one we can run on this system - search_path=`echo ${PATH} | sed -e 's/:/ /g'` - else - search_path=`echo ${TCL_BIN_DIR}:${TCL_BIN_DIR}/../bin:${exec_prefix}/bin:${prefix}/bin:${PATH} | sed -e 's/:/ /g'` + search_path="${TCL_BIN_DIR} ${TCL_BIN_DIR}/../bin ${exec_prefix}/bin ${prefix}/bin ${search_path}" fi for dir in $search_path ; do for j in `ls -r $dir/tclsh[8-9]*${EXEEXT} 2> /dev/null` \ diff --git a/tclconfig/tcl.m4 b/tclconfig/tcl.m4 index 13674e6..f50373c 100644 --- a/tclconfig/tcl.m4 +++ b/tclconfig/tcl.m4 @@ -1111,7 +1111,6 @@ dnl AC_CHECK_TOOL(AR, ar, :) if test "$GCC" = "yes" ; then SHLIB_LD="gcc -shared" SHLIB_LD_LIBS='${LIBS}' - LD_SEARCH_FLAGS='' fi # Users may want PA-RISC 1.1/2.0 portable code - needs HP cc @@ -1127,7 +1126,6 @@ dnl AC_CHECK_TOOL(AR, ar, :) do64bit_ok=yes SHLIB_LD="${CC} -shared" SHLIB_LD_LIBS='${LIBS}' - LD_SEARCH_FLAGS='' ;; *) AC_MSG_WARN("64bit mode not supported with GCC on $system") @@ -3440,13 +3438,12 @@ AC_DEFUN(TEA_PROG_TCLSH, [ AC_MSG_CHECKING([for tclsh]) AC_CACHE_VAL(ac_cv_path_tclsh, [ - if test "${TEA_PLATFORM}" = "windows" -a "$do64bit_ok" = "yes" \ - -o "$doWince" != "no" ; then - # A Windows cross-compile build - restrict target tclsh + search_path=`echo ${PATH} | sed -e 's/:/ /g'` + if test "${TEA_PLATFORM}" != "windows" -o \ + \( "$do64bit_ok" = "no" -a "$doWince" = "no" \) ; then + # Do not allow target tclsh in known cross-compile builds, # as we need one we can run on this system - search_path=`echo ${PATH} | sed -e 's/:/ /g'` - else - search_path=`echo ${TCL_BIN_DIR}:${TCL_BIN_DIR}/../bin:${exec_prefix}/bin:${prefix}/bin:${PATH} | sed -e 's/:/ /g'` + search_path="${TCL_BIN_DIR} ${TCL_BIN_DIR}/../bin ${exec_prefix}/bin ${prefix}/bin ${search_path}" fi for dir in $search_path ; do for j in `ls -r $dir/tclsh[[8-9]]*${EXEEXT} 2> /dev/null` \ @@ -3493,13 +3490,12 @@ AC_DEFUN(TEA_PROG_WISH, [ AC_MSG_CHECKING([for wish]) AC_CACHE_VAL(ac_cv_path_wish, [ - if test "${TEA_PLATFORM}" = "windows" -a "$do64bit_ok" = "yes" \ - -o "$doWince" != "no" ; then - # A Windows cross-compile build - restrict target tclsh + search_path=`echo ${PATH} | sed -e 's/:/ /g'` + if test "${TEA_PLATFORM}" != "windows" -o \ + \( "$do64bit_ok" = "no" -a "$doWince" = "no" \) ; then + # Do not allow target wish in known cross-compile builds, # as we need one we can run on this system - search_path=`echo ${PATH} | sed -e 's/:/ /g'` - else - search_path=`echo ${TK_BIN_DIR}:${TK_BIN_DIR}/../bin:${TCL_BIN_DIR}:${TCL_BIN_DIR}/../bin:${exec_prefix}/bin:${prefix}/bin:${PATH} | sed -e 's/:/ /g'` + search_path="${TK_BIN_DIR} ${TK_BIN_DIR}/../bin ${TCL_BIN_DIR} ${TCL_BIN_DIR}/../bin ${exec_prefix}/bin ${prefix}/bin ${search_path}" fi for dir in $search_path ; do for j in `ls -r $dir/wish[[8-9]]*${EXEEXT} 2> /dev/null` \ -- 2.23.0