-diff -burN php-5.0.0b3/Makefile.global php-5.0.0b3-shared/Makefile.global
---- php-5.0.0b3/Makefile.global 2003-12-04 16:57:55.000000000 +0100
-+++ php-5.0.0b3-shared/Makefile.global 2003-12-25 16:52:55.000000000 +0100
-@@ -14,8 +14,11 @@
+--- php-5.2.4/Makefile.global~ 2007-08-31 19:13:58.000000000 +0300
++++ php-5.2.4/Makefile.global 2007-08-31 19:19:33.799017413 +0300
+@@ -13,8 +13,12 @@
build-modules: $(PHP_MODULES)
--libphp5.la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
+-libphp$(PHP_MAJOR_VERSION).la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
- $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
+libphp_common.la: $(PHP_GLOBAL_OBJS)
+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) -avoid-version $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ -release $(PHP_VERSION)
++ -@$(LIBTOOL) --silent --mode=install cp $@ $(phptempdir)/$@ >/dev/null 2>&1
+
-+libphp5.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) --silent --mode=install cp libphp5.la $(phptempdir)/libphp5.la >/dev/null 2>&1
++libphp$(PHP_MAJOR_VERSION).la: libphp_common.la $(PHP_SAPI_OBJS)
++ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(phptempdir)/libphp_common.la $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
+ -@$(LIBTOOL) --silent --mode=install cp $@ $(phptempdir)/$@ >/dev/null 2>&1
- libs/libphp5.bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
-@@ -26,10 +29,10 @@
+ libs/libphp$(PHP_MAJOR_VERSION).bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
+@@ -25,10 +29,10 @@
install-sapi: $(OVERALL_TARGET)
@echo "Installing PHP SAPI module: $(PHP_SAPI)"
-@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
-- -@if test ! -r $(phptempdir)/libphp5.$(SHLIB_SUFFIX_NAME); then \
-+ -@if test ! -r $(phptempdir)/libphp_common.$(SHLIB_SUFFIX_NAME); then \
+- -@if test ! -r $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME); then \
++ -@if test ! -r $(phptempdir)/libphp_common.$(SHLIB_DL_SUFFIX_NAME); then \
for i in 0.0.0 0.0 0; do \
-- if test -r $(phptempdir)/libphp5.$(SHLIB_SUFFIX_NAME).$$i; then \
-- $(LN_S) $(phptempdir)/libphp5.$(SHLIB_SUFFIX_NAME).$$i $(phptempdir)/libphp5.$(SHLIB_SUFFIX_NAME); \
-+ if test -r $(phptempdir)/libphp_common.$(SHLIB_SUFFIX_NAME).$$i; then \
-+ $(LN_S) $(phptempdir)/libphp_common.$(SHLIB_SUFFIX_NAME).$$i $(phptempdir)/libphp_common.$(SHLIB_SUFFIX_NAME); \
+- if test -r $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME).$$i; then \
+- $(LN_S) $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME).$$i $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME); \
++ if test -r $(phptempdir)/libphp_common.$(SHLIB_DL_SUFFIX_NAME).$$i; then \
++ $(LN_S) $(phptempdir)/libphp_common.$(SHLIB_DL_SUFFIX_NAME).$$i $(phptempdir)/libphp_common.$(SHLIB_DL_SUFFIX_NAME); \
break; \
fi; \
done; \
-diff -burN php-5.0.0b3/sapi/cgi/config9.m4 php-5.0.0b3-shared/sapi/cgi/config9.m4
---- php-5.0.0b3/sapi/cgi/config9.m4 2003-12-01 16:17:08.000000000 +0100
-+++ php-5.0.0b3-shared/sapi/cgi/config9.m4 2003-12-25 16:54:16.000000000 +0100
+--- php-5.0.0.org/sapi/cgi/config9.m4 2004-07-25 22:41:53.698171496 +0200
++++ php-5.0.0/sapi/cgi/config9.m4 2004-07-25 22:42:04.894469400 +0200
@@ -156,7 +156,7 @@
BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
;;
;;
esac
-diff -burN php-5.0.0b3/sapi/cgi/Makefile.frag php-5.0.0b3-shared/sapi/cgi/Makefile.frag
---- php-5.0.0b3/sapi/cgi/Makefile.frag 2003-07-02 03:08:26.000000000 +0200
-+++ php-5.0.0b3-shared/sapi/cgi/Makefile.frag 2003-12-25 16:53:17.000000000 +0100
+--- php-5.0.0.org/sapi/cgi/Makefile.frag 2004-07-25 22:41:53.696171800 +0200
++++ php-5.0.0/sapi/cgi/Makefile.frag 2004-07-25 22:42:04.895469248 +0200
@@ -1,2 +1,2 @@
-$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
+$(SAPI_CGI_PATH): libphp_common.la $(PHP_SAPI_OBJS)
$(BUILD_CGI)
-diff -burN php-5.0.0b3/sapi/cli/config.m4 php-5.0.0b3-shared/sapi/cli/config.m4
---- php-5.0.0b3/sapi/cli/config.m4 2003-12-01 16:17:10.000000000 +0100
-+++ php-5.0.0b3-shared/sapi/cli/config.m4 2003-12-25 16:55:07.000000000 +0100
+--- php-5.0.0.org/sapi/cli/config.m4 2004-07-25 22:41:53.700171192 +0200
++++ php-5.0.0/sapi/cli/config.m4 2004-07-25 22:42:04.895469248 +0200
@@ -27,7 +27,7 @@
BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
;;
;;
esac
INSTALL_CLI="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(bindir); \$(INSTALL) -m 0755 \$(SAPI_CLI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php\$(program_suffix)"
-diff -burN php-5.0.0b3/sapi/cli/Makefile.frag php-5.0.0b3-shared/sapi/cli/Makefile.frag
---- php-5.0.0b3/sapi/cli/Makefile.frag 2003-09-02 23:41:01.000000000 +0200
-+++ php-5.0.0b3-shared/sapi/cli/Makefile.frag 2003-12-25 16:54:40.000000000 +0100
+--- php-5.0.0.org/sapi/cli/Makefile.frag 2004-07-25 22:41:53.699171344 +0200
++++ php-5.0.0/sapi/cli/Makefile.frag 2004-07-25 22:42:04.896469096 +0200
@@ -1,6 +1,6 @@
cli: $(SAPI_CLI_PATH)