equal
deleted
inserted
replaced
1 --- php-5.2.17/configure.in.orig Thu Jan 19 05:47:26 2012 |
|
2 +++ php-5.2.17/configure.in Thu Jan 19 05:48:37 2012 |
|
3 @@ -1,7 +1,6 @@ |
|
4 ## $Id: configure.in 307193 2011-01-06 23:01:19Z iliaa $ -*- autoconf -*- |
|
5 dnl ## Process this file with autoconf to produce a configure script. |
|
6 |
|
7 -divert(1) |
|
8 |
|
9 dnl ## Diversion 1 is the autoconf + automake setup phase. We also |
|
10 dnl ## set the PHP version, deal with platform-specific compile |
|
11 @@ -256,7 +255,6 @@ |
|
12 sinclude(TSRM/tsrm.m4) |
|
13 |
|
14 |
|
15 -divert(2) |
|
16 |
|
17 dnl ## Diversion 2 is where we set PHP-specific options and come up |
|
18 dnl ## with reasonable default values for them. We check for pthreads here |
|
19 @@ -295,7 +293,6 @@ |
|
20 PTHREADS_FLAGS |
|
21 fi |
|
22 |
|
23 -divert(3) |
|
24 |
|
25 dnl ## In diversion 3 we check for compile-time options to the PHP |
|
26 dnl ## core and how to deal with different system dependencies. |
|
27 @@ -655,7 +652,6 @@ |
|
28 PHP_CRYPT_R_STYLE |
|
29 fi |
|
30 |
|
31 -divert(4) |
|
32 |
|
33 dnl ## In diversion 4 we check user-configurable general settings. |
|
34 |
|
35 @@ -913,7 +909,6 @@ |
|
36 AC_MSG_RESULT([using system default]) |
|
37 fi |
|
38 |
|
39 -divert(5) |
|
40 |
|
41 dnl ## In diversion 5 we check which extensions should be compiled. |
|
42 dnl ## All of these are normally in the extension directories. |
|
43 --- php-5.2.17/ext/standard/config.m4.orig Thu Jan 19 05:49:06 2012 |
|
44 +++ php-5.2.17/ext/standard/config.m4 Thu Jan 19 05:49:31 2012 |
|
45 @@ -1,6 +1,5 @@ |
|
46 dnl $Id: config.m4 291364 2009-11-27 23:41:13Z rasmus $ -*- autoconf -*- |
|
47 |
|
48 -divert(3)dnl |
|
49 |
|
50 dnl |
|
51 dnl Check if flush should be called explicitly after buffered io |
|
52 @@ -205,7 +204,6 @@ |
|
53 AC_CHECK_FUNCS(getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan) |
|
54 AC_FUNC_FNMATCH |
|
55 |
|
56 -divert(5)dnl |
|
57 |
|
58 dnl |
|
59 dnl Check for regex library type |
|
60 --- php-5.2.17/scripts/phpize.m4.orig Thu Jan 19 05:50:14 2012 |
|
61 +++ php-5.2.17/scripts/phpize.m4 Thu Jan 19 05:50:25 2012 |
|
62 @@ -1,6 +1,5 @@ |
|
63 dnl This file becomes configure.in for self-contained extensions. |
|
64 |
|
65 -divert(1) |
|
66 |
|
67 AC_PREREQ(2.13) |
|
68 AC_INIT(config.m4) |
|