[Octave-cvsupdate] octave-forge/extra/java/src Makeconf.in, 1.3, 1.4 Makefile, 1.8, 1.9 __java__.cc, 1.36, 1.37 configure.base, 1.7, 1.8

[Michael G. <gof...@us...>]

Update of /cvsroot/octave/octave-forge/extra/java/src
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22372

Modified Files:
	Makeconf.in Makefile __java__.cc configure.base 
Log Message:
use JAVA_HOME to locate JVM library

Index: Makeconf.in
===================================================================
RCS file: /cvsroot/octave/octave-forge/extra/java/src/Makeconf.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makeconf.in	25 Sep 2007 15:01:19 -0000	1.3
+++ Makeconf.in	25 Sep 2007 19:54:53 -0000	1.4
@@ -57,6 +57,7 @@
 JAVAC = @JAVAC@
 JAR = @JAR@
 JAVA_ARCH = @JAVA_ARCH@
+JAVA_HOME = @JAVA_HOME@
 JAVA_LIBS = @JAVA_LIBS@
 JAVA_INCS = @JAVA_INCS@
 HAVE_JAVA = @HAVE_JAVA@

Index: __java__.cc
===================================================================
RCS file: /cvsroot/octave/octave-forge/extra/java/src/__java__.cc,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- __java__.cc	25 Sep 2007 15:01:19 -0000	1.36
+++ __java__.cc	25 Sep 2007 19:54:53 -0000	1.37
@@ -322,7 +322,7 @@
 
 #else
 
-  std::string jvm_lib_path = std::string("/usr/lib/jvm/jre/lib/")+JAVA_ARCH+"/client/libjvm.so";
+  std::string jvm_lib_path = JAVA_HOME+std::string("/jre/lib/")+JAVA_ARCH+"/client/libjvm.so";
 
 #endif
 	

Index: Makefile
===================================================================
RCS file: /cvsroot/octave/octave-forge/extra/java/src/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile	25 Sep 2007 15:01:19 -0000	1.8
+++ Makefile	25 Sep 2007 19:54:53 -0000	1.9
@@ -27,7 +27,7 @@
 	if [ "X$(JAVA_ARCH)X" = "XX" ]; then \
 		$(MKOCTFILE) $(JAVA_INCS) -o $@ $^ $(JAVA_LIBS); \
 	else \
-		$(MKOCTFILE) -DJAVA_ARCH=\\\"$(JAVA_ARCH)\\\" $(JAVA_INCS) -o $@ $^ $(JAVA_LIBS); \
+		$(MKOCTFILE) -DJAVA_ARCH=\\\"$(JAVA_ARCH)\\\" -DJAVA_HOME=\\\"$(JAVA_HOME)\\\" $(JAVA_INCS) -o $@ $^ $(JAVA_LIBS); \
 	fi
 
 octave.jar: $(JAVA_CLASSES)

Index: configure.base
===================================================================
RCS file: /cvsroot/octave/octave-forge/extra/java/src/configure.base,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- configure.base	25 Sep 2007 15:01:19 -0000	1.7
+++ configure.base	25 Sep 2007 19:54:53 -0000	1.8
@@ -304,11 +304,13 @@
 
 AC_SUBST(JAVAC)
 AC_SUBST(JAR)
+AC_SUBST(JAVA_HOME)
 AC_SUBST(JAVA_ARCH)
 AC_SUBST(JAVA_INCS)
 AC_SUBST(JAVA_LIBS)
 AC_SUBST(HAVE_JAVA)
 
+AC_CHECK_PROG(JAVA, java, java)
 AC_CHECK_PROG(JAVAC, javac, javac)
 AC_CHECK_PROG(JAR, jar, jar)
 HAVE_JAVA="Java Development Kit not found"
@@ -326,11 +328,11 @@
       LFLAGS="$LFLAGS -framework JavaVM"
     else
       AC_MSG_CHECKING([for Java version])
-      java_version=[`$JAVAC -version 2>&1 | sed -e 's/^javac[^0-9]*//'`]
+      java_version=[`$JAVA -version 2>&1 | sed -n -e 's/^java version[^0-9"]*"\([^"]*\)"/\1/p'`]
       AC_MSG_RESULT($java_version)
       java_major=[`echo -n $java_version | sed -e 's/^\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*$/\1/'`]
       java_minor=[`echo -n $java_version | sed -e 's/^\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*$/\2/'`]
-      if test $java_major -ge 1 -a $java_minor -ge 2; then
+      if test $java_major -ge 1 -a $java_minor -ge 5; then
         case "$canonical_host_type" in
         *-cygwin* | *-mingw* | *-msdosmsvc*)
 	        HAVE_JAVA=yes
@@ -361,7 +363,7 @@
 	    ;;    
         esac
       else
-        AC_MSG_WARN([this package requires at least Java-1.2])
+        AC_MSG_WARN([this package requires at least Java-1.5])
       fi
     fi
 fi