mirror of
https://github.com/php/php-src.git
synced 2025-08-20 01:14:28 +02:00
adding in PATH check for JavaJar as well...
This commit is contained in:
parent
63874f9017
commit
ba07aa06d8
2 changed files with 20 additions and 4 deletions
|
@ -16,9 +16,17 @@ AC_DEFUN(JAVA_FIND_JAR, [
|
||||||
if test -z "$JAVA_JAR"; then
|
if test -z "$JAVA_JAR"; then
|
||||||
JAVA_JAR='zip -q0'
|
JAVA_JAR='zip -q0'
|
||||||
fi
|
fi
|
||||||
|
else
|
||||||
PHP_SUBST(JAVA_JAR)
|
dnl
|
||||||
|
dnl we have a custom path defined so use it
|
||||||
|
dnl
|
||||||
|
if test -d $PHP_JAVA/bin; then
|
||||||
|
JAVA_JAR=$PHP_JAVA/bin/javac
|
||||||
|
else
|
||||||
|
AC_MSG_ERROR([Unable to locate $PHP_JAVA/bin])
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
|
PHP_SUBST(JAVA_JAR)
|
||||||
AC_MSG_RESULT(`echo $JAVA_JAR`)
|
AC_MSG_RESULT(`echo $JAVA_JAR`)
|
||||||
])
|
])
|
||||||
|
|
||||||
|
|
|
@ -16,9 +16,17 @@ AC_DEFUN(JAVA_FIND_JAR, [
|
||||||
if test -z "$JAVA_JAR"; then
|
if test -z "$JAVA_JAR"; then
|
||||||
JAVA_JAR='zip -q0'
|
JAVA_JAR='zip -q0'
|
||||||
fi
|
fi
|
||||||
|
else
|
||||||
PHP_SUBST(JAVA_JAR)
|
dnl
|
||||||
|
dnl we have a custom path defined so use it
|
||||||
|
dnl
|
||||||
|
if test -d $PHP_JAVA/bin; then
|
||||||
|
JAVA_JAR=$PHP_JAVA/bin/javac
|
||||||
|
else
|
||||||
|
AC_MSG_ERROR([Unable to locate $PHP_JAVA/bin])
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
|
PHP_SUBST(JAVA_JAR)
|
||||||
AC_MSG_RESULT(`echo $JAVA_JAR`)
|
AC_MSG_RESULT(`echo $JAVA_JAR`)
|
||||||
])
|
])
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue