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.

23 files changed, 111 insertions, 46 deletions

diff --git a/sapi/Makefile.am b/sapi/Makefile.am
deleted file mode 100644
index 58d6fae738..0000000000
--- a/sapi/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-
-SUBDIRS = $(PHP_SAPI)
-
diff --git a/sapi/Makefile.in b/sapi/Makefile.in
new file mode 100644
index 0000000000..de717b6e58
--- /dev/null
+++ b/sapi/Makefile.in
@@ -0,0 +1,9 @@
+
+DEPTH     = ..
+topsrcdir = @topsrcdir@
+srcdir    = @srcdir@
+VPATH     = @srcdir@
+
+SUBDIRS = $(PHP_SAPI)
+
+include $(topsrcdir)/build/rules.mk
diff --git a/sapi/aolserver/Makefile.am b/sapi/aolserver/Makefile.am
deleted file mode 100644
index 357d9bf151..0000000000
--- a/sapi/aolserver/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-
-noinst_LTLIBRARIES=libphpsapi_aolserver.la
-libphpsapi_aolserver_la_SOURCES=aolserver.c
diff --git a/sapi/aolserver/Makefile.in b/sapi/aolserver/Makefile.in
new file mode 100644
index 0000000000..599ea22135
--- /dev/null
+++ b/sapi/aolserver/Makefile.in
@@ -0,0 +1,10 @@
+
+DEPTH     = ../..
+topsrcdir = @topsrcdir@
+srcdir    = @srcdir@
+VPATH     = @srcdir@
+
+LTLIBRARY_NAME    = libsapi.la
+LTLIBRARY_SOURCES = aolserver.c
+
+include $(topsrcdir)/build/ltlib.mk
diff --git a/sapi/aolserver/config.m4 b/sapi/aolserver/config.m4
index e38fa3796a..e2377a473b 100644
--- a/sapi/aolserver/config.m4
+++ b/sapi/aolserver/config.m4
@@ -14,7 +14,7 @@ AC_ARG_WITH(aolserver,
 	AC_DEFINE(HAVE_AOLSERVER,1,[Whether you have AOLserver])
 	PHP_SAPI=aolserver
 	PHP_BUILD_SHARED
-	INSTALL_IT="\$(SHELL) \$(srcdir)/install-sh -m 0755 $SAPI_SHARED $NS_DIR/root/bin/"
+	INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED $NS_DIR/root/bin/"
 	RESULT=yes
 ])
 AC_MSG_RESULT($RESULT)
diff --git a/sapi/apache/Makefile.am b/sapi/apache/Makefile.am
deleted file mode 100644
index ba36956a5f..0000000000
--- a/sapi/apache/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-
-APACHE_INCLUDE=@APACHE_INCLUDE@
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/Zend $(APACHE_INCLUDE)
-noinst_LTLIBRARIES=libphpsapi_apache.la
-libphpsapi_apache_la_SOURCES=sapi_apache.c mod_php4.c
diff --git a/sapi/apache/Makefile.in b/sapi/apache/Makefile.in
new file mode 100644
index 0000000000..e591d4a8bb
--- /dev/null
+++ b/sapi/apache/Makefile.in
@@ -0,0 +1,12 @@
+
+DEPTH     = ../..
+topsrcdir = @topsrcdir@
+srcdir    = @srcdir@
+VPATH     = @srcdir@
+
+LTLIBRARY_NAME    = libsapi.la
+LTLIBRARY_SOURCES = sapi_apache.c mod_php4.c
+
+include $(topsrcdir)/build/ltlib.mk
+
+INCLUDES += $(APACHE_INCLUDE)
diff --git a/sapi/apache/config.m4 b/sapi/apache/config.m4
index 4f1a65b2c9..a9c26ee3bd 100644
--- a/sapi/apache/config.m4
+++ b/sapi/apache/config.m4
@@ -193,20 +193,20 @@ AC_ARG_WITH(apache,
 ])
 
 INCLUDES="$INCLUDES $APACHE_INCLUDE"
-dnl## AC_SUBST(APACHE_INCLUDE)
+dnl## PHP_SUBST(APACHE_INCLUDE)
 fi
 
 if test "x$APXS" != "x" -a "`uname -sv`" = "AIX 4" -a "$GCC" != "yes"; then
 	APXS_EXP="-bE:sapi/apache/mod_php4.exp"
 fi
 
