Changeset 6160 for branches/1.6/configure.in

Timestamp:

Mar 20, 2016, 2:57:39 AM (8 years ago)

Author:

ldelgass

Message:

merge r6137 from trunk (remove hardcoded path to Tcl/Tk? sources)

Location:

branches/1.6

Files:

• . (modified) (1 prop)
• configure.in (modified) (2 diffs)

branches/1.6/configure.in

@@ -151 +151 @@
   if test -f "$tclconfig" ; then
     . $tclconfig
+    break
+  fi
+done
+
+TK_VERSION="8.4"
+for dir in \
+ ${exec_prefix} \
+ ${exec_prefix}/lib ; do
+  tkconfig="${dir}/tkConfig.sh"
+  if test -f "$tkconfig" ; then
+    . $tkconfig
     break
   fi
@@ -451 +462 @@
 AC_SUBST(TCL_SHLIB_LDFLAGS)
 AC_SUBST(TCL_SHLIB_SUFFIX)
+AC_SUBST(TCL_SRC_DIR)
 AC_SUBST(TCL_VERSION)
 AC_SUBST(TK_INC_SPEC)
 AC_SUBST(TK_LIB_SPEC)
+AC_SUBST(TK_SRC_DIR)
 AC_SUBST(TK_VERSION)
 AC_SUBST(TK_XLIBSW)