SF.net SVN: openvrml:[4009] trunk

[<br...@us...>]

Revision: 4009
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4009&view=rev
Author:   braden
Date:     2009-10-22 21:54:43 +0000 (Thu, 22 Oct 2009)

Log Message:
-----------
Infer JRE_HOME from JAVA_HOME if only the latter is set.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/configure.ac

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-10-22 05:06:27 UTC (rev 4008)
+++ trunk/ChangeLog	2009-10-22 21:54:43 UTC (rev 4009)
@@ -1,5 +1,10 @@
 2009-10-22 Braden McDaniel  <br...@en...>
 
+	* configure.ac: Infer JRE_HOME from JAVA_HOME if only the latter
+	is set.
+
+2009-10-22 Braden McDaniel  <br...@en...>
+
 	Use boost::filesystem::path when setting the search path for
 	libjvm.
 

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2009-10-22 05:06:27 UTC (rev 4008)
+++ trunk/configure.ac	2009-10-22 21:54:43 UTC (rev 4009)
@@ -371,7 +371,9 @@
 #
 # Script node Java support
 #
-AC_ARG_VAR([JRE_HOME], [Path to Java Runtime Environment])
+AC_ARG_VAR([JAVA_HOME], [Path to Java installation])
+AS_IF([test $JRE_HOME], , [AS_IF([test $JAVA_HOME], [JRE_HOME=$JAVA_HOME])])
+AC_ARG_VAR([JRE_HOME], [Path to Java Runtime Environment [default=JAVA_HOME/jre]])
 AC_ARG_ENABLE([script-node-java],
               [AC_HELP_STRING([--disable-script-node-java],
                               [disable Script node Java support])])


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.