Changeset 2063 for trunk/configure


Ignore:
Timestamp:
Jan 25, 2011, 11:49:29 AM (9 years ago)
Author:
gah
Message:
 
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/configure

    r2062 r2063  
    72077207
    72087208
    7209 TCLSH=
     7209TCL_VERSION="8.4"
     7210for dir in \
     7211 ${exec_prefix} \
     7212 ${exec_prefix}/lib ; do
     7213  tclconfig="${dir}/tclConfig.sh"
     7214  if test -f "$tclconfig" ; then
     7215    . $tclconfig
     7216    break
     7217  fi
     7218done
     7219
     7220TCLSH=""
    72107221if test "${rp_with_tclsh}" != "no" ; then
    7211   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tclsh" >&5
    7212 $as_echo_n "checking for tclsh... " >&6; }
    7213   if test -x "${rp_with_tclsh}/bin/tclsh"
    7214   then
    7215     TCLSH="${rp_with_tclsh}/bin/tclsh"
    7216   else
    7217     if test -x "${rp_with_tclsh}"
    7218     then
    7219       TCLSH="${rp_with_tclsh}"
    7220     else
    7221       if test -x "${exec_prefix}/bin/tclsh"
    7222       then
    7223         TCLSH="${exec_prefix}/bin/tclsh"
    7224       else
    7225         for v in 8.4 8.5 8.6 ; do
    7226           if test -x "${exec_prefix}/bin/tclsh${v}"
    7227           then
    7228             TCLSH="${exec_prefix}/bin/tclsh${v}"
    7229             break
    7230           fi
    7231         done
    7232       fi
    7233     fi
    7234   fi
    7235   if ! test -x ${TCLSH} ; then
    7236     # Extract the first word of "tclsh", so it can be a program name with args.
    7237 set dummy tclsh; ac_word=$2
     7222  tclsh="tclsh${TCL_VERSION}"
     7223  if test "${rp_with_tclsh}" = "yes" ; then
     7224    # Extract the first word of "${tclsh}", so it can be a program name with args.
     7225set dummy ${tclsh}; ac_word=$2
    72387226{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    72397227$as_echo_n "checking for $ac_word... " >&6; }
     
    72477235  *)
    72487236  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    7249 for as_dir in $PATH
     7237as_dummy="${exec_prefix}/bin:${PATH}"
     7238for as_dir in $as_dummy
    72507239do
    72517240  IFS=$as_save_IFS
     
    72747263
    72757264
    7276   fi
    7277 fi
    7278 { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${TCLSH}" >&5
    7279 $as_echo "${TCLSH}" >&6; }
    7280 
    7281 
    7282 TCL_VERSION="8.4"
    7283 for dir in \
    7284  ${exec_prefix} \
    7285  ${exec_prefix}/lib ; do
    7286   tclconfig="${dir}/tclConfig.sh"
     7265  else
     7266    # Extract the first word of "${tclsh}", so it can be a program name with args.
     7267set dummy ${tclsh}; ac_word=$2
     7268{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     7269$as_echo_n "checking for $ac_word... " >&6; }
     7270if ${ac_cv_path_TCLSH+:} false; then :
     7271  $as_echo_n "(cached) " >&6
     7272else
     7273  case $TCLSH in
     7274  [\\/]* | ?:[\\/]*)
     7275  ac_cv_path_TCLSH="$TCLSH" # Let the user override the test with a path.
     7276  ;;
     7277  *)
     7278  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     7279as_dummy="${rp_with_tclsh}/bin:${rp_with_tclsh}"
     7280for as_dir in $as_dummy
     7281do
     7282  IFS=$as_save_IFS
     7283  test -z "$as_dir" && as_dir=.
     7284    for ac_exec_ext in '' $ac_executable_extensions; do
     7285  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     7286    ac_cv_path_TCLSH="$as_dir/$ac_word$ac_exec_ext"
     7287    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     7288    break 2
     7289  fi
     7290done
     7291  done
     7292IFS=$as_save_IFS
     7293
     7294  ;;
     7295esac
     7296fi
     7297TCLSH=$ac_cv_path_TCLSH
     7298if test -n "$TCLSH"; then
     7299  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TCLSH" >&5
     7300$as_echo "$TCLSH" >&6; }
     7301else
     7302  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     7303$as_echo "no" >&6; }
     7304fi
     7305
     7306
     7307  fi
     7308  if test "x${TCLSH}" = "x" ; then
     7309    as_fn_error $? "cant find tclsh" "$LINENO" 5
     7310  fi
     7311fi
     7312
     7313
     7314
     7315TCL_INC_SPEC="$TCL_INCLUDE_SPEC"
     7316
     7317if test "x$rp_with_tcllib" != "x" ; then
     7318  tclconfig="${rp_with_tcllib}/tclConfig.sh"
    72877319  if test -f "$tclconfig" ; then
    72887320    . $tclconfig
    7289     break
    7290   fi
    7291 done
    7292 TCL_INC_SPEC="$TCL_INCLUDE_SPEC"
    7293 
    7294 if test "x$rp_with_tcllib" != "x" ; then
    7295    tclconfig="${rp_with_tcllib}/tclConfig.sh"
    7296    if test -f "$tclconfig" ; then
    7297     . $tclconfig
    7298    fi
    7299    TCL_LIB_SPEC="-L${rp_with_tcllib} -ltcl${TCL_VERSION}"
     7321  fi
     7322  TCL_LIB_SPEC="-L${rp_with_tcllib} -ltcl${TCL_VERSION}"
    73007323fi
    73017324if test "x$rp_with_tclinclude" != "x" ; then
Note: See TracChangeset for help on using the changeset viewer.