php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-26 09:12:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

JAVA_LIBPATH was not allways being added to the LIBPATH

Browse Source
This commit is contained in:
Sam Ruby
2000-03-26 04:31:53 +00:00
parent a2d42419a5
commit fcd82d34c5
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ext/java/config.m4
View File

@@ -39,7 +39,6 @@ AC_ARG_WITH(java,
fi
elif test -f $withval/lib/libjava.so; then
AC_ADD_LIBPATH($withval/lib)
JAVA_LIB=java
JAVA_LIBPATH=$withval/lib
JAVA_INCLUDE="-I$withval/include"
@@ -66,7 +65,6 @@ AC_ARG_WITH(java,
if test -f $i/libjava.so; then
JAVA_LIB=java
JAVA_LIBPATH=$i
AC_ADD_LIBPATH($i)
test -d $i/classic && AC_ADD_LIBPATH($i/classic)
test -d $i/native_threads && AC_ADD_LIBPATH($i/native_threads)
fi
@@ -81,6 +79,7 @@ AC_ARG_WITH(java,
fi
AC_DEFINE(HAVE_JAVA,1,[ ])
AC_ADD_LIBPATH($JAVA_LIBPATH)
JAVA_CFLAGS="$JAVA_CFLAGS '-DJAVALIB=\"$JAVA_LIBPATH/lib$JAVA_LIB.so\"'"
if test "$PHP_SAPI" != "servlet"; then

3
ext/rpc/java/config.m4
View File

@@ -39,7 +39,6 @@ AC_ARG_WITH(java,
fi
elif test -f $withval/lib/libjava.so; then
AC_ADD_LIBPATH($withval/lib)
JAVA_LIB=java
JAVA_LIBPATH=$withval/lib
JAVA_INCLUDE="-I$withval/include"
@@ -66,7 +65,6 @@ AC_ARG_WITH(java,
if test -f $i/libjava.so; then
JAVA_LIB=java
JAVA_LIBPATH=$i
AC_ADD_LIBPATH($i)
test -d $i/classic && AC_ADD_LIBPATH($i/classic)
test -d $i/native_threads && AC_ADD_LIBPATH($i/native_threads)
fi
@@ -81,6 +79,7 @@ AC_ARG_WITH(java,
fi
AC_DEFINE(HAVE_JAVA,1,[ ])
AC_ADD_LIBPATH($JAVA_LIBPATH)
JAVA_CFLAGS="$JAVA_CFLAGS '-DJAVALIB=\"$JAVA_LIBPATH/lib$JAVA_LIB.so\"'"
if test "$PHP_SAPI" != "servlet"; then