Revision: 10762
http://octave.svn.sourceforge.net/octave/?rev=10762&view=rev
Author: thomas-weber
Date: 2012-07-22 21:06:01 +0000 (Sun, 22 Jul 2012)
Log Message:
-----------
Change logic for JAVA_ARCH so that it uses an externally set value.
The diff looks larger than it is due to indenting. It just closes an "if" tag
earlier.
Modified Paths:
--------------
trunk/octave-forge/extra/java/src/configure.base
Modified: trunk/octave-forge/extra/java/src/configure.base
===================================================================
--- trunk/octave-forge/extra/java/src/configure.base 2012-07-21 10:29:28 UTC (rev 10761)
+++ trunk/octave-forge/extra/java/src/configure.base 2012-07-22 21:06:01 UTC (rev 10762)
@@ -374,19 +374,19 @@
elif test -d "${JAVA_HOME}/jre/lib/solarisv9"; then
JAVA_ARCH="solarisv9"
fi
- if test -n "$JAVA_ARCH"; then
- HAVE_JAVA=yes
- case "$canonical_host_type" in
- *-mingw* | *-cygwin*)
- JAVA_LIBS=-ladvapi32
- JAVA_INCS="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/win32"
- ;;
- *)
- JAVA_INCS="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux"
- ;;
- esac
- fi
fi
+ if test -n "$JAVA_ARCH"; then
+ HAVE_JAVA=yes
+ case "$canonical_host_type" in
+ *-mingw* | *-cygwin*)
+ JAVA_LIBS=-ladvapi32
+ JAVA_INCS="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/win32"
+ ;;
+ *)
+ JAVA_INCS="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux"
+ ;;
+ esac
+ fi
;;
esac
else
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
