Ignore:
Timestamp:
Mar 20, 2016, 2:57:39 AM (9 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

    r6158 r6160  
    630630TK_XLIBSW
    631631TK_VERSION
     632TK_SRC_DIR
    632633TK_LIB_SPEC
    633634TK_INC_SPEC
    634635TCL_VERSION
     636TCL_SRC_DIR
    635637TCL_SHLIB_SUFFIX
    636638TCL_SHLIB_LDFLAGS
    … …  
    73497351done
    73507352
     7353TK_VERSION="8.4"
     7354for dir in \
     7355 ${exec_prefix} \
     7356 ${exec_prefix}/lib ; do
     7357  tkconfig="${dir}/tkConfig.sh"
     7358  if test -f "$tkconfig" ; then
     7359    . $tkconfig
     7360    break
     7361  fi
     7362done
     7363
    73517364
    73527365# Check whether --with-ffmpeg was given.
    … …  
    1013710150
    1013810151MAKE=${make_command}
     10152
     10153
    1013910154
    1014010155
Note: See TracChangeset for help on using the changeset viewer.