mirror of
https://github.com/php/php-src.git
synced 2024-11-26 03:16:33 +08:00
Updating the error message to state a difference between libraries and
include. Also restoring old for search to keep BC on configure
This commit is contained in:
parent
5c935cb372
commit
f3fc7fe2fd
@ -90,10 +90,10 @@ AC_DEFUN(JAVA_CHECK_LIB, [
|
||||
for i in $PHP_JAVA/include/*; do
|
||||
test -f $i/jni_md.h && JAVA_INCLUDE="$JAVA_INCLUDE $i"
|
||||
done
|
||||
dnl
|
||||
dnl sample JDK v 1.4 path
|
||||
dnl /usr/java/j2sdk1.4.0_01/jre/lib/i386/libjava.so
|
||||
dnl
|
||||
dnl
|
||||
dnl sample JDK v 1.4 path
|
||||
dnl /usr/java/j2sdk1.4.0_01/jre/lib/i386/libjava.so
|
||||
dnl
|
||||
else
|
||||
dnl
|
||||
dnl We have to find everything
|
||||
@ -122,7 +122,7 @@ dnl
|
||||
|
||||
if test -z "$JAVA_INCLUDE"; then
|
||||
AC_MSG_RESULT(no)
|
||||
AC_MSG_ERROR(unable to find Java VM libraries)
|
||||
AC_MSG_ERROR(unable to find Java VM includes)
|
||||
fi
|
||||
|
||||
JAVA_CFLAGS="$JAVA_CFLAGS -D_REENTRANT"
|
||||
@ -157,7 +157,7 @@ if test "$PHP_JAVA" != "no"; then
|
||||
AC_DEFINE(HAVE_JAVA,1,[ ])
|
||||
|
||||
if test -z "$JAVA_LIBPATH"; then
|
||||
AC_MSG_ERROR(unable to find Java VM libraries)
|
||||
AC_MSG_ERROR([unable to find Java VM libraries in $PHP_JAVA])
|
||||
fi
|
||||
|
||||
PHP_ADD_LIBPATH($JAVA_LIBPATH)
|
||||
|
@ -90,10 +90,10 @@ AC_DEFUN(JAVA_CHECK_LIB, [
|
||||
for i in $PHP_JAVA/include/*; do
|
||||
test -f $i/jni_md.h && JAVA_INCLUDE="$JAVA_INCLUDE $i"
|
||||
done
|
||||
dnl
|
||||
dnl sample JDK v 1.4 path
|
||||
dnl /usr/java/j2sdk1.4.0_01/jre/lib/i386/libjava.so
|
||||
dnl
|
||||
dnl
|
||||
dnl sample JDK v 1.4 path
|
||||
dnl /usr/java/j2sdk1.4.0_01/jre/lib/i386/libjava.so
|
||||
dnl
|
||||
else
|
||||
dnl
|
||||
dnl We have to find everything
|
||||
@ -122,7 +122,7 @@ dnl
|
||||
|
||||
if test -z "$JAVA_INCLUDE"; then
|
||||
AC_MSG_RESULT(no)
|
||||
AC_MSG_ERROR(unable to find Java VM libraries)
|
||||
AC_MSG_ERROR(unable to find Java VM includes)
|
||||
fi
|
||||
|
||||
JAVA_CFLAGS="$JAVA_CFLAGS -D_REENTRANT"
|
||||
@ -157,7 +157,7 @@ if test "$PHP_JAVA" != "no"; then
|
||||
AC_DEFINE(HAVE_JAVA,1,[ ])
|
||||
|
||||
if test -z "$JAVA_LIBPATH"; then
|
||||
AC_MSG_ERROR(unable to find Java VM libraries)
|
||||
AC_MSG_ERROR([unable to find Java VM libraries in $PHP_JAVA])
|
||||
fi
|
||||
|
||||
PHP_ADD_LIBPATH($JAVA_LIBPATH)
|
||||
|
Loading…
Reference in New Issue
Block a user