Index: Makefile.in
===================================================================
RCS file: /cvsroot/tcljava/tcljava/Makefile.in,v
retrieving revision 1.32
diff -u -p -u -p -r1.32 Makefile.in
--- Makefile.in	18 Nov 2004 06:40:15 -0000	1.32
+++ Makefile.in	18 Mar 2005 05:32:53 -0000
@@ -156,17 +156,20 @@ TCLBLEND_LD_BIND_NOW	= @TCLBLEND_LD_BIND
 
 prefix			= @prefix@
 exec_prefix		= @exec_prefix@
+bindir                  = @bindir@
+libdir			= @libdir@
 
 # Directory containing platform dependent binaries
-BIN_INSTALL_DIR 	= $(exec_prefix)/bin
+BIN_INSTALL_DIR 	= $(bindir)
 
 # Directory where platform independent files live. This
 # includes the .jar files and any .tcl files
-XP_TCLJAVA_INSTALL_DIR	= $(prefix)/lib/tcljava$(TCLJAVA_VERSION)
+XP_TCLJAVA_INSTALL_DIR	= $(libdir)/tcljava$(TCLJAVA_VERSION)
 
 # Directory where platform dependent files (shared libraries) live.
-TCLJAVA_INSTALL_DIR	= $(exec_prefix)/lib/tcljava$(TCLJAVA_VERSION)
+TCLJAVA_INSTALL_DIR	= $(libdir)/tcljava$(TCLJAVA_VERSION)
 
+DESTDIR                 =
 
 # Tcl used to let the configure script choose which program to use
 # for installing, but there are just too many different versions of
@@ -352,6 +355,7 @@ custom.o: $(UNIX_DIR)/custom.c
 # Build the tclblend shared lib before building custom.o
 custom: tclblend.check custom.warn custom.o
 	LD_LIBRARY_PATH=$(BUILD_DIR):$(TCL_BIN_DIR):$(THREAD_BIN_DIR):$(JAVA_ARCH_NATIVE_RUNTIME_LIBS):$(LD_LIBRARY_PATH) \
+	DYLD_LIBRARY_PATH=$(BUILD_DIR):$(TCL_BIN_DIR):$(THREAD_BIN_DIR):$(JAVA_ARCH_NATIVE_RUNTIME_LIBS):$(DYLD_LIBRARY_PATH) \
 	SHLIB_PATH=$(BUILD_DIR):$(TCL_BIN_DIR):$(THREAD_BIN_DIR):$(JAVA_ARCH_NATIVE_RUNTIME_LIBS):$(SHLIB_PATH) \
 	$(CC) -o custom -g custom.o $(TCLBLEND_LIB_FILE) $(LIBS)
 
@@ -372,6 +376,7 @@ custom_shell_green:
 	TCL_LIBRARY=$(TCL_LIBRARY_DIR) \
 	TCLLIBPATH=$(TCLLIBPATH) \
 	LD_LIBRARY_PATH=$(BUILD_DIR):$(TCL_BIN_DIR):$(THREAD_BIN_DIR):$(JAVA_ARCH_GREEN_RUNTIME_LIBS):$(LD_LIBRARY_PATH) \
+	DYLD_LIBRARY_PATH=$(BUILD_DIR):$(TCL_BIN_DIR):$(THREAD_BIN_DIR):$(JAVA_ARCH_GREEN_RUNTIME_LIBS):$(DYLD_LIBRARY_PATH) \
 	SHLIB_PATH=$(BUILD_DIR):$(TCL_BIN_DIR):$(THREAD_BIN_DIR):$(JAVA_ARCH_GREEN_RUNTIME_LIBS):$(SHLIB_PATH) \
 	JAVA=$(JAVA) \
 	BUILD_DIR=$(BUILD_DIR) \
@@ -389,6 +394,7 @@ custom_shell_native:
 	TCL_LIBRARY=$(TCL_LIBRARY_DIR) \
 	TCLLIBPATH=$(TCLLIBPATH) \
 	LD_LIBRARY_PATH=$(BUILD_DIR):$(TCL_BIN_DIR):$(THREAD_BIN_DIR):$(JAVA_ARCH_NATIVE_RUNTIME_LIBS):$(LD_LIBRARY_PATH) \
