Changeset 26711


Ignore:
Timestamp:
Jul 4, 2007, 8:55:37 PM (13 years ago)
Author:
landonf@…
Message:

Submitted by: afb@…
Bug: #12225

Bring back the tclsh detection that got lost in the Big Rename (r26177), also
add the tclsh8.4-threads program to the top of the list of names of tclsh to search for.

Location:
trunk/base
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/base/aclocal.m4

    r26710 r26711  
    615615
    616616        case $host_os in
     617                freebsd*)
     618                        # FreeBSD installs a dummy tclsh (annoying)
     619                        # Look for a real versioned tclsh with threads first
     620                        # Look for a real versioned tclsh without threads second
     621                        AC_PATH_PROG([TCLSH], [tclsh${TCL_VERSION}-threads tclsh${TCL_VERSION} tclsh])
     622                        ;;
    617623                *)
    618624                        # Otherwise, look for a non-versioned tclsh
  • trunk/base/configure

    r26710 r26711  
    1107111071
    1107211072        case $host_os in
     11073                freebsd*)
     11074                        # FreeBSD installs a dummy tclsh (annoying)
     11075                        # Look for a real versioned tclsh with threads first
     11076                        # Look for a real versioned tclsh without threads second
     11077                        # Extract the first word of "tclsh${TCL_VERSION}-threads tclsh${TCL_VERSION} tclsh", so it can be a program name with args.
     11078set dummy tclsh${TCL_VERSION}-threads tclsh${TCL_VERSION} tclsh; ac_word=$2
     11079{ echo "$as_me:$LINENO: checking for $ac_word" >&5
     11080echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
     11081if test "${ac_cv_path_TCLSH+set}" = set; then
     11082  echo $ECHO_N "(cached) $ECHO_C" >&6
     11083else
     11084  case $TCLSH in
     11085  [\\/]* | ?:[\\/]*)
     11086  ac_cv_path_TCLSH="$TCLSH" # Let the user override the test with a path.
     11087  ;;
     11088  *)
     11089  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     11090for as_dir in $PATH
     11091do
     11092  IFS=$as_save_IFS
     11093  test -z "$as_dir" && as_dir=.
     11094  for ac_exec_ext in '' $ac_executable_extensions; do
     11095  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     11096    ac_cv_path_TCLSH="$as_dir/$ac_word$ac_exec_ext"
     11097    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     11098    break 2
     11099  fi
     11100done
     11101done
     11102IFS=$as_save_IFS
     11103
     11104  ;;
     11105esac
     11106fi
     11107TCLSH=$ac_cv_path_TCLSH
     11108if test -n "$TCLSH"; then
     11109  { echo "$as_me:$LINENO: result: $TCLSH" >&5
     11110echo "${ECHO_T}$TCLSH" >&6; }
     11111else
     11112  { echo "$as_me:$LINENO: result: no" >&5
     11113echo "${ECHO_T}no" >&6; }
     11114fi
     11115
     11116
     11117                        ;;
    1107311118                *)
    1107411119                        # Otherwise, look for a non-versioned tclsh
Note: See TracChangeset for help on using the changeset viewer.