[26711] trunk/base

[source_changes at macosforge.org]

Revision: 26711
          http://trac.macosforge.org/projects/macports/changeset/26711
Author:   landonf at macports.org
Date:     2007-07-04 13:55:37 -0700 (Wed, 04 Jul 2007)

Log Message:
-----------
Submitted by: afb at macports.org
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.

Modified Paths:
--------------
    trunk/base/aclocal.m4
    trunk/base/configure

Modified: trunk/base/aclocal.m4
===================================================================
--- trunk/base/aclocal.m4	2007-07-04 20:48:17 UTC (rev 26710)
+++ trunk/base/aclocal.m4	2007-07-04 20:55:37 UTC (rev 26711)
@@ -614,6 +614,12 @@
 
 
 	case $host_os in
+		freebsd*)
+			# FreeBSD installs a dummy tclsh (annoying)
+			# Look for a real versioned tclsh with threads first
+			# Look for a real versioned tclsh without threads second
+			AC_PATH_PROG([TCLSH], [tclsh${TCL_VERSION}-threads tclsh${TCL_VERSION} tclsh])
+			;;
 		*)
 			# Otherwise, look for a non-versioned tclsh
 			AC_PATH_PROG([TCLSH], [tclsh tclsh${TCL_VERSION}])

Modified: trunk/base/configure
===================================================================
--- trunk/base/configure	2007-07-04 20:48:17 UTC (rev 26710)
+++ trunk/base/configure	2007-07-04 20:55:37 UTC (rev 26711)
@@ -11070,6 +11070,51 @@
 
 
 	case $host_os in
+		freebsd*)
+			# FreeBSD installs a dummy tclsh (annoying)
+			# Look for a real versioned tclsh with threads first
+			# Look for a real versioned tclsh without threads second
+			# Extract the first word of "tclsh${TCL_VERSION}-threads tclsh${TCL_VERSION} tclsh", so it can be a program name with args.
+set dummy tclsh${TCL_VERSION}-threads tclsh${TCL_VERSION} tclsh; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_TCLSH+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&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
+for as_dir in $PATH
+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"
+    echo "$as_me:$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
+  { echo "$as_me:$LINENO: result: $TCLSH" >&5
+echo "${ECHO_T}$TCLSH" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+			;;
 		*)
 			# Otherwise, look for a non-versioned tclsh
 			# Extract the first word of "tclsh tclsh${TCL_VERSION}", so it can be a program name with args.

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070704/8f16634d/attachment.html