+	DYLD_LIBRARY_PATH=$(BUILD_DIR):$(TCL_BIN_DIR):$(THREAD_BIN_DIR):$(JAVA_ARCH_NATIVE_RUNTIME_LIBS):$(DYLD_LIBRARY_PATH) \
 	SHLIB_PATH=$(BUILD_DIR):$(TCL_BIN_DIR):$(THREAD_BIN_DIR):$(JAVA_ARCH_NATIVE_RUNTIME_LIBS):$(SHLIB_PATH) \
 	JAVA=$(JAVA) \
 	BUILD_DIR=$(BUILD_DIR) \
@@ -431,38 +437,38 @@ tclblend.install: tclblend.check
 	@echo "#"
 	@echo "# Installing tclblend"
 	@echo "#"
-	@if test ! -d $(XP_TCLJAVA_INSTALL_DIR) ; then \
-		echo "Making directory $(XP_TCLJAVA_INSTALL_DIR)" ; \
-		mkdir -p $(XP_TCLJAVA_INSTALL_DIR) ; \
-		chmod 755 $(XP_TCLJAVA_INSTALL_DIR) ; \
-	fi
-	@echo "Installing $(TCLBLEND_LIB_FILE) in $(TCLJAVA_INSTALL_DIR)"
-	@$(INSTALL_DATA) $(TCLBLEND_LIB_FILE) $(TCLJAVA_INSTALL_DIR)
-	@chmod 555 $(TCLJAVA_INSTALL_DIR)/$(TCLBLEND_LIB_FILE)
-	@echo "Installing tclblend.jar in $(XP_TCLJAVA_INSTALL_DIR)"
-	@$(INSTALL_DATA) tclblend.jar $(XP_TCLJAVA_INSTALL_DIR)
-	@echo "Installing pkgIndex.tcl in $(XP_TCLJAVA_INSTALL_DIR)"
-	@$(INSTALL_DATA) pkgIndex.tcl $(XP_TCLJAVA_INSTALL_DIR)
-	@echo "Installing xputils package in $(prefix)/lib"
-	@rm -rf $(prefix)/lib/xputils
-	@mkdir -p $(prefix)/lib/xputils
-	@chmod 755 $(prefix)/lib/xputils
-	@$(INSTALL_DATA) $(MISC_DIR)/xputils/pkgIndex.tcl $(prefix)/lib/xputils
-	@$(INSTALL_DATA) $(MISC_DIR)/xputils/xputils.tcl $(prefix)/lib/xputils
-	@$(INSTALL_DATA) $(MISC_DIR)/xputils/iload.tcl $(prefix)/lib/xputils
-	@echo "Installing jtclsh in $(BIN_INSTALL_DIR)"
-	@$(INSTALL_PROGRAM) jtclsh $(BIN_INSTALL_DIR)
-	@chmod a+rx $(BIN_INSTALL_DIR)/jtclsh
-	@echo "Installing jwish in $(BIN_INSTALL_DIR)"
-	@cd $(BIN_INSTALL_DIR); rm -f jwish; ln -s jtclsh jwish
+	@if test ! -d $(DESTDIR)$(XP_TCLJAVA_INSTALL_DIR) ; then \
+		echo "Making directory $(DESTDIR)$(XP_TCLJAVA_INSTALL_DIR)" ; \
+		mkdir -p $(DESTDIR)$(XP_TCLJAVA_INSTALL_DIR) ; \
+		chmod 755 $(DESTDIR)$(XP_TCLJAVA_INSTALL_DIR) ; \
+	fi
+	@echo "Installing $(TCLBLEND_LIB_FILE) in $(DESTDIR)$(TCLJAVA_INSTALL_DIR)"
+	@$(INSTALL_DATA) $(TCLBLEND_LIB_FILE) $(DESTDIR)$(TCLJAVA_INSTALL_DIR)
+	@chmod 555 $(DESTDIR)$(TCLJAVA_INSTALL_DIR)/$(TCLBLEND_LIB_FILE)
+	@echo "Installing tclblend.jar in $(DESTDIR)$(XP_TCLJAVA_INSTALL_DIR)"
+	@$(INSTALL_DATA) tclblend.jar $(DESTDIR)$(XP_TCLJAVA_INSTALL_DIR)
+	@echo "Installing pkgIndex.tcl in $(DESTDIR)$(XP_TCLJAVA_INSTALL_DIR)"
+	@$(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(XP_TCLJAVA_INSTALL_DIR)
+	@echo "Installing xputils package in $(DESTDIR)$(libdir)/xputils"
+	@rm -rf $(DESTDIR)$(libdir)/xputils
+	@mkdir -p $(DESTDIR)$(libdir)/xputils
+	@chmod 755 $(DESTDIR)$(libdir)/xputils
+	@$(INSTALL_DATA) $(MISC_DIR)/xputils/pkgIndex.tcl $(DESTDIR)$(libdir)/xputils
+	@$(INSTALL_DATA) $(MISC_DIR)/xputils/xputils.tcl $(DESTDIR)$(libdir)/xputils
+	@$(INSTALL_DATA) $(MISC_DIR)/xputils/iload.tcl $(DESTDIR)$(libdir)/xputils
+	@echo "Installing jtclsh in $(DESTDIR)$(BIN_INSTALL_DIR)"
+	@$(INSTALL_PROGRAM) jtclsh $(DESTDIR)$(BIN_INSTALL_DIR)
+	@chmod a+rx $(DESTDIR)$(BIN_INSTALL_DIR)/jtclsh
+	@echo "Installing jwish in $(DESTDIR)$(BIN_INSTALL_DIR)"
+	@cd $(DESTDIR)$(BIN_INSTALL_DIR); rm -f jwish; ln -s jtclsh jwish
 	@rm -rf tclblend_test
 	@mkdir tclblend_test
 	@cp Test.tcl Test.class tclblend_test
 	@cd tclblend_test ; \
-	if env $(BIN_INSTALL_DIR)/jtclsh Test.tcl; then \
+	if env $(DESTDIR)$(BIN_INSTALL_DIR)/jtclsh Test.tcl; then \
 		DO=NOTHING ; \
 	else \
-		echo "Test failed ... you may need to edit $(BIN_INSTALL_DIR)/jtclsh by hand to set the correct paths" ;   \
+		echo "Test failed ... you may need to edit $(DESTDIR)$(BIN_INSTALL_DIR)/jtclsh by hand to set the correct paths" ;   \
 	fi
 	@rm -rf tclblend_test
 
@@ -558,15 +564,15 @@ jacl.install: jacl.check
 	@echo "#"
 	@echo "# Installing jacl"
 	@echo "#"
-	@echo "Installing jacl.jar in $(XP_TCLJAVA_INSTALL_DIR)"
-	@$(INSTALL_DATA) $(BUILD_DIR)/jacl.jar $(XP_TCLJAVA_INSTALL_DIR)
-	@echo "Installing jaclsh in $(BIN_INSTALL_DIR)"
-	@$(INSTALL_PROGRAM) $(BUILD_DIR)/jaclsh $(BIN_INSTALL_DIR)
-	@chmod 755 $(BIN_INSTALL_DIR)/jaclsh
-	@if env $(BIN_INSTALL_DIR)/jaclsh Test.tcl; then \
+	@echo "Installing jacl.jar in $(DESTDIR)$(XP_TCLJAVA_INSTALL_DIR)"
+	@$(INSTALL_DATA) $(BUILD_DIR)/jacl.jar $(DESTDIR)$(XP_TCLJAVA_INSTALL_DIR)
+	@echo "Installing jaclsh in $(DESTDIR)$(BIN_INSTALL_DIR)"
+	@$(INSTALL_PROGRAM) $(BUILD_DIR)/jaclsh $(DESTDIR)$(BIN_INSTALL_DIR)
+	@chmod 755 $(DESTDIR)$(BIN_INSTALL_DIR)/jaclsh
+	@if env $(DESTDIR)$(BIN_INSTALL_DIR)/jaclsh Test.tcl; then \
 		DO=NOTHING ; \
 	else \
-		echo "Test failed ... you may need to edit $(BIN_INSTALL_DIR)/jaclsh by hand to set the correct paths" ;   \
+		echo "Test failed ... you may need to edit $(DESTDIR)$(BIN_INSTALL_DIR)/jaclsh by hand to set the correct paths" ;   \
 	fi
 
 
@@ -646,9 +652,9 @@ tcljava.install: tcljava.check
 	@echo "#"
 	@echo "# Installing tcljava"
 	@echo "#"
-	@for i in $(TCLJAVA_INSTALL_DIR) \
-		 $(BIN_INSTALL_DIR) \
-		 $(XP_TCLJAVA_INSTALL_DIR) ; \
+	@for i in $(DESTDIR)$(TCLJAVA_INSTALL_DIR) \
+		 $(DESTDIR)$(BIN_INSTALL_DIR) \
+		 $(DESTDIR)$(XP_TCLJAVA_INSTALL_DIR) ; \
 	    do \
 	    if test ! -d $$i  ; then \
 		echo "Making directory $$i"; \
@@ -657,8 +663,8 @@ tcljava.install: tcljava.check
 		else true; \
 	    fi; \
 	done;
-	@echo "Installing tcljava.jar in $(XP_TCLJAVA_INSTALL_DIR)"
-	@$(INSTALL_DATA) $(BUILD_DIR)/tcljava.jar $(XP_TCLJAVA_INSTALL_DIR)
+	@echo "Installing tcljava.jar in $(DESTDIR)$(XP_TCLJAVA_INSTALL_DIR)"
+	@$(INSTALL_DATA) $(BUILD_DIR)/tcljava.jar $(DESTDIR)$(XP_TCLJAVA_INSTALL_DIR)
 
 
 
@@ -819,6 +825,7 @@ test_tclblend.exec: test_tclblend.check
 	LD_BIND_NOW=$(TCLBLEND_LD_BIND_NOW) \
 	PATH=$(PATH):$(BUILD_DIR):$(TCL_BIN_DIR):$(THREAD_BIN_DIR):$(JAVA_LIB_RUNTIME_PATH) \
 	LD_LIBRARY_PATH=$(BUILD_DIR):$(TCL_BIN_DIR):$(THREAD_BIN_DIR):$(JAVA_LIB_RUNTIME_PATH):$(LD_LIBRARY_PATH) \
+	DYLD_LIBRARY_PATH=$(BUILD_DIR):$(TCL_BIN_DIR):$(THREAD_BIN_DIR):$(JAVA_LIB_RUNTIME_PATH):$(DYLD_LIBRARY_PATH) \
 	SHLIB_PATH=$(BUILD_DIR):$(TCL_BIN_DIR):$(THREAD_BIN_DIR):$(JAVA_LIB_RUNTIME_PATH):$(SHLIB_PATH) \
 	KAFFELIBRARYPATH=$(BUILD_DIR):$(TCL_BIN_DIR):$(THREAD_BIN_DIR):$(JAVA_LIB_RUNTIME_PATH) \
 	TCL_LIBRARY=$(TCL_LIBRARY_DIR) \
@@ -848,6 +855,7 @@ shell_tclblend: tclblend.check
 	LD_BIND_NOW=$(TCLBLEND_LD_BIND_NOW) \
 	PATH=$(PATH):$(BUILD_DIR):$(TCL_BIN_DIR):$(THREAD_BIN_DIR):$(JAVA_LIB_RUNTIME_PATH) \
 	LD_LIBRARY_PATH=$(BUILD_DIR):$(TCL_BIN_DIR):$(THREAD_BIN_DIR):$(JAVA_LIB_RUNTIME_PATH):$(LD_LIBRARY_PATH) \
+	DYLD_LIBRARY_PATH=$(BUILD_DIR):$(TCL_BIN_DIR):$(THREAD_BIN_DIR):$(JAVA_LIB_RUNTIME_PATH):$(DYLD_LIBRARY_PATH) \
 	SHLIB_PATH=$(BUILD_DIR):$(TCL_BIN_DIR):$(THREAD_BIN_DIR):$(JAVA_LIB_RUNTIME_PATH):$(SHLIB_PATH) \
 	KAFFELIBRARYPATH=$(BUILD_DIR):$(TCL_BIN_DIR):$(THREAD_BIN_DIR):$(JAVA_LIB_RUNTIME_PATH) \
 	TCL_LIBRARY=$(TCL_LIBRARY_DIR) \
@@ -966,6 +974,7 @@ gdb_tclblend : tclblend.check
 	@echo "set env LD_PRELOAD=${TCLBLEND_LD_PRELOAD}" > gdb.run
 	@echo "set env LD_BIND_NOW=${TCLBLEND_LD_BIND_NOW}" >> gdb.run
 	@echo "set env LD_LIBRARY_PATH=${BUILD_DIR}:${TCL_BIN_DIR}:${THREAD_BIN_DIR}:${JAVA_LIB_RUNTIME_PATH}:${LD_LIBRARY_PATH}" >> gdb.run
+	@echo "set env DYLD_LIBRARY_PATH=${BUILD_DIR}:${TCL_BIN_DIR}:${THREAD_BIN_DIR}:${JAVA_LIB_RUNTIME_PATH}:${DYLD_LIBRARY_PATH}" >> gdb.run
 	@echo "set env SHLIB_PATH=${BUILD_DIR}:${TCL_BIN_DIR}:${THREAD_BIN_DIR}:${JAVA_LIB_RUNTIME_PATH}:${LD_LIBRARY_PATH}" >> gdb.run
 	@echo "set env KAFFELIBRARYPATH=${BUILD_DIR}:${TCL_BIN_DIR}:${THREAD_BIN_DIR}:${JAVA_LIB_RUNTIME_PATH}:${LD_LIBRARY_PATH}" >> gdb.run
 	@echo "set env TCL_LIBRARY=${TCL_LIBRARY_DIR}" >> gdb.run
@@ -1015,7 +1024,7 @@ demos.build: demos.clean
 	$(JAVAC) $(JAVAC_FLAGS) *.java
 
 # This rule must be run after the demos.build rule
-demos_jacl.build:
+demos_jacl.build: demos.build
 	cp -fr $(DEMOS_SRC_DIR)/pyramidpkg $(DEMOS_BUILD_DIR)/pyramidpkg
 	cd $(DEMOS_BUILD_DIR)/pyramidpkg; \
 	CLASSPATH=$(DEMOS_CLASSPATH) \
Index: configure.in
===================================================================
RCS file: /cvsroot/tcljava/tcljava/configure.in,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 configure.in
--- configure.in	25 Jul 2003 07:08:40 -0000	1.19
+++ configure.in	18 Mar 2005 05:32:53 -0000
@@ -374,12 +374,6 @@ AC_SUBST(JAR_NOCOMPRESS_FLAGS)
 AC_SUBST(TCLJAVA_VERSION)
 AC_SUBST(TCLJAVA_NODOT_VERSION)
 
-# We need to pass "tclblend" as the TCLJAVA name instead of "both"
-if test "$TCLJAVA" = "both" ; then
-    TCLJAVA=tclblend
-fi
-AC_SUBST(TCLJAVA)
-
 if test $TCLJAVA = "both"; then
     OUTPUT_FILES="Makefile jtclsh jaclsh tcljavaConfig.sh"
 elif test $TCLJAVA = "tclblend"; then
@@ -388,4 +382,10 @@ else
     OUTPUT_FILES="Makefile jaclsh tcljavaConfig.sh"
 fi
 
+# We need to pass "tclblend" as the TCLJAVA name instead of "both"
+if test "$TCLJAVA" = "both" ; then
+    TCLJAVA=tclblend
+fi
+AC_SUBST(TCLJAVA)
+
 AC_OUTPUT([$OUTPUT_FILES])
Index: jaclsh.in
===================================================================
RCS file: /cvsroot/tcljava/tcljava/jaclsh.in,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 jaclsh.in
--- jaclsh.in	20 Aug 2000 06:13:30 -0000	1.3
+++ jaclsh.in	18 Mar 2005 05:32:53 -0000
@@ -13,13 +13,15 @@
 
 # Install prefix for jacl package, defaults to /usr/local
 prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
 
 # Tcl/Java version number
 TCLJAVA_VERSION=@TCLJAVA_VERSION@
 
 # Directory where platform independent files live. This
 # includes the .jar files and any .tcl files
-XP_TCLJAVA_INSTALL_DIR=${prefix}/lib/tcljava${TCLJAVA_VERSION}
+XP_TCLJAVA_INSTALL_DIR=${libdir}/tcljava${TCLJAVA_VERSION}
 
 # Add the .jar library files to the CLASSPATH
 JACL_CLASSPATH=@JAVA_CLASSPATH@:${XP_TCLJAVA_INSTALL_DIR}/tcljava.jar:${XP_TCLJAVA_INSTALL_DIR}/jacl.jar:
Index: jtclsh.in
===================================================================
RCS file: /cvsroot/tcljava/tcljava/jtclsh.in,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 jtclsh.in
--- jtclsh.in	7 Aug 2003 07:04:38 -0000	1.2
+++ jtclsh.in	18 Mar 2005 05:32:53 -0000
@@ -37,16 +37,17 @@
 # Install prefix and binary prefix for tclblend, defaults to /usr/local
 prefix=@prefix@
 exec_prefix=@exec_prefix@
+libdir=@libdir@
 
 # Tcl/Java version number
 TCLJAVA_VERSION=@TCLJAVA_VERSION@
 
 # Directory where platform independent files live. This
 # includes the .jar files and any .tcl files
-XP_TCLJAVA_INSTALL_DIR=${prefix}/lib/tcljava${TCLJAVA_VERSION}
+XP_TCLJAVA_INSTALL_DIR=${libdir}/tcljava${TCLJAVA_VERSION}
 
 # Directory where platform dependent files (shared libraries) live.
-TCLJAVA_INSTALL_DIR=${exec_prefix}/lib/tcljava${TCLJAVA_VERSION}
+TCLJAVA_INSTALL_DIR=${libdir}/tcljava${TCLJAVA_VERSION}
 
 
 # Fully qualified path name of wish and tclsh
@@ -109,6 +110,12 @@ elif test "`uname -s`" = "HP-UX" ; then
     # Export the Kaffe library path in case we are running Kaffe
     KAFFELIBRARYPATH=${JAVA_LIB_RUNTIME_PATH}:${LD_LIBRARY_PATH}
     export KAFFELIBRARYPATH
+elif test "`uname -s`" = "Darwin" ; then
+    DYLD_LIBRARY_PATH=${JAVA_LIB_RUNTIME_PATH}:${DYLD_LIBRARY_PATH}
+    export DYLD_LIBRARY_PATH
+    # Export the Kaffe library path in case we are running Kaffe
+    KAFFELIBRARYPATH=${JAVA_LIB_RUNTIME_PATH}:${DYLD_LIBRARY_PATH}
+    export KAFFELIBRARYPATH
 else
     LD_LIBRARY_PATH=${JAVA_LIB_RUNTIME_PATH}:${LD_LIBRARY_PATH}
     export LD_LIBRARY_PATH
@@ -142,9 +149,9 @@ fi
 # in the Tcl shell. Tcl uses this when doing a "package require java".
 
 if test "$TCLLIBPATH" = ""; then
-    TCLLIBPATH=${prefix}/lib
+    TCLLIBPATH=${libdir}
 else
-    TCLLIBPATH="${prefix}/lib ${TCLLIBPATH}"
+    TCLLIBPATH="${libdir} ${TCLLIBPATH}"
 fi
 export TCLLIBPATH
 
Index: tcljava.m4
===================================================================
RCS file: /cvsroot/tcljava/tcljava/tcljava.m4,v
retrieving revision 1.27
diff -u -p -u -p -r1.27 tcljava.m4
--- tcljava.m4	1 Oct 2004 06:54:57 -0000	1.27
+++ tcljava.m4	18 Mar 2005 05:32:53 -0000
@@ -126,7 +126,7 @@ AC_DEFUN([TCLJAVA_ENABLE_JACL_OR_TCLBLEN
     fi
 
     if test "x$TCLJAVA" = "x"; then
-        if test -d $srcdir/src/tclblend && test -d $srcdir/src/jacl ; then
+        if test -d $srcdir/src/tclblend -a -d $srcdir/src/jacl ; then
             AC_MSG_LOG(configuring for both jacl and tclblend)
             TCLJAVA=both
         elif test -d $srcdir/src/tclblend ; then
@@ -534,7 +534,7 @@ AC_DEFUN([AC_JAVA_CLASSPATH], [
     fi
 
     # JDK 1.4 under Darwin
-    F=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Classes/classes.jar
+    F=/System/Library/Frameworks/JavaVM.framework/Classes/classes.jar
     if test "x$ac_java_classpath" = "x" ; then
         AC_MSG_LOG([Looking for $F], 1)
         if test -f $F ; then
@@ -975,6 +975,21 @@ AC_DEFUN([AC_JAVA_JNI_LIBS], [
                 ac_java_jvm_jni_lib_flags="$ac_java_jvm_dir/$F"
             fi
         fi
+
+        # JDK 1.4 under Darwin
+
+        F=/System/Library/Frameworks/JavaVM.framework/Libraries/libjava.jnilib
+        if test "x$ac_java_jvm_jni_lib_flags" = "x" ; then
+            AC_MSG_LOG([Looking for $F], 1)
+            if test -f $F ; then
+                AC_MSG_LOG([Found $F], 1)
+                D=`dirname $F`
+                ac_java_jvm_jni_lib_runtime_path="$D:/System/Library/Java/Extensions:/Library/Java/Extensions"
+                ac_java_jvm_jni_lib_flags="-framework JavaVM -L$D"
+                SHLIB_SUFFIX=.jnilib
+            fi
+        fi
+    
     fi
 
     # Generate error for unsupported JVM layout
Index: demos/gluepkg/JarCmd.java
===================================================================
RCS file: /cvsroot/tcljava/tcljava/demos/gluepkg/JarCmd.java,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 JarCmd.java
--- demos/gluepkg/JarCmd.java	13 Jan 2005 06:21:14 -0000	1.4
+++ demos/gluepkg/JarCmd.java	18 Mar 2005 05:32:53 -0000
@@ -96,7 +96,7 @@ class JarCmd implements Command {
 
 		    try {
 		        s = extractZipFile(zFileObj, zEntry);
-		    } catch (IOException e) {
+		    } catch (IOException ex) {
 		        break;
 		    }
 		    result = TclString.newInstance(s);
Index: docs/website/manual.html
===================================================================
RCS file: /cvsroot/tcljava/tcljava/docs/website/manual.html,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 manual.html
--- docs/website/manual.html	17 Mar 2003 19:31:56 -0000	1.1
+++ docs/website/manual.html	18 Mar 2005 05:32:53 -0000
@@ -64,21 +64,21 @@
 
 <DL>
 <DT>
-<A HREF="../TclJava/contents.html">Tcl/Java Commands</A>
+<A HREF="manual/TclJava/contents.html">Tcl/Java Commands</A>
 <DD>
 The Tcl commands defined by the java package that a programmer
 would use to interact with Java from Tcl.
 <DT>
-<A HREF="../TclJavaLib/contents.htm">Tcl/Java library API</A>
+<A HREF="manual/TclJavaLib/contents.htm">Tcl/Java library API</A>
 <DD>
 The Java library API that a programmer would use to interact
 with Tcl from Java.
 <DT>
-<A HREF="../cFunctions.html">Equivalent C Functions</A>
+<A HREF="manual/cFunctions.html">Equivalent C Functions</A>
 <DD>
 A listing of C Library functions and their equivalent Java classes and methods.
 <DT>
-<A HREF="../Keywords/contents.htm">Keywords</A>
+<A HREF="manual/Keywords/contents.htm">Keywords</A>
 <DD>The keywords from the Tcl/Java Integration man pages.
 </DL>
          </P>
Index: src/pkgIndex.tcl
===================================================================
RCS file: /cvsroot/tcljava/tcljava/src/pkgIndex.tcl,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 pkgIndex.tcl
--- src/pkgIndex.tcl	25 Jul 2003 16:38:35 -0000	1.23
+++ src/pkgIndex.tcl	18 Mar 2005 05:32:53 -0000
@@ -168,6 +168,9 @@ proc loadtclblend {dir} {
     #set extdbg _g
     set extdbg ""
 
+    if {$::tcl_platform(os) == "Darwin"} {
+        lappend tclblend_init "-Djava.library.path=$dir"
+    }
     if {[catch {XpUtils::iload -d $dir -extdbg "" tclblend} errMsg]} {
         error "\"XpUtils::iload -d $dir tclblend\" failed:\n $errMsg"
     }
Index: src/xputils/xputils.tcl
===================================================================
RCS file: /cvsroot/tcljava/tcljava/src/xputils/xputils.tcl,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 xputils.tcl
--- src/xputils/xputils.tcl	29 Oct 2000 06:00:42 -0000	1.2
+++ src/xputils/xputils.tcl	18 Mar 2005 05:32:53 -0000
@@ -36,6 +36,9 @@ proc XpUtils::expandSharedLibName { shor
 	    if {$extdbg == "DEFAULT"} {
 		set extdbg g
 	    }
+	    if {$tcl_platform(os) == "Darwin"} {
+	        set SHLIB_SUFFIX .jnilib
+	    }
         }
         windows {
             set SHLIB_PREFIX {}
@@ -217,6 +220,9 @@ if {0} {
                     set VAR SHLIB_PATH
 		}
 	    }
+	    if {$tcl_platform(os) == "Darwin"} {
+		set VAR DYLD_LIBRARY_PATH
+	    }
 	    
 	}
 	windows {