summaryrefslogtreecommitdiff
path: root/ext/java/java.c
diff options
context:
space:
mode:
authorSam Ruby <rubys@php.net>2000-03-13 01:11:36 +0000
committerSam Ruby <rubys@php.net>2000-03-13 01:11:36 +0000
commit6e2c7e51370efd738d22af0a6fa9b2c9ca94ebed (patch)
tree757ac7d72bd9e18f42d0d975773a69b5979fb31b /ext/java/java.c
parent65b6639481065ed1b8ef0078514c05f6a4491992 (diff)
downloadphp-git-6e2c7e51370efd738d22af0a6fa9b2c9ca94ebed.tar.gz
Eliminate java.library ini option in favor of rpath
Diffstat (limited to 'ext/java/java.c')
-rw-r--r--ext/java/java.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/ext/java/java.c b/ext/java/java.c
index f1f5cb17d7..286783c637 100644
--- a/ext/java/java.c
+++ b/ext/java/java.c
@@ -64,7 +64,6 @@ static void *javadl = 0;
static int le_jobject = 0;
-static char *javalib = 0;
static char *classpath = 0;
static char *libpath = 0;
static char *javahome = 0;
@@ -88,8 +87,6 @@ PHP_INI_BEGIN()
NULL, PHP_INI_ALL, OnIniUpdate, &classpath)
PHP_INI_ENTRY1("java.home",
NULL, PHP_INI_ALL, OnIniUpdate, &javahome)
- PHP_INI_ENTRY1("java.library",
- NULL, PHP_INI_ALL, OnIniUpdate, &javalib)
PHP_INI_ENTRY1("java.library.path",
NULL, PHP_INI_ALL, OnIniUpdate, &libpath)
PHP_INI_END()
@@ -150,13 +147,6 @@ static int jvm_create() {
#ifndef PHP_WIN32
if (!libpath) libpath = getenv("LD_LIBRARY_PATH");
- if (javalib) {
- javadl = dlopen(javalib, RTLD_GLOBAL | RTLD_LAZY);
- if (!javadl) {
- php_error(E_ERROR, "Unable to create Java Virtual Machine");
- return -1;
- }
- }
#endif
#ifdef JNI_12