Fix for Mac launch scripts - find right Java executable to avoid DYLD_LIBRARY_PATH problems.

git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11329 bbc10eb1-c90d-0410-af57-cb519fbb1720

prism/src/bin/prism.darwin32

@@ -15,8 +15,14 @@ fi;
 
 # Command to launch Java
 if [ "$PRISM_JAVA" = "" ]; then
+	# On OS X, we want to avoiding calling java from the /usr/bin link
+	# since it causes problems with dynamic linking (DYLD_LIBRARY_PATH)
+	if [ -x /usr/libexec/java_home ]; then
+		PRISM_JAVA=`/usr/libexec/java_home`"/bin/java"
+	else
 		PRISM_JAVA=java
 	fi
+fi
 
 # If there is a -javamaxmem switch, use it for PRISM_JAVAMAXMEM
 ARGS=( "$@" )

prism/src/bin/prism.darwin64

@@ -15,8 +15,14 @@ fi;
 
 # Command to launch Java
 if [ "$PRISM_JAVA" = "" ]; then
+	# On OS X, we want to avoiding calling java from the /usr/bin link
+	# since it causes problems with dynamic linking (DYLD_LIBRARY_PATH)
+	if [ -x /usr/libexec/java_home ]; then
+		PRISM_JAVA=`/usr/libexec/java_home`"/bin/java"
+	else
 		PRISM_JAVA=java
 	fi
+fi
 
 # If there is a -javamaxmem switch, use it for PRISM_JAVAMAXMEM
 ARGS=( "$@" )