Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/1.6

    • Property svn:mergeinfo changed
      /trunkmerged: 6137
  • branches/1.6/configure.in

    r6158 r6160  
    151151  if test -f "$tclconfig" ; then
    152152    . $tclconfig
     153    break
     154  fi
     155done
     156
     157TK_VERSION="8.4"
     158for dir in \
     159 ${exec_prefix} \
     160 ${exec_prefix}/lib ; do
     161  tkconfig="${dir}/tkConfig.sh"
     162  if test -f "$tkconfig" ; then
     163    . $tkconfig
    153164    break
    154165  fi
     
    451462AC_SUBST(TCL_SHLIB_LDFLAGS)
    452463AC_SUBST(TCL_SHLIB_SUFFIX)
     464AC_SUBST(TCL_SRC_DIR)
    453465AC_SUBST(TCL_VERSION)
    454466AC_SUBST(TK_INC_SPEC)
    455467AC_SUBST(TK_LIB_SPEC)
     468AC_SUBST(TK_SRC_DIR)
    456469AC_SUBST(TK_VERSION)
    457470AC_SUBST(TK_XLIBSW)
Note: See TracChangeset for help on using the changeset viewer.