瀏覽代碼

Merge branch 'maint'

* maint:
  Tcl 8.6 support was incomplete
Bryan Drewery 12 年之前
父節點
當前提交
445b162ed5
共有 2 個文件被更改,包括 4 次插入0 次删除
  1. 2 0
      build/autotools/configure.ac
  2. 2 0
      configure

+ 2 - 0
build/autotools/configure.ac

@@ -107,6 +107,7 @@ tcllibextensions=".so .so.1 .so.1.0 .so.1.1 .so.1.2 .dll .dylib .sl .a"
 
 tcllibpaths="$HOME/lib $HOME/tcl/lib \
              /usr/local/lib /usr/lib /lib /lib64 /usr/lib64 \
+             /usr/local/lib/tcl8.6 /usr/lib/tcl8.6 \
              /usr/local/lib/tcl8.5 /usr/lib/tcl8.5 \
              /usr/local/lib/tcl8.4 /usr/lib/tcl8.4 \
              /usr/local/lib/tcl8.3 /usr/lib/tcl8.3 \
@@ -117,6 +118,7 @@ tcllibpaths="$HOME/lib $HOME/tcl/lib \
 tclheadernames="tcl.h"
 tclheaderpaths="$HOME/include $HOME/tcl/include \
                 /usr/local/include /usr/include \
+                /usr/local/include/tcl8.6 /usr/include/tcl8.6 \
                 /usr/local/include/tcl8.5 /usr/include/tcl8.5 \
                 /usr/local/include/tcl8.4 /usr/include/tcl8.4 \
                 /usr/local/include/tcl8.3 /usr/include/tcl8.3 \

+ 2 - 0
configure

@@ -5630,6 +5630,7 @@ tcllibextensions=".so .so.1 .so.1.0 .so.1.1 .so.1.2 .dll .dylib .sl .a"
 
 tcllibpaths="$HOME/lib $HOME/tcl/lib \
              /usr/local/lib /usr/lib /lib /lib64 /usr/lib64 \
+             /usr/local/lib/tcl8.6 /usr/lib/tcl8.6 \
              /usr/local/lib/tcl8.5 /usr/lib/tcl8.5 \
              /usr/local/lib/tcl8.4 /usr/lib/tcl8.4 \
              /usr/local/lib/tcl8.3 /usr/lib/tcl8.3 \
@@ -5640,6 +5641,7 @@ tcllibpaths="$HOME/lib $HOME/tcl/lib \
 tclheadernames="tcl.h"
 tclheaderpaths="$HOME/include $HOME/tcl/include \
                 /usr/local/include /usr/include \
+                /usr/local/include/tcl8.6 /usr/include/tcl8.6 \
                 /usr/local/include/tcl8.5 /usr/include/tcl8.5 \
                 /usr/local/include/tcl8.4 /usr/include/tcl8.4 \
                 /usr/local/include/tcl8.3 /usr/include/tcl8.3 \