casa-mp-base
Public
Commits
Marcus Calhoun-Lopez authored ae81c904577
| 1 1 | --- configure.orig 2017-07-18 20:52:12.000000000 -0700 |
| 2 2 | +++ configure 2017-11-25 23:46:25.000000000 -0700 |
| 3 - | |
| 3 + | |
| 4 4 | tcl_version='' |
| 5 5 | tcl_version=`sh ./runtest $tk_defs $tk_x11_include tclversion.c` |
| 6 6 | for tk_incs in \ |
| 7 7 | - "-I/usr/local/include" \ |
| 8 + | - "-I/opt/local/include" \ |
| 9 + | - "-I/sw/include" \ |
| 10 + | - "-I/usr/pkg/include" \ |
| 11 + | - "-I/usr/include" \ |
| 12 + | - "-I/usr/X11/include" \ |
| 13 + | - "-I/usr/local/include/tcl8.6 -I/usr/local/include/tk8.6" \ |
| 14 + | - "-I/usr/include/tcl8.6 -I/usr/include/tk8.6" \ |
| 15 + | - "-I/usr/local/include/tcl8.5 -I/usr/local/include/tk8.5" \ |
| 16 + | - "-I/usr/include/tcl8.5 -I/usr/include/tk8.5" \ |
| 17 + | - "-I/usr/local/include/tcl8.4 -I/usr/local/include/tk8.4" \ |
| 18 + | - "-I/usr/include/tcl8.4 -I/usr/include/tk8.4" \ |
| 19 + | - "-I/usr/local/include/tcl8.3 -I/usr/local/include/tk8.3" \ |
| 20 + | - "-I/usr/include/tcl8.3 -I/usr/include/tk8.3" \ |
| 21 + | - "-I/usr/local/include/tcl8.2 -I/usr/local/include/tk8.2" \ |
| 22 + | - "-I/usr/include/tcl8.2 -I/usr/include/tk8.2" |
| 8 23 | + "-I__MACPORTS_PREFIX__/include" \ |
| 9 - | "-I/opt/local/include" \ |
| 10 - | "-I/sw/include" \ |
| 11 - | "-I/usr/pkg/include" \ |
| 12 - | |
| 24 + | + "-I/usr/include" |
| 25 + | do if test -z "$tcl_version"; then |
| 26 + | tk_defs="$tk_incs" |
| 27 + | tcl_version=`sh ./runtest $tk_defs $tk_x11_include tclversion.c` |
| 28 + | |
| 13 29 | tkinclude="$tk_x11_include" |
| 14 30 | fi |
| 15 31 | case "$tkinclude" in |
| 16 32 | - -I/opt/local/include*) tklibdir="/opt/local/lib" ;; |
| 33 + | - -I/usr/local/include*) tklibdir="/usr/local/lib" ;; |
| 34 + | - -I/sw/include*) tklibdir="/sw/lib" ;; |
| 35 + | - -I/usr/pkg/include*) tklibdir="/usr/pkg/lib" ;; |
| 36 + | - -I/usr/X11/include*) tklibdir="/usr/X11/lib" ;; |
| 17 37 | + -I__MACPORTS_PREFIX__/include*) tklibdir="__MACPORTS_PREFIX__/lib" ;; |
| 18 - | -I/usr/local/include*) tklibdir="/usr/local/lib" ;; |
| 19 - | -I/sw/include*) tklibdir="/sw/lib" ;; |
| 20 - | -I/usr/pkg/include*) tklibdir="/usr/pkg/lib" ;; |
| 21 - | |
| 22 - | inf "Tcl/Tk libraries found." |
| 38 + | esac |
| 39 + | if test -n "$tklibdir"; then |
| 40 + | case "$system" in |
| 41 + | |
| 23 42 | else |
| 24 43 | has_tk=false |
| 25 - | - for tklibdir in "/usr/local/lib" "/opt/local/lib" "/sw/lib" "/usr/pkg/lib"; |
| 26 - | + for tklibdir in "__MACPORTS_PREFIX__/lib" "/opt/local/lib" "/sw/lib" "/usr/pkg/lib"; |
| 44 + | for tklibdir in \ |
| 45 + | - "/usr/local/lib" "/opt/local/lib" "/sw/lib" "/usr/pkg/lib" "/usr/lib"; |
| 46 + | + "__MACPORTS_PREFIX__/lib" "/usr/lib"; |
| 27 47 | do |
| 28 - | if test $found = no && |
| 48 + | if test $has_tk = false && |
| 29 49 | sh ./hasgot -L$tklibdir $tk_libs $tk_x11_libs $tkauxlibs Tk_SetGrid |