-AC_SUBST(APXS_EXP)
-AC_SUBST(APACHE_INCLUDE)
-AC_SUBST(APACHE_TARGET)
-AC_SUBST(APXS)
-AC_SUBST(APXS_LDFLAGS)
-AC_SUBST(APACHE_INSTALL)
-AC_SUBST(STRONGHOLD)
+PHP_SUBST(APXS_EXP)
+PHP_SUBST(APACHE_INCLUDE)
+PHP_SUBST(APACHE_TARGET)
+PHP_SUBST(APXS)
+PHP_SUBST(APXS_LDFLAGS)
+PHP_SUBST(APACHE_INSTALL)
+PHP_SUBST(STRONGHOLD)
 
 AC_MSG_CHECKING(for mod_charset compatibility option)
 AC_ARG_WITH(mod_charset,
@@ -232,7 +232,7 @@ if test -n "$APACHE_MODULE"; then
   else
     APACHE_WANT_HSREGEX=no
   fi
-  AC_SUBST(APACHE_WANT_HSREGEX)
+  PHP_SUBST(APACHE_WANT_HSREGEX)
   PHP_APACHE_CHECK_RDYNAMIC
   PHP_EXTENSION(apache)
   PHP_OUTPUT(sapi/apache/libphp4.module)
diff --git a/sapi/cgi/Makefile.am b/sapi/cgi/Makefile.am
deleted file mode 100644
index 63ec80dc4c..0000000000
--- a/sapi/cgi/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-
-noinst_LTLIBRARIES=libphpsapi_cgi.la
-libphpsapi_cgi_la_SOURCES=cgi_main.c
diff --git a/sapi/cgi/Makefile.in b/sapi/cgi/Makefile.in
new file mode 100644
index 0000000000..3519692fd1
--- /dev/null
+++ b/sapi/cgi/Makefile.in
@@ -0,0 +1,10 @@
+
+DEPTH     = ../..
+topsrcdir = @topsrcdir@
+srcdir    = @srcdir@
+VPATH     = @srcdir@
+
+LTLIBRARY_NAME    = libsapi.la
+LTLIBRARY_SOURCES = cgi_main.c
+
+include $(topsrcdir)/build/ltlib.mk
diff --git a/sapi/cgi/config.m4 b/sapi/cgi/config.m4
index cd872d5cbc..09d4aa9362 100644
--- a/sapi/cgi/config.m4
+++ b/sapi/cgi/config.m4
@@ -46,7 +46,7 @@ AC_ARG_ENABLE(discard_path,
 fi
 
 if test "$PHP_SAPI" = "cgi" ; then
-  INSTALL_IT="\$(SHELL) \$(srcdir)/install-sh -m 0755 $SAPI_PROGRAM \$(bindir)/$SAPI_CGI"
+  INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_PROGRAM \$(bindir)/$SAPI_CGI"
 fi
 
 AC_MSG_CHECKING(for fhttpd module support)
diff --git a/sapi/isapi/Makefile.am b/sapi/isapi/Makefile.am
deleted file mode 100644
index f0fb1f9daa..0000000000
--- a/sapi/isapi/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-
-noinst_LTLIBRARIES=libphpsapi_isapi.la
-libphpsapi_isapi_la_SOURCES=php4isapi.c
-
diff --git a/sapi/isapi/Makefile.in b/sapi/isapi/Makefile.in
new file mode 100644
index 0000000000..f1425b1645
--- /dev/null
+++ b/sapi/isapi/Makefile.in
@@ -0,0 +1,10 @@
+
+DEPTH     = ../..
+topsrcdir = @topsrcdir@
+srcdir    = @srcdir@
+VPATH     = @srcdir@
+
+LTLIBRARY_NAME    = libsapi.la
+LTLIBRARY_SOURCES = php4isapi.c
+
+include $(topsrcdir)/build/ltlib.mk
diff --git a/sapi/phttpd/Makefile.am b/sapi/phttpd/Makefile.am
deleted file mode 100644
index 6430c64bc5..0000000000
--- a/sapi/phttpd/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-noinst_LTLIBRARIES=libphpsapi_phttpd.la
-libphpsapi_phttpd_la_SOURCES=phttpd.c
diff --git a/sapi/phttpd/Makefile.in b/sapi/phttpd/Makefile.in
new file mode 100644
index 0000000000..ab0413fad0
--- /dev/null
+++ b/sapi/phttpd/Makefile.in
@@ -0,0 +1,10 @@
+
+DEPTH     = ../..
+topsrcdir = @topsrcdir@
+srcdir    = @srcdir@
+VPATH     = @srcdir@
+
+LTLIBRARY_NAME    = libsapi.la
+LTLIBRARY_SOURCES = phttpd.c
+
+include $(topsrcdir)/build/ltlib.mk
diff --git a/sapi/phttpd/config.m4 b/sapi/phttpd/config.m4
index 21dbe1fb31..10460b84e0 100644
--- a/sapi/phttpd/config.m4
+++ b/sapi/phttpd/config.m4
@@ -14,7 +14,7 @@ AC_ARG_WITH(phttpd,
 	AC_DEFINE(HAVE_PHTTPD,1,[Whether you have phttpd])
 	PHP_SAPI=phttpd
 	PHP_BUILD_SHARED
-	INSTALL_IT="\$(SHELL) \$(srcdir)/install-sh -m 0755 $SAPI_SHARED $PHTTPD_DIR/modules/"
+	INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED $PHTTPD_DIR/modules/"
 	RESULT=yes
 ])
 AC_MSG_RESULT($RESULT)
diff --git a/sapi/roxen/Makefile.am b/sapi/roxen/Makefile.am
deleted file mode 100644
index 1b24bb6e4f..0000000000
--- a/sapi/roxen/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-
-noinst_LTLIBRARIES=libphpsapi_roxen.la
-libphpsapi_roxen_la_SOURCES=roxen.c
diff --git a/sapi/roxen/Makefile.in b/sapi/roxen/Makefile.in
new file mode 100644
index 0000000000..02afc96179
--- /dev/null
+++ b/sapi/roxen/Makefile.in
@@ -0,0 +1,10 @@
+
+DEPTH     = ../..
+topsrcdir = @topsrcdir@
+srcdir    = @srcdir@
+VPATH     = @srcdir@
+
+LTLIBRARY_NAME    = libsapi.la
+LTLIBRARY_SOURCES = roxen.c
+
+include $(topsrcdir)/build/ltlib.mk
diff --git a/sapi/servlet/Makefile.am b/sapi/servlet/Makefile.in
index 11103e5541..d0fd7a29b2 100644
--- a/sapi/servlet/Makefile.am
+++ b/sapi/servlet/Makefile.in
@@ -1,11 +1,16 @@
-# $Id$
 
-SRC=servlet.c java.c
+DEPTH     = ../..
+topsrcdir = @topsrcdir@
+srcdir    = @srcdir@
+VPATH     = @srcdir@
 
-CFLAGS=@CFLAGS@ @JAVA_CFLAGS@
-INCLUDES=@INCLUDES@ @JAVA_INCLUDE@ -I@top_srcdir@ -I@top_srcdir@/Zend
-noinst_LTLIBRARIES=libphpsapi_servlet.la
-libphpsapi_servlet_la_SOURCES=$(SRC)
+LTLIBRARY_NAME    = libsapi.la
+LTLIBRARY_SOURCES = servlet.c java.c
+
+include $(topsrcdir)/build/ltlib.mk
+
+CFLAGS += $(JAVA_CFLAGS)
+INCLUDES += $(JAVA_INCLUDE)
 
 java.c : ../../ext/java/java.c
 	@cp ../../ext/java/java.c .
diff --git a/sapi/servlet/config.m4 b/sapi/servlet/config.m4
index 28c3ed1ba2..3259fe86d6 100644
--- a/sapi/servlet/config.m4
+++ b/sapi/servlet/config.m4
@@ -37,4 +37,4 @@ AC_ARG_WITH(servlet,
   AC_MSG_RESULT(no)
 ])
 
