technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Java: fixing configure errors reporting.

Browse Source
This commit is contained in:
Max Romanov
2020-01-28 17:03:19 +03:00
parent 1949be644c
commit 4e0a2002fe
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
auto/modules/java
View File

@@ -84,11 +84,12 @@ if [ -n "${NXT_JAVA_HOME}" ]; then
NXT_JAVA="${NXT_JAVA_HOME}/bin/java"
else
$echo -n "checking for java executable"
$echo -n "checking for java executable ..."
$echo "checking for java executable ..." >> $NXT_AUTOCONF_ERR
NXT_JAVA=`which java || :`
if [ -z "$NXT_JAVA" -o ! -x "$NXT_JAVA" ]; then
$echo " not found"
$echo
$echo $0: error: java executable not found.
$echo
@@ -100,11 +101,12 @@ else
"$NXT_JAVA" -version
$echo -n "checking java.home"
$echo -n "checking java.home ..."
$echo "checking java.home ..." >> $NXT_AUTOCONF_ERR
NXT_JAVA_HOME=`$NXT_JAVA -XshowSettings 2>&1 | grep -F -e java.home | sed -e 's/^.*= //'`
if [ -z "$NXT_JAVA_HOME" ]; then
$echo " not found"
$echo
$echo $0: error: java.home not found.
$echo
@@ -149,10 +151,11 @@ case "$NXT_SYSTEM" in
esac
if [ -z "$NXT_JAVA_LIB_PATH" ]; then
$echo -n "checking library path"
$echo -n "checking library path ..."
$echo "checking library path ..." >> $NXT_AUTOCONF_ERR
if [ ! -x "$NXT_JAVA" ]; then
$echo " not found"
$echo
$echo $0: error: java executable not found.
$echo
@@ -162,6 +165,7 @@ if [ -z "$NXT_JAVA_LIB_PATH" ]; then
NXT_JAVA_LIB_PATH=`$NXT_JAVA -XshowSettings 2>&1 | grep -F -e sun.boot.library.path | sed -e 's/^.*= //'`
if [ -z "$NXT_JAVA_LIB_PATH" ]; then
$echo " not found"
$echo
$echo $0: error: library path not found.
$echo