Tk Source Code

Check-in [21fcf52e]
Login
Bounty program for improvements to Tcl and certain Tcl packages.
Tcl 2019 Conference, Houston/TX, US, Nov 4-8
Send your abstracts to [email protected]
or submit via the online form by Sep 9.

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:merge 8.5
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | core-8-6-branch
Files: files | file ages | folders
SHA3-256: 21fcf52e557530be6a620649f4839fcd8d031414d28592f27897596c1dd1b13f
User & Date: jan.nijtmans 2018-06-17 15:34:52
Context
2018-06-18
07:44
Sync tcl.m4 with Tcl, and regenerate configure script check-in: 984c527a user: jan.nijtmans tags: core-8-6-branch
2018-06-17
15:34
merge 8.5 check-in: 21fcf52e user: jan.nijtmans tags: core-8-6-branch
15:27
Sync tcl.m4 with Tcl version. Re-generate unix/configure script check-in: fe17be5b user: jan.nijtmans tags: core-8-5-branch
2018-06-16
08:48
Fix [de01e24aa1]: Text replace command involving selection crashes check-in: 4115c4e6 user: fvogel tags: core-8-6-branch
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to unix/configure.

  1425   1425   	    fi
  1426   1426   
  1427   1427   	    # check in a few common install locations
  1428   1428   	    if test x"${ac_cv_c_tclconfig}" = x ; then
  1429   1429   		for i in `ls -d ${libdir} 2>/dev/null` \
  1430   1430   			`ls -d ${exec_prefix}/lib 2>/dev/null` \
  1431   1431   			`ls -d ${prefix}/lib 2>/dev/null` \
  1432         -			`ls -d /usr/contrib/lib 2>/dev/null` \
  1433   1432   			`ls -d /usr/local/lib 2>/dev/null` \
         1433  +			`ls -d /usr/contrib/lib 2>/dev/null` \
  1434   1434   			`ls -d /usr/pkg/lib 2>/dev/null` \
  1435   1435   			`ls -d /usr/lib 2>/dev/null` \
  1436   1436   			`ls -d /usr/lib64 2>/dev/null` \
         1437  +			`ls -d /usr/local/lib/tcl8.6 2>/dev/null` \
         1438  +			`ls -d /usr/local/lib/tcl/tcl8.6 2>/dev/null` \
  1437   1439   			; do
  1438   1440   		    if test -f "$i/tclConfig.sh" ; then
  1439   1441   			ac_cv_c_tclconfig="`(cd $i; pwd)`"
  1440   1442   			break
  1441   1443   		    fi
  1442   1444   		done
  1443   1445   	    fi

Changes to unix/tcl.m4.

    87     87   	    fi
    88     88   
    89     89   	    # check in a few common install locations
    90     90   	    if test x"${ac_cv_c_tclconfig}" = x ; then
    91     91   		for i in `ls -d ${libdir} 2>/dev/null` \
    92     92   			`ls -d ${exec_prefix}/lib 2>/dev/null` \
    93     93   			`ls -d ${prefix}/lib 2>/dev/null` \
    94         -			`ls -d /usr/contrib/lib 2>/dev/null` \
    95     94   			`ls -d /usr/local/lib 2>/dev/null` \
           95  +			`ls -d /usr/contrib/lib 2>/dev/null` \
    96     96   			`ls -d /usr/pkg/lib 2>/dev/null` \
    97     97   			`ls -d /usr/lib 2>/dev/null` \
    98     98   			`ls -d /usr/lib64 2>/dev/null` \
           99  +			`ls -d /usr/local/lib/tcl8.6 2>/dev/null` \
          100  +			`ls -d /usr/local/lib/tcl/tcl8.6 2>/dev/null` \
    99    101   			; do
   100    102   		    if test -f "$i/tclConfig.sh" ; then
   101    103   			ac_cv_c_tclconfig="`(cd $i; pwd)`"
   102    104   			break
   103    105   		    fi
   104    106   		done
   105    107   	    fi
................................................................................
   220    222   	    # check in a few common install locations
   221    223   	    if test x"${ac_cv_c_tkconfig}" = x ; then
   222    224   		for i in `ls -d ${libdir} 2>/dev/null` \
   223    225   			`ls -d ${exec_prefix}/lib 2>/dev/null` \
   224    226   			`ls -d ${prefix}/lib 2>/dev/null` \
   225    227   			`ls -d /usr/local/lib 2>/dev/null` \
   226    228   			`ls -d /usr/contrib/lib 2>/dev/null` \
          229  +			`ls -d /usr/pkg/lib 2>/dev/null` \
   227    230   			`ls -d /usr/lib 2>/dev/null` \
   228    231   			`ls -d /usr/lib64 2>/dev/null` \
          232  +			`ls -d /usr/local/lib/tk8.6 2>/dev/null` \
          233  +			`ls -d /usr/local/lib/tcl/tk8.6 2>/dev/null` \
   229    234   			; do
   230    235   		    if test -f "$i/tkConfig.sh" ; then
   231    236   			ac_cv_c_tkconfig="`(cd $i; pwd)`"
   232    237   			break
   233    238   		    fi
   234    239   		done
   235    240   	    fi