File php-5.3.2-aconf26x.patch of Package php5

File php-5.3.2-aconf26x.patch of Package php5 (Revision e7bb296a9b76a502e97ec3e647ea4b20)

Currently displaying revision e7bb296a9b76a502e97ec3e647ea4b20 , Show latest

Index: scripts/phpize.m4
===================================================================
--- scripts/phpize.m4.orig
+++ scripts/phpize.m4
@@ -1,6 +1,6 @@
 dnl This file becomes configure.in for self-contained extensions.
 
-divert(1)
+divert(1001)
 
 AC_PREREQ(2.13)
 AC_INIT(config.m4)
@@ -23,7 +23,8 @@ test -z "$CFLAGS" && auto_cflags=1
 abs_srcdir=`(cd $srcdir && pwd)`
 abs_builddir=`pwd`
 
-AC_PROG_CC([cc gcc])
+AC_PROG_CC_STDC
+AC_USE_SYSTEM_EXTENSIONS
 PHP_DETECT_ICC
 PHP_DETECT_SUNCC
 AC_PROG_CC_C_O
Index: ext/standard/config.m4
===================================================================
--- ext/standard/config.m4.orig
+++ ext/standard/config.m4
@@ -1,6 +1,6 @@
 dnl $Id$ -*- autoconf -*-
 
-divert(3)dnl
+divert(1003)dnl
 
 dnl
 dnl Check if flush should be called explicitly after buffered io
@@ -342,7 +342,7 @@ dnl
 AC_CHECK_FUNCS(getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan mempcpy strpncpy)
 AC_FUNC_FNMATCH	
 
-divert(5)dnl
+divert(1005)dnl
 
 dnl
 dnl Check if there is a support means of creating a new process
Index: configure.in
===================================================================
--- configure.in.orig
+++ configure.in
@@ -1,7 +1,7 @@
 ## $Id$ -*- autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
-divert(1)
+divert(1001)
 
 dnl ## Diversion 1 is the autoconf + automake setup phase. We also
 dnl ## set the PHP version, deal with platform-specific compile
@@ -125,12 +125,12 @@ rm -f libs/*
 dnl Checks for programs.
 dnl -------------------------------------------------------------------------
 
-AC_PROG_CC([cc gcc])
+AC_USE_SYSTEM_EXTENSIONS
 PHP_DETECT_ICC
 PHP_DETECT_SUNCC
 AC_PROG_CC_C_O
 dnl Change to AC_PROG_CC_STDC when we start requiring a post-2.13 autoconf
-dnl AC_PROG_CC_STDC
+AC_PROG_CC_STDC
 AC_PROG_CPP
 AC_AIX
 AC_PROG_LN_S
@@ -290,7 +290,7 @@ sinclude(TSRM/threads.m4)
 sinclude(TSRM/tsrm.m4)
 
 
-divert(2)
+divert(1002)
 
 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
@@ -329,7 +329,7 @@ if test "$enable_maintainer_zts" = "yes"
   PTHREADS_FLAGS
 fi
 
-divert(3)
+divert(1003)
 
 dnl ## In diversion 3 we check for compile-time options to the PHP
 dnl ## core and how to deal with different system dependencies. 
@@ -683,7 +683,7 @@ if test "x$php_crypt_r" = "x1"; then
   PHP_CRYPT_R_STYLE
 fi
 
-divert(4)
+divert(1004)
 
 dnl ## In diversion 4 we check user-configurable general settings.
 
@@ -924,7 +924,7 @@ else
   AC_MSG_RESULT([using system default])
 fi
 
-divert(5)
+divert(1005)
 
 dnl ## In diversion 5 we check which extensions should be compiled.
 dnl ## All of these are normally in the extension directories.
@@ -1351,7 +1351,8 @@ AC_PROVIDE_IFELSE([PHP_REQUIRE_CXX], [],
   undefine([AC_PROG_CXXCPP])
   AC_DEFUN([AC_PROG_CXXCPP], [php_prog_cxxcpp=disabled])
 ])
-AC_PROG_LIBTOOL
+LT_INIT([disable-static pic-only dlopen])
+#AC_PROG_LIBTOOL
 
 if test "$enable_debug" != "yes"; then
   PHP_SET_LIBTOOL_VARIABLE([--silent])
Index: build/buildcheck.sh
===================================================================
--- build/buildcheck.sh.orig
+++ build/buildcheck.sh
@@ -51,7 +51,7 @@ if test "$1" = "2" -a "$2" -gt "59"; the
   echo "           On Debian/Ubuntu both autoconf2.13 and autoconf2.59 packages exist."
   echo "           Install autoconf2.13 and set the PHP_AUTOCONF env var to "
   echo "           autoconf2.13 and try again."
-  exit 1
+#  exit 1
 else
   echo "buildconf: autoconf version $ac_version (ok)"
 fi