Integration of -ng changes. Changes:

- added support for externally built modules,
- improved support for in-tree shared modules,
- fixed diversion bugs,
- configure displays some informative messages,
- faster static build
  (libtool isn't used anymore for compiling non-PIC objects),
- dependencies comparable to automake's without requiring GNU make or GCC,
- working make clean for non-GNU makes.

2 files changed, 18 insertions, 16 deletions

diff --git a/ext/java/Makefile.am b/ext/java/Makefile.in
index 14fd3a1965..9f8488e1b1 100644
--- a/ext/java/Makefile.am
+++ b/ext/java/Makefile.in
@@ -1,15 +1,17 @@
-# $Id$
 
-SRC=java.c
+DEPTH     = ../..
+topsrcdir = @topsrcdir@
+srcdir    = @srcdir@
+VPATH     = @srcdir@
 
-CFLAGS=@CFLAGS@ @JAVA_CFLAGS@
-INCLUDES=@INCLUDES@ @JAVA_INCLUDE@ -I@top_srcdir@ -I@top_srcdir@/Zend
-EXTRA_LTLIBRARIES=libphp_java.la
-phplib_LTLIBRARIES=@JAVA_SHARED@
-libphp_java_la_SOURCES=$(SRC)
-libphp_java_la_LIBADD=@JAVA_LFLAGS@
-libphp_java_la_LDFLAGS=-avoid-version -module -rpath $(phplibdir)
-EXTRA_LIBS=
+LTLIBRARY_NAME    = libjava.la
+LTLIBRARY_SOURCES = java.c
+LTLIBRARY_LIBADD  = $(JAVA_LFLAGS)
+
+EXTRA_CFLAGS   = $(JAVA_CFLAGS)
+EXTRA_INCLUDES = $(JAVA_INCLUDE)
+
+include $(topsrcdir)/build/ltlib.mk
 
 phplib_DATA=php_java.jar
 php_java.jar : reflect.java
diff --git a/ext/java/config.m4 b/ext/java/config.m4
index 93f2315d18..1cb6f634ba 100644
--- a/ext/java/config.m4
+++ b/ext/java/config.m4
@@ -50,7 +50,7 @@ AC_ARG_WITH(java,
     fi
 
     AC_DEFINE(HAVE_JAVA)
-    PHP_EXTENSION(java, "shared")
+    PHP_EXTENSION(java, shared)
     PHP_BUILD_SHARED
     AC_MSG_RESULT(yes)
   else
@@ -60,9 +60,9 @@ AC_ARG_WITH(java,
   AC_MSG_RESULT(no)
 ])
 
-AC_SUBST(JAVA_CFLAGS)
-AC_SUBST(JAVA_CLASSPATH)
-AC_SUBST(JAVA_INCLUDE)
-AC_SUBST(JAVA_SHARED)
-AC_SUBST(JAVA_LFLAGS)
+PHP_SUBST(JAVA_CFLAGS)
+PHP_SUBST(JAVA_CLASSPATH)
+PHP_SUBST(JAVA_INCLUDE)
+PHP_SUBST(JAVA_SHARED)
+PHP_SUBST(JAVA_LFLAGS)