Mercurial > octave-nkf

comparison configure.ac @ 18030:f0427ca399cc stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
configure.ac: Remove unused JAVA_HOME_NATIVE variable. * configure.ac: Remove unused JAVA_HOME_NATIVE variable.
author Rik <rik@octave.org>
date Thu, 28 Nov 2013 17:02:59 -0800
parents 7c0f59b688fc
children c97ee13f1027
comparison
equal deleted inserted replaced
18029:2ef2043a0601 18030:f0427ca399cc
2474 JAVA_TMP_HOME=`"$JAVA" -classpath ${srcdir}/build-aux OctJavaQry JAVA_HOME` 2474 JAVA_TMP_HOME=`"$JAVA" -classpath ${srcdir}/build-aux OctJavaQry JAVA_HOME`
2475 ## Strip directory back to top-level installation dir (JAVA_HOME for JDK). 2475 ## Strip directory back to top-level installation dir (JAVA_HOME for JDK).
2476 JAVA_HOME=`echo $JAVA_TMP_HOME | $SED -e 's|[[/\\]]bin[[/\\]]\?$||' | $SED -e 's|[[/\\]]jre[[/\\]]\?$||'` 2476 JAVA_HOME=`echo $JAVA_TMP_HOME | $SED -e 's|[[/\\]]bin[[/\\]]\?$||' | $SED -e 's|[[/\\]]jre[[/\\]]\?$||'`
2477 fi 2477 fi
2478 2478
2479 case $host_os in 2479 case $build_os in
2480 mingw* | msdosmsvc) 2480 mingw* | msdosmsvc)
2481 ## Under Win32 platform, we want JAVA_HOME to be in MSYS format, that is 2481 ## Under Win32 platform, we want JAVA_HOME to be in MSYS format, that is
2482 ## without colon and backslashes, as it is also used as path separator. 2482 ## without colon and backslashes, as it is also used as path separator.
2483 ## Use quoted paths as Java may be installed in a path with whitespaces 2483 ## Use quoted paths as Java may be installed in a path with whitespaces
2484 ## (e.g. C:\Program Files\Java\...). 2484 ## (e.g. C:\Program Files\Java\...).
2485 if test -n "$JAVA_HOME"; then 2485 if test -n "$JAVA_HOME"; then
2486 JAVA_HOME=`cd "$JAVA_HOME" && pwd` 2486 JAVA_HOME=`cd "$JAVA_HOME" && pwd`
2487 ## Maybe this will be useful in the future, as native Java won't
2488 ## understand MSYS paths.
2489 JAVA_HOME_NATIVE=`cd "$JAVA_HOME" && pwd -W`
2490 fi 2487 fi
2491 ;;
2492 *)
2493 JAVA_HOME_NATIVE="$JAVA_HOME"
2494 ;; 2488 ;;
2495 esac 2489 esac
2496 2490
2497 ## Amend search path for JAVAC and JAR. 2491 ## Amend search path for JAVAC and JAR.
2498 if test -z "$JAVA_HOME"; then 2492 if test -z "$JAVA_HOME"; then