Mercurial > octave-nkf

comparison configure.ac @ 17844:e88a8fa25125

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
configure.ac: add warnings on checking for JAVA to the final summary.
author Carnë Draug <carandraug@octave.org>
date Mon, 04 Nov 2013 16:51:35 +0000
parents b1610bf6d9a8
children 540d1c122b08
comparison
equal deleted inserted replaced
17843:573f865aa8c8 17844:e88a8fa25125
2378 JAVAC= 2378 JAVAC=
2379 JAR= 2379 JAR=
2380 JAVA_LIBS= 2380 JAVA_LIBS=
2381 2381
2382 ## Fake loop so that "break" can be used to skip code blocks. 2382 ## Fake loop so that "break" can be used to skip code blocks.
2383 warn_java=""
2383 while test $build_java = yes 2384 while test $build_java = yes
2384 do 2385 do
2385 ## Unset build_java. Variable is set only if all configuration tests pass. 2386 ## Unset build_java. Variable is set only if all configuration tests pass.
2386 build_java=no 2387 build_java=no
2387 2388
2388 ## Warn if JAVA_HOME is unset. It is *strongly* advised to specify JAVA_HOME. 2389 ## Warn if JAVA_HOME is unset. It is *strongly* advised to specify JAVA_HOME.
2389 if test -z "$JAVA_HOME"; then 2390 if test -z "$JAVA_HOME"; then
2390 AC_MSG_WARN([JAVA_HOME environment variable not initialized.]) 2391 warn_java_home="JAVA_HOME environment variable not initialized. Auto-detection will proceed but is unreliable."
2391 AC_MSG_WARN([Auto-detection will proceed but is unreliable.]) 2392 OCTAVE_CONFIGURE_WARNING([warn_java_home])
2392 fi 2393 fi
2393 2394
2394 ## Search for a viable Java executable. 2395 ## Search for a viable Java executable.
2395 if test -z "$JAVA_HOME"; then 2396 if test -z "$JAVA_HOME"; then
2396 JAVA_PATH="$PATH" 2397 JAVA_PATH="$PATH"
2398 JAVA_PATH="${JAVA_HOME}$PATH_SEPARATOR${JAVA_HOME}/jre/bin$PATH_SEPARATOR${JAVA_HOME}/bin$PATH_SEPARATOR${JAVA_HOME}/../bin$PATH_SEPARATOR${PATH}" 2399 JAVA_PATH="${JAVA_HOME}$PATH_SEPARATOR${JAVA_HOME}/jre/bin$PATH_SEPARATOR${JAVA_HOME}/bin$PATH_SEPARATOR${JAVA_HOME}/../bin$PATH_SEPARATOR${PATH}"
2399 fi 2400 fi
2400 AC_PATH_PROG(JAVA, java, [], [$JAVA_PATH]) 2401 AC_PATH_PROG(JAVA, java, [], [$JAVA_PATH])
2401 2402
2402 if test -z "$JAVA"; then 2403 if test -z "$JAVA"; then
2403 AC_MSG_WARN([No Java executable found. Octave will not be able to call Java methods.]) 2404 warn_java="No Java executable found. Octave will not be able to call Java methods."
2404 break 2405 break
2405 fi 2406 fi
2406 2407
2407 if test -z "$JAVA_HOME"; then 2408 if test -z "$JAVA_HOME"; then
2408 ## Find JAVA_HOME for JRE by running java and querying properties. 2409 ## Find JAVA_HOME for JRE by running java and querying properties.
2451 java_major=[`echo $java_version | $SED -e 's/^\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*$/\1/'`] 2452 java_major=[`echo $java_version | $SED -e 's/^\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*$/\1/'`]
2452 java_minor=[`echo $java_version | $SED -e 's/^\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*$/\2/'`] 2453 java_minor=[`echo $java_version | $SED -e 's/^\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*$/\2/'`]
2453 if test $java_major -ge 1 && test $java_minor -ge 5; then 2454 if test $java_major -ge 1 && test $java_minor -ge 5; then
2454 : # Version is ok. Do nothing. 2455 : # Version is ok. Do nothing.
2455 else 2456 else
2456 AC_MSG_WARN([Java version is too old (< 1.5). Octave will not be able to call Java methods.]) 2457 warn_java="Java version is too old (< 1.5). Octave will not be able to call Java methods."
2457 break 2458 break
2458 fi 2459 fi
2459 2460
2460 ## At this point Win32 systems have enough configuration data. 2461 ## At this point Win32 systems have enough configuration data.
2461 ## We assume that all appropriate variables (e.g. INCLUDE and LIB) already 2462 ## We assume that all appropriate variables (e.g. INCLUDE and LIB) already
2546 fi 2547 fi
2547 fi 2548 fi
2548 2549
2549 if test -z "$JAVA_LDPATH"; then 2550 if test -z "$JAVA_LDPATH"; then
2550 AC_MSG_RESULT([not found]) 2551 AC_MSG_RESULT([not found])
2551 AC_MSG_WARN([Library $jvmlib not found. Octave will not be able to call Java methods.]) 2552 warn_java="Library $jvmlib not found. Octave will not be able to call Java methods."
2552 break 2553 break
2553 else 2554 else
2554 AC_MSG_RESULT([$JAVA_LDPATH]) 2555 AC_MSG_RESULT([$JAVA_LDPATH])
2555 fi 2556 fi
2556 2557
2588 done 2589 done
2589 if test $have_jni = yes; then 2590 if test $have_jni = yes; then
2590 AC_MSG_RESULT([$dir]) 2591 AC_MSG_RESULT([$dir])
2591 else 2592 else
2592 AC_MSG_RESULT([not found]) 2593 AC_MSG_RESULT([not found])
2593 AC_MSG_WARN([Include file <jni.h> not found. Octave will not be able to call Java methods.]) 2594 warn_java="Include file <jni.h> not found. Octave will not be able to call Java methods."
2594 break 2595 break
2595 fi 2596 fi
2596 2597
2597 ## Passed all configuration tests. A workable Java installation was found. 2598 ## Passed all configuration tests. A workable Java installation was found.
2598 build_java=yes 2599 build_java=yes
2599 AC_DEFINE(HAVE_JAVA, 1, 2600 AC_DEFINE(HAVE_JAVA, 1,
2600 [Define to 1 if Java is available and is at least version 1.5]) 2601 [Define to 1 if Java is available and is at least version 1.5])
2601 break 2602 break
2602 done 2603 done
2604 if test -n "$warn_java"; then
2605 OCTAVE_CONFIGURE_WARNING([warn_java])
2606 fi
2603 2607
2604 AM_CONDITIONAL([AMCOND_HAVE_JAVA], [test $build_java = yes]) 2608 AM_CONDITIONAL([AMCOND_HAVE_JAVA], [test $build_java = yes])
2605 AC_SUBST(JAVA) 2609 AC_SUBST(JAVA)
2606 AC_SUBST(JAVAC) 2610 AC_SUBST(JAVAC)
2607 AC_SUBST(JAR) 2611 AC_SUBST(JAR)