summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Ruby <rubys@php.net>2000-01-27 02:13:21 +0000
committerSam Ruby <rubys@php.net>2000-01-27 02:13:21 +0000
commit31e34665567658dc6f5a2eaf2bcb8c41cc8aab4c (patch)
tree156d4e3919a29487a85d0b0431961c157a43cc59
parentd0cb4d09aa778d2936943fa8c0c1283ef8bafb2a (diff)
downloadphp-git-31e34665567658dc6f5a2eaf2bcb8c41cc8aab4c.tar.gz
Forward progress, thanks to Sascha Schumann.
libphp_java.so is now built again - it just refuses to load. At least I now have something I can debug!
-rw-r--r--ext/java/Makefile.in4
-rw-r--r--ext/java/config.m41
-rw-r--r--ext/rpc/Makefile.in4
-rw-r--r--ext/rpc/java/Makefile.in4
-rw-r--r--ext/rpc/java/config.m41
5 files changed, 9 insertions, 5 deletions
diff --git a/ext/java/Makefile.in b/ext/java/Makefile.in
index f0fa6c4032..e8f0dc4466 100644
--- a/ext/java/Makefile.in
+++ b/ext/java/Makefile.in
@@ -4,13 +4,15 @@ topsrcdir = @topsrcdir@
srcdir = @srcdir@
VPATH = @srcdir@
-LTLIBRARY_NAME = libphp_java.la
+LTLIBRARY_SHARED_NAME = libphp_java.la
LTLIBRARY_SOURCES = java.c
LTLIBRARY_DEPENDENCIES = php_java.jar
EXTRA_CFLAGS = $(JAVA_CFLAGS)
EXTRA_INCLUDES = $(JAVA_INCLUDE)
+make_shared = yes
+
include $(topsrcdir)/build/ltlib.mk
php_java.jar : reflect.java
diff --git a/ext/java/config.m4 b/ext/java/config.m4
index 3c1295ab9c..d8536b9196 100644
--- a/ext/java/config.m4
+++ b/ext/java/config.m4
@@ -58,7 +58,6 @@ AC_ARG_WITH(java,
AC_DEFINE(HAVE_JAVA,1,[ ])
PHP_EXTENSION(java, shared)
- PHP_BUILD_SHARED
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
diff --git a/ext/rpc/Makefile.in b/ext/rpc/Makefile.in
index f0fa6c4032..e8f0dc4466 100644
--- a/ext/rpc/Makefile.in
+++ b/ext/rpc/Makefile.in
@@ -4,13 +4,15 @@ topsrcdir = @topsrcdir@
srcdir = @srcdir@
VPATH = @srcdir@
-LTLIBRARY_NAME = libphp_java.la
+LTLIBRARY_SHARED_NAME = libphp_java.la
LTLIBRARY_SOURCES = java.c
LTLIBRARY_DEPENDENCIES = php_java.jar
EXTRA_CFLAGS = $(JAVA_CFLAGS)
EXTRA_INCLUDES = $(JAVA_INCLUDE)
+make_shared = yes
+
include $(topsrcdir)/build/ltlib.mk
php_java.jar : reflect.java
diff --git a/ext/rpc/java/Makefile.in b/ext/rpc/java/Makefile.in
index f0fa6c4032..e8f0dc4466 100644
--- a/ext/rpc/java/Makefile.in
+++ b/ext/rpc/java/Makefile.in
@@ -4,13 +4,15 @@ topsrcdir = @topsrcdir@
srcdir = @srcdir@
VPATH = @srcdir@
-LTLIBRARY_NAME = libphp_java.la
+LTLIBRARY_SHARED_NAME = libphp_java.la
LTLIBRARY_SOURCES = java.c
LTLIBRARY_DEPENDENCIES = php_java.jar
EXTRA_CFLAGS = $(JAVA_CFLAGS)
EXTRA_INCLUDES = $(JAVA_INCLUDE)
+make_shared = yes
+
include $(topsrcdir)/build/ltlib.mk
php_java.jar : reflect.java
diff --git a/ext/rpc/java/config.m4 b/ext/rpc/java/config.m4
index 3c1295ab9c..d8536b9196 100644
--- a/ext/rpc/java/config.m4
+++ b/ext/rpc/java/config.m4
@@ -58,7 +58,6 @@ AC_ARG_WITH(java,
AC_DEFINE(HAVE_JAVA,1,[ ])
PHP_EXTENSION(java, shared)
- PHP_BUILD_SHARED
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)