]>
Commit | Line | Data |
---|---|---|
9d6174b1 | 1 | diff -Nur php-4.2.0/ext/java.orig/Makefile.in php-4.2.0/ext/java/Makefile.in |
2 | --- php-4.2.0/ext/java.orig/Makefile.in Sun Apr 14 02:40:57 2002 | |
3 | +++ php-4.2.0/ext/java/Makefile.in Thu May 2 00:35:25 2002 | |
4 | @@ -4,7 +4,7 @@ | |
5 | LTLIBRARY_DEPENDENCIES = php_java.jar | |
6 | ||
7 | LTLIBRARY_LDFLAGS = $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) | |
8 | -LTLIBRARY_SHARED_LIBADD = $(LTLIBRARY_DEPENDENCIES) $(EXTRA_LIBS) | |
9 | +LTLIBRARY_SHARED_LIBADD = $(LTLIBRARY_DEPENDENCIES) $(EXTRA_LIBS) $(JAVA_SHARED_LIBADD) | |
10 | ||
11 | EXTRA_CFLAGS = $(JAVA_CFLAGS) | |
12 | EXTRA_INCLUDES = $(JAVA_INCLUDE) | |
13 | diff -Nur php-4.2.0/ext/java.orig/config.m4 php-4.2.0/ext/java/config.m4 | |
14 | --- php-4.2.0/ext/java.orig/config.m4 Sun Apr 14 02:40:57 2002 | |
15 | +++ php-4.2.0/ext/java/config.m4 Thu May 2 00:37:36 2002 | |
16 | @@ -8,6 +8,7 @@ | |
17 | This extension is always built as shared.], | |
18 | [ | |
19 | if test "$withval" != "no"; then | |
20 | + ext_shared=yes | |
21 | JAVA_SHARED=libphp_java.la | |
22 | ||
23 | pltform=`uname -s 2>/dev/null` | |
24 | @@ -111,7 +111,6 @@ | |
25 | PHP_EXTENSION(java, shared) | |
26 | ||
27 | - if test "$PHP_SAPI" = "cgi"; then | |
28 | - PHP_ADD_LIBRARY($JAVA_LIB) | |
29 | + PHP_SUBST(JAVA_SHARED_LIBADD) | |
30 | + PHP_ADD_LIBRARY($JAVA_LIB,, JAVA_SHARED_LIBADD) | |
31 | - fi | |
32 | ||
33 | INSTALL_IT="$INSTALL_IT; \$(srcdir)/build/shtool mkdir -p -f -m 0755 \$(INSTALL_ROOT)\$(libdir)" |