diff options
| author | das <das> | 2001-12-20 18:13:30 (GMT) |
|---|---|---|
| committer | das <das> | 2001-12-20 18:13:30 (GMT) |
| commit | eb05d9a6f9560e60224cdef0fc0d46afc16d7b08 (patch) | |
| tree | d7bf7bdf18ebd6b7f09ed1a80616bee0fffb1673 /unix | |
| parent | edaac9b8b6a5563d2c7d4423ba71ba41b7f65500 (diff) | |
| download | tcl-eb05d9a6f9560e60224cdef0fc0d46afc16d7b08.zip tcl-eb05d9a6f9560e60224cdef0fc0d46afc16d7b08.tar.gz tcl-eb05d9a6f9560e60224cdef0fc0d46afc16d7b08.tar.bz2 | |
* unix/tcl.m4: fixed incorrect SHLIB_LD_LIBS
setting for MacOSX / Darwin.
* unix/configure: Regen.
* unix/mkLinks.tcl: improved case-insensitive
filesystem support.
* unix/mkLinks: Regen.
Diffstat (limited to 'unix')
| -rwxr-xr-x | unix/configure | 2 | ||||
| -rw-r--r-- | unix/mkLinks | 10 | ||||
| -rw-r--r-- | unix/mkLinks.tcl | 21 | ||||
| -rw-r--r-- | unix/tcl.m4 | 2 |
4 files changed, 18 insertions, 17 deletions
diff --git a/unix/configure b/unix/configure index da02f1e..f592922 100755 --- a/unix/configure +++ b/unix/configure @@ -5518,7 +5518,7 @@ fi SHLIB_CFLAGS="-fno-common" SHLIB_LD="cc -dynamiclib \${LDFLAGS}" TCL_SHLIB_LD_EXTRAS="-compatibility_version ${TCL_MAJOR_VERSION} -current_version \${VERSION} -install_name \${LIB_RUNTIME_DIR}/\${TCL_LIB_FILE} -prebind -seg1addr a000000" - SHLIB_LD_LIBS="${LIBS}" + SHLIB_LD_LIBS='${LIBS}' SHLIB_SUFFIX=".dylib" DL_OBJS="tclLoadDyld.o" DL_LIBS="" diff --git a/unix/mkLinks b/unix/mkLinks index d7458bf..f7360ae 100644 --- a/unix/mkLinks +++ b/unix/mkLinks @@ -807,12 +807,12 @@ if test -r Panic.3; then rm -f Tcl_Panic.3 rm -f Tcl_PanicVA.3 rm -f Tcl_SetPanicProc.3 - rm -f panic.3 + if test "${CASEINSENSITIVEFS:-}" != "1"; then; rm -f panic.3; fi rm -f panicVA.3 ln Panic.3 Tcl_Panic.3 ln Panic.3 Tcl_PanicVA.3 ln Panic.3 Tcl_SetPanicProc.3 - ln Panic.3 panic.3 + if test "${CASEINSENSITIVEFS:-}" != "1"; then; ln Panic.3 panic.3; fi ln Panic.3 panicVA.3 fi if test -r ParseCmd.3; then @@ -1171,11 +1171,9 @@ if test -r WrongNumArgs.3; then rm -f Tcl_WrongNumArgs.3 ln WrongNumArgs.3 Tcl_WrongNumArgs.3 fi -if test "${CASEINSENSITIVEFS:-}" != "1"; then if test -r http.n; then - rm -f Http.n - ln http.n Http.n -fi + if test "${CASEINSENSITIVEFS:-}" != "1"; then; rm -f Http.n; fi + if test "${CASEINSENSITIVEFS:-}" != "1"; then; ln http.n Http.n; fi fi if test -r library.n; then rm -f auto_execok.n diff --git a/unix/mkLinks.tcl b/unix/mkLinks.tcl index ba99145..3a61387 100644 --- a/unix/mkLinks.tcl +++ b/unix/mkLinks.tcl @@ -41,6 +41,9 @@ if test "$y" != "xyzzyTestingaverylongfilename.foo"; then fi } +set case_insensitive_test { if test "${CASEINSENSITIVEFS:-}" != "1"; then;} +set case_insensitive_test_fi {; fi} + foreach file $argv { set in [open $file] set tail [file tail $file] @@ -61,24 +64,24 @@ foreach file $argv { foreach name [split $line ,] { regsub -all {(\\)? } $name "" name if {![string match $name*$ext $tail]} { + if {[string match -nocase $name*$ext $tail]} { + set tst $case_insensitive_test + set tstfi $case_insensitive_test_fi + } else { + set tst "" + set tstfi "" + } lappend namelist $name$ext - append rmOutput " rm -f $name$ext\n" - append lnOutput " ln $tail $name$ext\n" + append rmOutput " $tst rm -f $name$ext$tstfi\n" + append lnOutput " $tst ln $tail $name$ext$tstfi\n" } } - if { [llength $namelist] == 1 && [string compare -nocase $tail [lindex $namelist 0]] ==0} { - puts {if test "${CASEINSENSITIVEFS:-}" != "1"; then} - set state fi - } if { [llength $namelist] } { puts "if test -r $tail; then" puts -nonewline $rmOutput puts -nonewline $lnOutput puts "fi" } - if { $state == "fi" } { - puts "fi" - } set state end } end { diff --git a/unix/tcl.m4 b/unix/tcl.m4 index 08d84b1..559f422 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -988,7 +988,7 @@ dnl AC_CHECK_TOOL(AR, ar, :) SHLIB_CFLAGS="-fno-common" SHLIB_LD="cc -dynamiclib \${LDFLAGS}" TCL_SHLIB_LD_EXTRAS="-compatibility_version ${TCL_MAJOR_VERSION} -current_version \${VERSION} -install_name \${LIB_RUNTIME_DIR}/\${TCL_LIB_FILE} -prebind -seg1addr a000000" - SHLIB_LD_LIBS="${LIBS}" + SHLIB_LD_LIBS='${LIBS}' SHLIB_SUFFIX=".dylib" DL_OBJS="tclLoadDyld.o" DL_LIBS="" |