[Pkg-php-commits] [php/debian-sid] Refreshed 115-autoconf_ftbfs.patch to apply cleanly

Ondřej Surý ondrej at sury.org
Sun Feb 7 23:17:14 UTC 2010


---
 debian/patches/115-autoconf_ftbfs.patch |   45 ++++++++----------------------
 1 files changed, 12 insertions(+), 33 deletions(-)

diff --git a/debian/patches/115-autoconf_ftbfs.patch b/debian/patches/115-autoconf_ftbfs.patch
index b67df8d..8a2c1ab 100644
--- a/debian/patches/115-autoconf_ftbfs.patch
+++ b/debian/patches/115-autoconf_ftbfs.patch
@@ -1,7 +1,7 @@
---- pkg-php.orig/configure.in
-+++ pkg-php/configure.in
+--- a/configure.in
++++ b/configure.in
 @@ -1,7 +1,7 @@
- ## $Id: configure.in,v 1.579.2.52.2.77.2.58 2009/06/26 15:44:18 johannes Exp $ -*- autoconf -*-
+ ## $Id: configure.in 290928 2009-11-18 19:43:33Z johannes $ -*- autoconf -*-
  dnl ## Process this file with autoconf to produce a configure script.
  
 -divert(1)
@@ -9,28 +9,7 @@
  
  dnl ## Diversion 1 is the autoconf + automake setup phase. We also
  dnl ## set the PHP version, deal with platform-specific compile
-@@ -23,16 +23,16 @@ dnl ## In diversion 5 we check which ext
- dnl ## All of these are normally in the extension directories.
- dnl ## Diversion 5 is the last one.  Here we generate files and clean up.
- 
--dnl include Zend specific macro definitions first
--dnl -------------------------------------------------------------------------
--sinclude(Zend/acinclude.m4)
--
- dnl Basic autoconf + automake initialization, generation of config.nice.
- dnl -------------------------------------------------------------------------
- 
- AC_PREREQ(2.13)
- AC_INIT(README.CVS-RULES)
- 
-+dnl include Zend specific macro definitions first
-+dnl -------------------------------------------------------------------------
-+sinclude(Zend/acinclude.m4)
-+
- PHP_CONFIG_NICE(config.nice)
- 
- PHP_CANONICAL_HOST_TARGET
-@@ -308,7 +308,7 @@ sinclude(TSRM/threads.m4)
+@@ -305,7 +305,7 @@ sinclude(TSRM/threads.m4)
  sinclude(TSRM/tsrm.m4)
  
  
@@ -39,7 +18,7 @@
  
  dnl ## Diversion 2 is where we set PHP-specific options and come up
  dnl ## with reasonable default values for them. We check for pthreads here
-@@ -347,7 +347,7 @@ if test "$enable_maintainer_zts" = "yes"
+@@ -344,7 +344,7 @@ if test "$enable_maintainer_zts" = "yes"
    PTHREADS_FLAGS
  fi
  
@@ -48,7 +27,7 @@
  
  dnl ## In diversion 3 we check for compile-time options to the PHP
  dnl ## core and how to deal with different system dependencies. 
-@@ -702,7 +702,7 @@ if test "x$php_crypt_r" = "x1"; then
+@@ -691,7 +691,7 @@ if test "x$php_crypt_r" = "x1"; then
    PHP_CRYPT_R_STYLE
  fi
  
@@ -57,7 +36,7 @@
  
  dnl ## In diversion 4 we check user-configurable general settings.
  
-@@ -943,7 +943,7 @@ else
+@@ -932,7 +932,7 @@ else
    AC_MSG_RESULT([using system default])
  fi
  
@@ -66,10 +45,10 @@
  
  dnl ## In diversion 5 we check which extensions should be compiled.
  dnl ## All of these are normally in the extension directories.
---- pkg-php.orig/ext/standard/config.m4
-+++ pkg-php/ext/standard/config.m4
+--- a/ext/standard/config.m4
++++ b/ext/standard/config.m4
 @@ -1,6 +1,6 @@
- dnl $Id: config.m4,v 1.80.2.3.2.3.2.8 2009/01/11 23:37:16 scottmac Exp $ -*- autoconf -*-
+ dnl $Id: config.m4 287120 2009-08-11 22:07:35Z scottmac $ -*- autoconf -*-
  
 -divert(3)dnl
 +dnl divert(3)dnl
@@ -85,8 +64,8 @@
  
  dnl
  dnl Check if there is a support means of creating a new process
---- pkg-php.orig/scripts/phpize.m4
-+++ pkg-php/scripts/phpize.m4
+--- a/scripts/phpize.m4
++++ b/scripts/phpize.m4
 @@ -1,6 +1,6 @@
  dnl This file becomes configure.in for self-contained extensions.
  
-- 
1.6.3.3





More information about the Pkg-php-commits mailing list