From: Sam Ruby <rubys@php.net>
Date: Thu, 27 Jan 2000 02:13:21 +0000 (+0000)
Subject: Forward progress, thanks to Sascha Schumann.
X-Git-Tag: BEFORE_SAPIFICATION_FEB_10_2000~179
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=31e34665567658dc6f5a2eaf2bcb8c41cc8aab4c;p=php

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!
---

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)