equal
deleted
inserted
replaced
|
1 --- php-5.3.10/configure.in_orig Thu Feb 2 18:54:19 2012 |
|
2 +++ php-5.3.10/configure.in Wed Feb 8 11:13:44 2012 |
|
3 @@ -1,7 +1,6 @@ |
|
4 ## $Id: configure.in 323027 2012-02-02 17:29:58Z johannes $ -*- 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 @@ -290,7 +289,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 @@ -329,7 +327,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 @@ -683,7 +680,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 @@ -924,7 +920,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. |