Changeset 2063 for trunk

Timestamp:

Jan 25, 2011, 8:49:29 AM (14 years ago)

Author:

gah

Message:

 

Location:

trunk

Files:

• configure (modified) (3 diffs)
• configure.in (modified) (2 diffs)

trunk/configure

@@ -7207 +7207 @@
 
 
-TCLSH=
+TCL_VERSION="8.4"
+for dir in \
+ ${exec_prefix} \
+ ${exec_prefix}/lib ; do
+  tclconfig="${dir}/tclConfig.sh"
+  if test -f "$tclconfig" ; then
+    . $tclconfig
+    break
+  fi
+done
+
+TCLSH=""
 if test "${rp_with_tclsh}" != "no" ; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tclsh" >&5
-$as_echo_n "checking for tclsh... " >&6; }
-  if test -x "${rp_with_tclsh}/bin/tclsh"
-  then
-    TCLSH="${rp_with_tclsh}/bin/tclsh"
-  else
-    if test -x "${rp_with_tclsh}"
-    then
-      TCLSH="${rp_with_tclsh}"
-    else
-      if test -x "${exec_prefix}/bin/tclsh"
-      then
-        TCLSH="${exec_prefix}/bin/tclsh"
-      else
-        for v in 8.4 8.5 8.6 ; do
-          if test -x "${exec_prefix}/bin/tclsh${v}"
-          then
-            TCLSH="${exec_prefix}/bin/tclsh${v}"
-            break
-          fi
-        done
-      fi
-    fi
-  fi
-  if ! test -x ${TCLSH} ; then
-    # Extract the first word of "tclsh", so it can be a program name with args.
-set dummy tclsh; ac_word=$2
+  tclsh="tclsh${TCL_VERSION}"
+  if test "${rp_with_tclsh}" = "yes" ; then
+    # Extract the first word of "${tclsh}", so it can be a program name with args.
+set dummy ${tclsh}; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
@@ -7247 +7235 @@
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
+as_dummy="${exec_prefix}/bin:${PATH}"
+for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
@@ -7274 +7263 @@
 
 
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${TCLSH}" >&5
-$as_echo "${TCLSH}" >&6; }
-
-
-TCL_VERSION="8.4"
-for dir in \
- ${exec_prefix} \
- ${exec_prefix}/lib ; do
-  tclconfig="${dir}/tclConfig.sh"
+  else
+    # Extract the first word of "${tclsh}", so it can be a program name with args.
+set dummy ${tclsh}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_TCLSH+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $TCLSH in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_TCLSH="$TCLSH" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_dummy="${rp_with_tclsh}/bin:${rp_with_tclsh}"
+for as_dir in $as_dummy
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_TCLSH="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+TCLSH=$ac_cv_path_TCLSH
+if test -n "$TCLSH"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TCLSH" >&5
+$as_echo "$TCLSH" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
+  if test "x${TCLSH}" = "x" ; then
+    as_fn_error $? "cant find tclsh" "$LINENO" 5
+  fi
+fi
+
+
+
+TCL_INC_SPEC="$TCL_INCLUDE_SPEC"
+
+if test "x$rp_with_tcllib" != "x" ; then
+  tclconfig="${rp_with_tcllib}/tclConfig.sh"
   if test -f "$tclconfig" ; then
     . $tclconfig
-    break
-  fi
-done
-TCL_INC_SPEC="$TCL_INCLUDE_SPEC"
-
-if test "x$rp_with_tcllib" != "x" ; then
-   tclconfig="${rp_with_tcllib}/tclConfig.sh"
-   if test -f "$tclconfig" ; then
-    . $tclconfig
-   fi
-   TCL_LIB_SPEC="-L${rp_with_tcllib} -ltcl${TCL_VERSION}"
+  fi
+  TCL_LIB_SPEC="-L${rp_with_tcllib} -ltcl${TCL_VERSION}"
 fi
 if test "x$rp_with_tclinclude" != "x" ; then

trunk/configure.in

@@ -123 +123 @@
     [rp_with_tclsh=$withval])
 
-TCLSH=
-if test "${rp_with_tclsh}" != "no" ; then
-  AC_MSG_CHECKING([for tclsh])
-  if test -x "${rp_with_tclsh}/bin/tclsh"
-  then
-    TCLSH="${rp_with_tclsh}/bin/tclsh"
-  else
-    if test -x "${rp_with_tclsh}"
-    then
-      TCLSH="${rp_with_tclsh}"
-    else
-      if test -x "${exec_prefix}/bin/tclsh"
-      then
-        TCLSH="${exec_prefix}/bin/tclsh"
-      else
-        for v in 8.4 8.5 8.6 ; do
-          if test -x "${exec_prefix}/bin/tclsh${v}"
-          then
-            TCLSH="${exec_prefix}/bin/tclsh${v}"
-            break
-          fi
-        done
-      fi
-    fi
-  fi
-  if ! test -x ${TCLSH} ; then
-    AC_PATH_PROG(TCLSH, tclsh)
-  fi
-fi
-AC_MSG_RESULT([${TCLSH}])
-AC_SUBST(TCLSH)
-
 TCL_VERSION="8.4"
 for dir in \
@@ -165 +133 @@
   fi
 done
+
+TCLSH=""
+if test "${rp_with_tclsh}" != "no" ; then
+  tclsh="tclsh${TCL_VERSION}"
+  if test "${rp_with_tclsh}" = "yes" ; then 
+    AC_PATH_PROG(TCLSH, ${tclsh}, [], [${exec_prefix}/bin:${PATH}])
+  else 
+    AC_PATH_PROG(TCLSH, ${tclsh}, [], [${rp_with_tclsh}/bin:${rp_with_tclsh}])
+  fi
+  if test "x${TCLSH}" = "x" ; then
+    AC_ERROR([cant find tclsh])
+  fi
+fi
+AC_SUBST(TCLSH)
+
+  
 TCL_INC_SPEC="$TCL_INCLUDE_SPEC"
 
 if test "x$rp_with_tcllib" != "x" ; then
-   tclconfig="${rp_with_tcllib}/tclConfig.sh"
-   if test -f "$tclconfig" ; then
+  tclconfig="${rp_with_tcllib}/tclConfig.sh"
+  if test -f "$tclconfig" ; then
     . $tclconfig
-   fi
-   TCL_LIB_SPEC="-L${rp_with_tcllib} -ltcl${TCL_VERSION}"
+  fi
+  TCL_LIB_SPEC="-L${rp_with_tcllib} -ltcl${TCL_VERSION}"
 fi
 if test "x$rp_with_tclinclude" != "x" ; then