]>
Commit | Line | Data |
---|---|---|
0dfad981 AM |
1 | diff -ur php-5.3.0.org/configure.in php-5.3.0/configure.in |
2 | --- php-5.3.0.org/configure.in 2009-06-26 17:44:18.000000000 +0200 | |
3 | +++ php-5.3.0/configure.in 2009-08-18 12:45:19.126841759 +0200 | |
5640aa42 AM |
4 | @@ -1,7 +1,7 @@ |
5 | ## $Id$ -*- autoconf -*- | |
6 | dnl ## Process this file with autoconf to produce a configure script. | |
7 | ||
8 | -divert(1) | |
9 | +divert(1001) | |
10 | ||
11 | dnl ## Diversion 1 is the autoconf + automake setup phase. We also | |
12 | dnl ## set the PHP version, deal with platform-specific compile | |
0dfad981 | 13 | @@ -308,7 +308,7 @@ |
5640aa42 AM |
14 | sinclude(TSRM/tsrm.m4) |
15 | ||
16 | ||
17 | -divert(2) | |
18 | +divert(1002) | |
19 | ||
20 | dnl ## Diversion 2 is where we set PHP-specific options and come up | |
21 | dnl ## with reasonable default values for them. We check for pthreads here | |
0dfad981 | 22 | @@ -347,7 +347,7 @@ |
5640aa42 AM |
23 | PTHREADS_FLAGS |
24 | fi | |
25 | ||
26 | -divert(3) | |
27 | +divert(1003) | |
28 | ||
29 | dnl ## In diversion 3 we check for compile-time options to the PHP | |
0dfad981 AM |
30 | dnl ## core and how to deal with different system dependencies. |
31 | @@ -702,7 +702,7 @@ | |
5640aa42 AM |
32 | PHP_CRYPT_R_STYLE |
33 | fi | |
34 | ||
35 | -divert(4) | |
36 | +divert(1004) | |
37 | ||
38 | dnl ## In diversion 4 we check user-configurable general settings. | |
39 | ||
0dfad981 | 40 | @@ -943,7 +943,7 @@ |
5640aa42 AM |
41 | AC_MSG_RESULT([using system default]) |
42 | fi | |
43 | ||
44 | -divert(5) | |
45 | +divert(1005) | |
46 | ||
47 | dnl ## In diversion 5 we check which extensions should be compiled. | |
48 | dnl ## All of these are normally in the extension directories. | |
0dfad981 AM |
49 | diff -ur php-5.3.0.org/ext/standard/config.m4 php-5.3.0/ext/standard/config.m4 |
50 | --- php-5.3.0.org/ext/standard/config.m4 2009-01-12 00:37:16.000000000 +0100 | |
51 | +++ php-5.3.0/ext/standard/config.m4 2009-08-18 12:45:19.130174674 +0200 | |
5640aa42 AM |
52 | @@ -1,6 +1,6 @@ |
53 | dnl $Id$ -*- autoconf -*- | |
54 | ||
55 | -divert(3)dnl | |
56 | +divert(1003)dnl | |
57 | ||
58 | dnl | |
59 | dnl Check if flush should be called explicitly after buffered io | |
0dfad981 | 60 | @@ -220,7 +220,7 @@ |
5640aa42 AM |
61 | AC_CHECK_FUNCS(getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan) |
62 | AC_FUNC_FNMATCH | |
63 | ||
64 | -divert(5)dnl | |
65 | +divert(1005)dnl | |
66 | ||
67 | dnl | |
0dfad981 AM |
68 | dnl Check if there is a support means of creating a new process |
69 | diff -ur php-5.3.0.org/scripts/phpize.m4 php-5.3.0/scripts/phpize.m4 | |
70 | --- php-5.3.0.org/scripts/phpize.m4 2009-06-02 21:54:03.000000000 +0200 | |
71 | +++ php-5.3.0/scripts/phpize.m4 2009-08-18 12:45:19.126841759 +0200 | |
5640aa42 AM |
72 | @@ -1,6 +1,6 @@ |
73 | dnl This file becomes configure.in for self-contained extensions. | |
74 | ||
75 | -divert(1) | |
76 | +divert(1001) | |
77 | ||
78 | AC_PREREQ(2.13) | |
79 | AC_INIT(config.m4) |