-AC_SUBST(SERVLET_CLASSPATH)
+PHP_SUBST(SERVLET_CLASSPATH)
diff --git a/sapi/thttpd/Makefile.am b/sapi/thttpd/Makefile.am
deleted file mode 100644
index 3affcbf4ff..0000000000
--- a/sapi/thttpd/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-noinst_LTLIBRARIES = libphpsapi_thttpd.la
-libphpsapi_thttpd_la_SOURCES = thttpd.c
diff --git a/sapi/thttpd/Makefile.in b/sapi/thttpd/Makefile.in
new file mode 100644
index 0000000000..4ebb9d6a1a
--- /dev/null
+++ b/sapi/thttpd/Makefile.in
@@ -0,0 +1,10 @@
+
+DEPTH     = ../..
+topsrcdir = @topsrcdir@
+srcdir    = @srcdir@
+VPATH     = @srcdir@
+
+LTLIBRARY_NAME    = libsapi.la
+LTLIBRARY_SOURCES = thttpd.c
+
+include $(topsrcdir)/build/ltlib.mk
diff --git a/sapi/thttpd/config.m4 b/sapi/thttpd/config.m4
index 79ae3dbde1..50d37a87e3 100644
--- a/sapi/thttpd/config.m4
+++ b/sapi/thttpd/config.m4
@@ -8,9 +8,13 @@ AC_ARG_WITH(thttpd,
     cp $abs_srcdir/sapi/thttpd/php_thttpd.h $SAPI_STATIC $THTTPD;\
     test -f $THTTPD/php_patched || \
     (cd $THTTPD && patch < $abs_srcdir/sapi/thttpd/thttpd_patch && touch php_patched)"
-  AC_MSG_CHECKING(for thttpd)
-  AC_MSG_RESULT(yes - $THTTPD)
+  PHP_THTTPD="yes, using $THTTPD"
   AC_ADD_INCLUDE($THTTPD)
   PHP_BUILD_STATIC
   PHP_SAPI=thttpd
+],[
+  PHP_THTTPD="no"
 ])
+
+AC_MSG_CHECKING(for thttpd)
+AC_MSG_RESULT($PHP_THTTPD)