| 1 |
slords |
1.1 |
diff -up php-5.3.3/configure.in.aconf26x php-5.3.3/configure.in |
| 2 |
|
|
--- php-5.3.3/configure.in.aconf26x 2010-07-22 15:24:35.376051049 +0200 |
| 3 |
|
|
+++ php-5.3.3/configure.in 2010-07-22 15:25:19.922175093 +0200 |
| 4 |
|
|
@@ -1,7 +1,7 @@ |
| 5 |
|
|
## $Id: configure.in 301439 2010-07-21 10:50:07Z johannes $ -*- 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 |
| 13 |
|
|
@@ -292,7 +292,7 @@ sinclude(TSRM/threads.m4) |
| 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 |
| 22 |
|
|
@@ -331,7 +331,7 @@ if test "$enable_maintainer_zts" = "yes" |
| 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 |
| 30 |
|
|
dnl ## core and how to deal with different system dependencies. |
| 31 |
|
|
@@ -677,7 +677,7 @@ if test "x$php_crypt_r" = "x1"; then |
| 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 |
|
|
|
| 40 |
|
|
@@ -918,7 +918,7 @@ else |
| 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. |
| 49 |
|
|
diff -up php-5.3.3/ext/standard/config.m4.aconf26x php-5.3.3/ext/standard/config.m4 |
| 50 |
|
|
--- php-5.3.3/ext/standard/config.m4.aconf26x 2010-06-17 12:22:03.000000000 +0200 |
| 51 |
|
|
+++ php-5.3.3/ext/standard/config.m4 2010-07-22 15:24:35.382051000 +0200 |
| 52 |
|
|
@@ -1,6 +1,6 @@ |
| 53 |
|
|
dnl $Id: config.m4 300511 2010-06-17 10:22:03Z pajoye $ -*- 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 |
| 60 |
|
|
@@ -342,7 +342,7 @@ dnl |
| 61 |
|
|
AC_CHECK_FUNCS(getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan mempcpy strpncpy) |
| 62 |
|
|
AC_FUNC_FNMATCH |
| 63 |
|
|
|
| 64 |
|
|
-divert(5)dnl |
| 65 |
|
|
+divert(1005)dnl |
| 66 |
|
|
|
| 67 |
|
|
dnl |
| 68 |
|
|
dnl Check if there is a support means of creating a new process |
| 69 |
|
|
diff -up php-5.3.3/scripts/phpize.m4.aconf26x php-5.3.3/scripts/phpize.m4 |
| 70 |
|
|
--- php-5.3.3/scripts/phpize.m4.aconf26x 2009-12-02 18:42:58.000000000 +0100 |
| 71 |
|
|
+++ php-5.3.3/scripts/phpize.m4 2010-07-22 15:24:35.382051000 +0200 |
| 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) |
Parent Directory
| 
Revision Log
| 
Revision Graph
