build

diff --git a/ChangeLog b/ChangeLog
index 8502d6fbf828983d3dcb08bf9ff1c5661ff10f49..246e5202118624e5ec33c2770c02d831e233ef6c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2002-04-01  Vince Darley <vincentdarley@sourceforge.net>
+        * Makefile.in: compilation fix from jcw.
+       
 2002-03-16  Vince Darley <vincentdarley@sourceforge.net>
        * generic/vfs.c: updated for latest cvs head of Tcl 8.4a5.
        * library/vfs.tcl: New version from jcw, with better handling

diff --git a/Makefile.in b/Makefile.in
index f85f5bd08a0a9fd130f0c8f7040cf00db64fd919..1b428d3135466395b98b4a73981d713644b0f8cf 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -292,8 +292,8 @@ $(vfs_LIB_FILE): $(vfs_OBJECTS)
 #      $(COMPILE) -c `@CYGPATH@ $(srcdir)/src/win/VFS.c` -o $@
 #========================================================================
 
-vfs.$(OBJEXT): $(srcdir)/vfs.c
-       $(COMPILE) -c `@CYGPATH@ $(srcdir)/vfs.c` -o $@
+generic/vfs.$(OBJEXT): $(srcdir)/generic/vfs.c
+       $(COMPILE) -c `@CYGPATH@ $(srcdir)/generic/vfs.c` -o $@
 
 #========================================================================
 # End of user-definable section

diff --git a/Readme.txt b/Readme.txt
index 009bc9b9b0de550fa2185c8492e6ac297162d581..4053f94df3f741b15ce6e4a769c9b13a61d91e3c 100644 (file)
--- a/Readme.txt
+++ b/Readme.txt
@@ -40,7 +40,8 @@ Compile/build
 The standard 'configure ; make ; make install' should work, but if it
 doesn't, I'm afraid I can't help --- I am not an expert on these issues
 and find it amazing that to compile a single C file (generic/vfs.c) a
-dozen or so TEA 'helper' files are required.
+dozen or so TEA 'helper' files are required.  I believe 'gmake' may
+be required on some platforms.
 
 For windows, there is a VC++ makefile in the win directory ('nmake -f
 makefile.vc') should do the trick.

diff --git a/generic/vfs.c b/generic/vfs.c
index 71a0eb02e5f1fa542ca00d3b0cc91220895560dc..d08c228bd9b6fe8a6ec192b9e5df2e9b3d3265a0 100644 (file)
--- a/generic/vfs.c
+++ b/generic/vfs.c
@@ -1041,6 +1041,10 @@ VfsStat(pathPtr, bufPtr)
                        bufPtr->st_mode |= S_IFDIR;
                    } else if (!strcmp(str,"file")) {
                        bufPtr->st_mode |= S_IFREG;
+#ifdef S_ISLNK
+                   } else if (!strcmp(str,"link")) {
+                       bufPtr->st_mode |= S_IFLNK;
+#endif
                    } else {
                        /* 
                         * Do nothing.  This means we do not currently

diff --git a/library/pkgIndex.tcl b/library/pkgIndex.tcl
index 32250ad6003d062e375dd0e2328e6d1e329ef31c..4dd3631a1001bb353aabd615dcde37c705b68bce 100644 (file)
--- a/library/pkgIndex.tcl
+++ b/library/pkgIndex.tcl
@@ -7,10 +7,16 @@
 # variable $dir must contain the full path name of this file's
 # directory.
 
+# We don't really want to throw an error with older versions of
+# Tcl, they should just ignore us.
+if {[package provide Tcl] < 8.4} {
+    return
+}
+
 package require Tcl 8.4
 if {[info tclversion] == 8.4} {
-    if {[regexp {8.4a(1|2|3)} [info patchlevel]]} {
-       error "Tcl 8.4a4 (Sept 4 2001) or newer is required"
+    if {[regexp {8.4a(1|2|3|4)} [info patchlevel]]} {
+       error "Tcl 8.4a5 (March 20th 2002) or newer is required"
     }
 }
 
@@ -19,11 +25,21 @@ if {[lsearch -exact $auto_path $dir] == -1} {
 }
 
 if {[info exists tcl_platform(debug)]} {
-    package ifneeded vfs 1.0 [list load [file join $dir vfs10d[info sharedlibextension]]]
+    set file [file join $dir vfs10d[info sharedlibextension]]
 } else {
-    package ifneeded vfs 1.0 [list load [file join $dir vfs10[info sharedlibextension]]]
+    set file [file join $dir vfs10[info sharedlibextension]]
 }
 
+# Don't do anything if our shared lib doesn't exist.  This should
+# help stop a crash on pre-release MacOS X.
+if {![file exists $file]} {
+    unset file
+    return
+}
+
+package ifneeded vfs 1.0 [list load $file]
+unset file
+
 package ifneeded scripdoc 0.3 [list source [file join $dir scripdoc.tcl]]
 package ifneeded mk4vfs 1.0 [list source [file join $dir mk4vfs.tcl]]
 package ifneeded vfslib 0.1 [list source [file join $dir vfs.tcl]]

diff --git a/win/makefile.vc b/win/makefile.vc
index 315911d3b9e2c6afc1e6b410f0724c0c903b58cd..49c2e58125be911b73f6c7188b56456d3927fb53 100644 (file)
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -13,7 +13,7 @@ VFS_VERSION = 1.0
 DLL_VERSION = 10
 
 # comment the following line to compile with symbols
-NODEBUG=0
+NODEBUG=1
 
 !IF "$(NODEBUG)" == "1"
 DEBUGDEFINES =