- merged apache packages split from DEVEL (1.421.2.3.2.35)

Changed files:
    php4-both-apxs.patch -> 1.2

diff --git a/php4-both-apxs.patch b/php4-both-apxs.patch
new file mode 100644 (file)
index 0000000..bb0b542
--- /dev/null
+++ b/php4-both-apxs.patch
@@ -0,0 +1,14 @@
+--- ./Makefile.global~ 2005-06-16 21:21:20.000000000 +0300
++++ ./Makefile.global  2005-06-16 23:10:40.000000000 +0300
+@@ -20,6 +20,11 @@
+ libphp4.la: libphp_common.la $(PHP_SAPI_OBJS)
+       $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) libphp_common.la $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
+ 
++$(LIBTOOL_SAPI): libphp_common.la $(PHP_SAPI_OBJS)
++      $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) libphp_common.la $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
++
++sapi: $(LIBTOOL_SAPI)
++
+ libs/libphp4.bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
+       $(CC) $(MH_BUNDLE_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(PHP_GLOBAL_OBJS:.lo=.o) $(PHP_SAPI_OBJS:.lo=.o) $(PHP_FRAMEWORKS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ && cp $@ libs/libphp4.so
+