Index: Makefile.in
===================================================================
--- Makefile.in	(revision 10927)
+++ Makefile.in	(working copy)
@@ -100,6 +100,8 @@
 LT_LDFLAGS = @LT_LDFLAGS@
 LT_NO_UNDEFINED = @LT_NO_UNDEFINED@
 LT_CXX_LIBADD = @LT_CXX_LIBADD@
+LT_SHLIBPATH_VAR = @LT_SHLIBPATH_VAR@
+LT_SHLIBPATH_PREFIX = @LT_SHLIBPATH_PREFIX@
 
 INCLUDES = @SVN_EXTRA_INCLUDES@ @SVN_NEON_INCLUDES@                    \
            @SVN_APR_INCLUDES@ @SVN_APRUTIL_INCLUDES@
@@ -317,10 +319,15 @@
 install-static: @INSTALL_STATIC_RULES@
 
 # JavaHL target aliases
-javahl: javahl-java javahl-javah javahl-lib @JAVAHL_TESTS_TARGET@
+SVN_JAVAHL_LTLIB=subversion/bindings/java/javahl/native/libsvnjavahl-1.la
+javahl: $(top_srcdir)/subversion/bindings/java/javahl/classes \
+	javahl-java javahl-javah javahl-lib @JAVAHL_TESTS_TARGET@
+$(top_srcdir)/subversion/bindings/java/javahl/classes:
+	$(MKDIR) $@
+
 install-javahl: install-javahl-java install-javahl-javah install-javahl-lib
 check-javahl:
-	$(JAVA) -Djava.library.path=$(libdir) -classpath subversion/bindings/java/javahl/classes:$(javahl_tests_CLASSPATH) org.tigris.subversion.javahl.tests.BasicTests
+	$(LIBTOOL) -dlopen $(SVN_JAVAHL_LTLIB) --mode=execute $(JAVA) -Djava.library-path=$(LT_SHLIBPATH_PREFIX)subversion/bindings/java/javahl/native/.libs:$(libdir) -classpath subversion/bindings/java/javahl/classes:$(javahl_tests_CLASSPATH) org.tigris.subversion.javahl.tests.BasicTests
 
 # Different versions of SWIG generate the Java source files in
 # different directories.
Index: configure.in
===================================================================
--- configure.in	(revision 10927)
+++ configure.in	(working copy)
@@ -242,6 +242,11 @@
 esac
 AC_SUBST(LT_NO_UNDEFINED)
 
+AC_MSG_CHECKING([for shared library path variable name])
+LT_SHLIBPATH_VAR=$shlibpath_var
+AC_MSG_RESULT([$LT_SHLIBPATH_VAR])
+AC_SUBST(LT_SHLIBPATH_VAR)
+
 NEON_WANTED_REGEX="`sed -n '/NEON_WANTED_REGEX=/s/.*=//p' $srcdir/build/buildcheck.sh`"
 dnl You can skip the neon version check only if you know what you are doing 
 AC_ARG_ENABLE(neon-version-check,
@@ -663,6 +668,15 @@
   else
     AC_MSG_RESULT([none needed])
   fi
+  AC_MSG_CHECKING([for shared library path prefix for testcases])
+  if test -n "$LT_SHLIBPATH_VAR"; then
+  	LT_SHLIBPATH_PREFIX='\\$$$(LT_SHLIBPATH_VAR):'
+	AC_MSG_RESULT([$LT_SHLIBPATH_PREFIX])
+  else
+  	LT_SHLIBPATH_PREFIX=""
+	AC_MSG_RESULT([none])
+  fi
+  AC_SUBST(LT_SHLIBPATH_PREFIX)
 fi
 AC_SUBST(INSTALL_EXTRA_JAVAHL_LIB)
 AC_SUBST(LT_CXX_LIBADD)