3 # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
6 --- php-4.3.6/acinclude.m4~autotools.patch 2004-01-19 20:11:40.000000000 -0500
7 +++ php-4.3.6/acinclude.m4 2004-06-04 18:21:54.893679473 -0400
9 sed -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments
12 -AC_DEFUN(PHP_PROG_RE2C,[
13 +AC_DEFUN([PHP_PROG_RE2C],[
14 AC_CHECK_PROG(RE2C, re2c, re2c, [exit 0;])
18 OVERALL_TARGET=[]ifelse($1,,php,$1)
20 php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
21 - php_c_post=' && echo > $[@]'
22 + php_c_post=' && echo "[#] Generated by PHP badness - GNU libtool" > $[@] && echo "pic_object=none" >> $[@] && echo "non_pic_object=$[@]" | sed -e "s,=.*/,=,; s,\.lo,\.o,g" >> $[@]'
24 php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
25 - php_cxx_post=' && echo > $[@]'
26 + php_cxx_post=' && echo "[#] Generated by PHP badness - GNU libtool" > $[@] && echo "pic_object=none" >> $[@] && echo "non_pic_object=$[@]" | sed -e "s,=.*/,=,; s,\.lo,\.o,g" >> $[@]'
29 shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
32 dnl even newer glibcs have a different seeker definition...
34 + AC_CACHE_CHECK([if cookie io functions use off64_t], php_cv_lib_cookie_io_functions_use_off64_t,
42 - [ cookie_io_functions_use_off64_t=yes ],
44 + [ php_cv_lib_cookie_io_functions_use_off64_t=yes ],
45 + [ php_cv_lib_cookie_io_functions_use_off64_t=no ] ))
48 dnl older glibc versions (up to 2.1.2 ?)
49 --- php-4.3.6/ext/cpdf/config.m4~autotools.patch 2003-09-30 22:53:53.000000000 -0400
50 +++ php-4.3.6/ext/cpdf/config.m4 2004-06-04 18:21:54.893679473 -0400
52 dnl $Id: config.m4,v 1.10.4.6 2003/10/01 02:53:53 sniper Exp $
54 -AC_DEFUN(CPDF_JPEG_TEST,[
55 +AC_DEFUN([CPDF_JPEG_TEST],[
57 [ --with-jpeg-dir[=DIR] CPDF: Set the path to libjpeg install prefix.],[
58 for i in $withval /usr/local /usr; do
63 -AC_DEFUN(CPDF_TIFF_TEST,[
64 +AC_DEFUN([CPDF_TIFF_TEST],[
66 [ --with-tiff-dir[=DIR] CPDF: Set the path to libtiff install prefix.],[
67 for i in $withval /usr/local /usr; do
68 --- php-4.3.6/ext/db/config.m4~autotools.patch 2003-08-15 14:42:11.000000000 -0400
69 +++ php-4.3.6/ext/db/config.m4 2004-06-04 18:21:54.893679473 -0400
72 # Checks for libraries.
73 # Prefer gdbm, Berkeley DB and ndbm/dbm, in that order
74 -AC_DEFUN(AC_PREFERRED_DB_LIB,[
75 +AC_DEFUN([AC_PREFERRED_DB_LIB],[
76 AC_CHECK_LIB(gdbm, gdbm_open,[AC_DEFINE(GDBM,1, [Whether you have GDBM]) DBM_TYPE=gdbm; DBM_LIB=-lgdbm],
77 [AC_CHECK_LIB(c, dbm_open,[AC_DEFINE(NDBM,1,[ ]) DBM_TYPE=ndbm; DBM_LIB=],
78 [AC_CHECK_LIB(dbm, dbm_open,[AC_DEFINE(NDBM,1,[ ]) DBM_TYPE=ndbm; DBM_LIB=-ldbm],
79 --- php-4.3.6/ext/dba/config.m4~autotools.patch 2004-03-07 19:01:03.000000000 -0500
80 +++ php-4.3.6/ext/dba/config.m4 2004-06-04 18:21:54.894679234 -0400
83 dnl Suppose we need FlatFile if no support or only CDB is used.
85 -AC_DEFUN(PHP_DBA_STD_BEGIN,[
86 +AC_DEFUN([PHP_DBA_STD_BEGIN],[
87 unset THIS_INCLUDE THIS_LIBS THIS_LFLAGS THIS_PREFIX THIS_RESULT
90 -AC_DEFUN(PHP_TEMP_LDFLAGS,[
91 +AC_DEFUN([PHP_TEMP_LDFLAGS],[
98 dnl Assign INCLUDE/LFLAGS from PREFIX
99 -AC_DEFUN(PHP_DBA_STD_ASSIGN,[
100 +AC_DEFUN([PHP_DBA_STD_ASSIGN],[
101 if test -n "$THIS_PREFIX" && test "$THIS_PREFIX" != "/usr"; then
102 THIS_LFLAGS=$THIS_PREFIX/lib
107 -AC_DEFUN(PHP_DBA_STD_CHECK,[
108 +AC_DEFUN([PHP_DBA_STD_CHECK],[
110 if test -z "$THIS_INCLUDE"; then
111 AC_MSG_ERROR([DBA: Could not find necessary header file(s).])
115 dnl Attach THIS_x to DBA_x
116 -AC_DEFUN(PHP_DBA_STD_ATTACH,[
117 +AC_DEFUN([PHP_DBA_STD_ATTACH],[
118 PHP_ADD_LIBRARY_WITH_PATH($THIS_LIBS, $THIS_LFLAGS, DBA_SHARED_LIBADD)
119 unset THIS_INCLUDE THIS_LIBS THIS_LFLAGS THIS_PREFIX
122 dnl Print the result message
123 dnl parameters(name [, full name [, empty or error message]])
124 -AC_DEFUN(AC_DBA_STD_RESULT,[
125 +AC_DEFUN([AC_DBA_STD_RESULT],[
126 THIS_NAME=[]translit($1,a-z0-9-,A-Z0-9_)
127 if test -n "$2"; then
131 dnl Berkeley specific (library and version test)
132 dnl parameters(version, library list, function)
133 -AC_DEFUN(PHP_DBA_DB_CHECK,[
134 +AC_DEFUN([PHP_DBA_DB_CHECK],[
136 if test -f $THIS_PREFIX/lib/lib$LIB.a -o -f $THIS_PREFIX/lib/lib$LIB.$SHLIB_SUFFIX_NAME; then
137 PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib -l$LIB,[
140 AC_DBA_STD_RESULT(dbm)
142 -AC_DEFUN(PHP_DBA_BUILTIN_CDB,[
143 +AC_DEFUN([PHP_DBA_BUILTIN_CDB],[
144 AC_DEFINE(DBA_CDB_BUILTIN, 1, [ ])
145 AC_DEFINE(DBA_CDB_MAKE, 1, [ ])
146 AC_DEFINE(DBA_CDB, 1, [ ])
149 AC_DBA_STD_RESULT(cdb)
151 -AC_DEFUN(PHP_DBA_BUILTIN_INI,[
152 +AC_DEFUN([PHP_DBA_BUILTIN_INI],[
153 AC_DEFINE(DBA_INIFILE, 1, [ ])
154 ini_sources="libinifile/inifile.c"
155 THIS_RESULT="builtin"
158 AC_DBA_STD_RESULT(inifile,INI File)
160 -AC_DEFUN(PHP_DBA_BUILTIN_FLATFILE,[
161 +AC_DEFUN([PHP_DBA_BUILTIN_FLATFILE],[
162 AC_DEFINE(DBA_FLATFILE, 1, [ ])
163 flat_sources="libflatfile/flatfile.c"
164 THIS_RESULT="builtin"
165 --- php-4.3.6/ext/domxml/config.m4~autotools.patch 2002-10-30 12:42:36.000000000 -0500
166 +++ php-4.3.6/ext/domxml/config.m4 2004-06-04 18:21:54.894679234 -0400
168 dnl $Id: config.m4,v 1.44 2002/10/30 17:42:36 helly Exp $
171 -AC_DEFUN(PHP_DOM_CHECK_VERSION,[
172 +AC_DEFUN([PHP_DOM_CHECK_VERSION],[
173 old_CPPFLAGS=$CPPFLAGS
174 CPPFLAGS=-I$DOMXML_DIR/include$DOMXML_DIR_ADD
175 AC_MSG_CHECKING(for libxml version)
177 PHP_SUBST(DOMXML_SHARED_LIBADD)
180 -AC_DEFUN(PHP_DOM_XSLT_CHECK_VERSION,[
181 +AC_DEFUN([PHP_DOM_XSLT_CHECK_VERSION],[
182 old_CPPFLAGS=$CPPFLAGS
183 CPPFLAGS=-I$DOMXSLT_DIR/include
184 AC_MSG_CHECKING(for libxslt version)
186 CPPFLAGS=$old_CPPFLAGS
189 -AC_DEFUN(PHP_DOM_EXSLT_CHECK_VERSION,[
190 +AC_DEFUN([PHP_DOM_EXSLT_CHECK_VERSION],[
191 old_CPPFLAGS=$CPPFLAGS
192 CPPFLAGS=-I$DOMEXSLT_DIR/include
193 AC_MSG_CHECKING(for libexslt version)
194 --- php-4.3.6/ext/gd/config.m4~autotools.patch 2003-12-25 17:33:02.000000000 -0500
195 +++ php-4.3.6/ext/gd/config.m4 2004-06-04 18:21:54.894679234 -0400
197 dnl Checks for the configure options
200 -AC_DEFUN(PHP_GD_JPEG,[
201 +AC_DEFUN([PHP_GD_JPEG],[
202 if test "$PHP_JPEG_DIR" != "no"; then
204 for i in $PHP_JPEG_DIR /usr/local /usr; do
209 -AC_DEFUN(PHP_GD_PNG,[
210 +AC_DEFUN([PHP_GD_PNG],[
211 if test "$PHP_PNG_DIR" != "no"; then
213 for i in $PHP_PNG_DIR /usr/local /usr; do
218 -AC_DEFUN(PHP_GD_XPM,[
219 +AC_DEFUN([PHP_GD_XPM],[
220 if test "$PHP_XPM_DIR" != "no"; then
222 for i in $PHP_XPM_DIR /usr/local /usr/X11R6 /usr; do
227 -AC_DEFUN(PHP_GD_FREETYPE1,[
228 +AC_DEFUN([PHP_GD_FREETYPE1],[
229 if test "$PHP_TTF" != "no"; then
230 if test "$PHP_FREETYPE_DIR" = "no" -o "$PHP_FREETYPE_DIR" = ""; then
231 if test -n "$PHP_TTF"; then
236 -AC_DEFUN(PHP_GD_FREETYPE2,[
237 +AC_DEFUN([PHP_GD_FREETYPE2],[
238 if test "$PHP_FREETYPE_DIR" != "no"; then
240 for i in $PHP_FREETYPE_DIR /usr/local /usr; do
245 -AC_DEFUN(PHP_GD_T1LIB,[
246 +AC_DEFUN([PHP_GD_T1LIB],[
247 if test "$PHP_T1LIB" != "no"; then
249 for i in $PHP_T1LIB /usr/local /usr; do
250 @@ -224,19 +224,19 @@
254 -AC_DEFUN(PHP_GD_TTSTR,[
255 +AC_DEFUN([PHP_GD_TTSTR],[
256 if test "$PHP_GD_NATIVE_TTF" = "yes"; then
257 AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ])
261 -AC_DEFUN(PHP_GD_JISX0208,[
262 +AC_DEFUN([PHP_GD_JISX0208],[
263 if test "$PHP_GD_JIS_CONV" = "yes"; then
268 -AC_DEFUN(PHP_GD_CHECK_VERSION,[
269 +AC_DEFUN([PHP_GD_CHECK_VERSION],[
270 PHP_CHECK_LIBRARY(gd, gdImageString16, [AC_DEFINE(HAVE_LIBGD13, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
271 PHP_CHECK_LIBRARY(gd, gdImagePaletteCopy, [AC_DEFINE(HAVE_LIBGD15, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
272 PHP_CHECK_LIBRARY(gd, gdImageCreateFromPng, [AC_DEFINE(HAVE_GD_PNG, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
273 --- php-4.3.6/ext/imap/config.m4~autotools.patch 2004-01-16 19:01:06.000000000 -0500
274 +++ php-4.3.6/ext/imap/config.m4 2004-06-04 18:21:54.894679234 -0400
276 dnl $Id: config.m4,v 1.49.2.11 2004/01/17 00:01:06 sniper Exp $
279 -AC_DEFUN(IMAP_INC_CHK,[if test -r "$i$1/c-client.h"; then
280 +AC_DEFUN([IMAP_INC_CHK],[if test -r "$i$1/c-client.h"; then
281 AC_DEFINE(HAVE_IMAP2000, 1, [ ])
288 -AC_DEFUN(IMAP_LIB_CHK,[
289 +AC_DEFUN([IMAP_LIB_CHK],[
290 str="$IMAP_DIR/$1/lib$lib.*"
291 for i in `echo $str`; do
292 test -r $i && IMAP_LIBDIR=$IMAP_DIR/$1 && break 2
296 dnl PHP_IMAP_TEST_BUILD(function, action-if-ok, action-if-not-ok [, extra-libs])
297 -AC_DEFUN(PHP_IMAP_TEST_BUILD, [
298 +AC_DEFUN([PHP_IMAP_TEST_BUILD], [
306 -AC_DEFUN(PHP_IMAP_KRB_CHK, [
307 +AC_DEFUN([PHP_IMAP_KRB_CHK], [
308 AC_ARG_WITH(kerberos,
309 [ --with-kerberos[=DIR] IMAP: Include Kerberos support. DIR is the Kerberos install dir.],[
310 PHP_KERBEROS=$withval
315 -AC_DEFUN(PHP_IMAP_SSL_CHK, [
316 +AC_DEFUN([PHP_IMAP_SSL_CHK], [
317 AC_ARG_WITH(imap-ssl,
318 [ --with-imap-ssl=<DIR> IMAP: Include SSL support. DIR is the OpenSSL install dir.],[
319 PHP_IMAP_SSL=$withval
320 --- php-4.3.6/ext/java/config.m4~autotools.patch 2003-04-04 12:43:13.000000000 -0500
321 +++ php-4.3.6/ext/java/config.m4 2004-06-04 18:21:54.895678994 -0400
324 dnl $Id: config.m4,v 1.46.4.3 2003/04/04 17:43:13 sniper Exp $
326 -AC_DEFUN(JAVA_FIND_JAR, [
327 +AC_DEFUN([JAVA_FIND_JAR], [
328 AC_MSG_CHECKING([Java Jar location])
329 if test "$PHP_JAVA" = "yes"; then
330 if JAVA_JAR=`which jar 2>/dev/null`; then
332 AC_MSG_RESULT([$JAVA_JAR])
335 -AC_DEFUN(JAVA_FIND_C, [
336 +AC_DEFUN([JAVA_FIND_C], [
337 AC_MSG_CHECKING([Java C location])
338 if test "$PHP_JAVA" = "yes"; then
341 AC_MSG_RESULT([$JAVA_C])
344 -AC_DEFUN(JAVA_CHECK_LIB, [
345 +AC_DEFUN([JAVA_CHECK_LIB], [
346 AC_MSG_CHECKING([Checking for libjava])
347 if test -d $PHP_JAVA/lib/kaffe; then
348 PHP_ADD_LIBPATH($PHP_JAVA/lib)
349 --- php-4.3.6/ext/ldap/config.m4~autotools.patch 2003-06-30 20:02:29.000000000 -0400
350 +++ php-4.3.6/ext/ldap/config.m4 2004-06-04 18:21:54.895678994 -0400
352 dnl $Id: config.m4,v 1.26.2.6 2003/07/01 00:02:29 sniper Exp $
355 -AC_DEFUN(PHP_LDAP_CHECKS, [
356 +AC_DEFUN([PHP_LDAP_CHECKS], [
357 if test -f $1/include/ldap.h; then
359 LDAP_INCDIR=$1/include
360 --- php-4.3.6/ext/msql/config.m4~autotools.patch 2002-03-12 11:25:28.000000000 -0500
361 +++ php-4.3.6/ext/msql/config.m4 2004-06-04 18:21:54.895678994 -0400
364 dnl Test mSQL version by checking if msql.h has "IDX_TYPE" defined.
366 -AC_DEFUN(PHP_MSQL_VERSION,[
367 +AC_DEFUN([PHP_MSQL_VERSION],[
368 AC_MSG_CHECKING([mSQL version])
369 ac_php_oldcppflags=$CPPFLAGS
370 CPPFLAGS="$INCLUDES $CPPFLAGS"
371 --- php-4.3.6/ext/mysql/config.m4~autotools.patch 2003-12-31 06:28:38.000000000 -0500
372 +++ php-4.3.6/ext/mysql/config.m4 2004-06-04 18:21:54.895678994 -0400
374 sinclude(libmysql/acinclude.m4)
375 sinclude(libmysql/mysql.m4)
377 -AC_DEFUN(MYSQL_LIB_CHK, [
378 +AC_DEFUN([MYSQL_LIB_CHK], [
379 str="$MYSQL_DIR/$1/libmysqlclient.*"
380 for j in `echo $str`; do
386 -AC_DEFUN(PHP_MYSQL_SOCKET_SEARCH, [
387 +AC_DEFUN([PHP_MYSQL_SOCKET_SEARCH], [
389 /var/run/mysqld/mysqld.sock \
390 /var/tmp/mysql.sock \
391 --- php-4.3.6/ext/mysql/libmysql/acinclude.m4~autotools.patch 2002-12-05 10:46:41.000000000 -0500
392 +++ php-4.3.6/ext/mysql/libmysql/acinclude.m4 2004-06-04 18:21:54.895678994 -0400
394 # Local macros for automake & autoconf
396 -AC_DEFUN(MYSQL_FUNCTION_CHECKS,[
397 +AC_DEFUN([MYSQL_FUNCTION_CHECKS],[
399 # Standard MySQL list
400 AC_CHECK_FUNCS(alarm bmove \
402 MYSQL_CHECK_GETHOSTNAME_R
405 -AC_DEFUN(MYSQL_CHECK_GETHOSTNAME_R,[
406 +AC_DEFUN([MYSQL_CHECK_GETHOSTNAME_R],[
407 # Check definition of gethostbyname_r (glibc2.0.100 is different from Solaris)
408 ac_save_CXXFLAGS="$CXXFLAGS"
409 AC_CACHE_CHECK([style of gethostname_r routines], mysql_cv_gethostname_style,
414 -AC_DEFUN(MYSQL_CHECK_SIGWAIT_STYLE,[
415 +AC_DEFUN([MYSQL_CHECK_SIGWAIT_STYLE],[
416 # Check definition av posix sigwait()
417 AC_CACHE_CHECK("style of sigwait", mysql_cv_sigwait,
423 -AC_DEFUN(MYSQL_CHECK_READDIR_R_ARGS,[
424 +AC_DEFUN([MYSQL_CHECK_READDIR_R_ARGS],[
425 # Check definition of readdir_r
426 AC_CACHE_CHECK("args to readdir_r", mysql_cv_readdir_r,
432 -AC_DEFUN(MYSQL_CHECK_PTHREAD_MUTEX_INIT,[
433 +AC_DEFUN([MYSQL_CHECK_PTHREAD_MUTEX_INIT],[
434 # Check definition of pthread_mutex_init
435 AC_CACHE_CHECK("args to pthread_mutex_init", mysql_cv_mutex_init_args,
441 -AC_DEFUN(MYSQL_CHECK_PTHREAD_GETSPECIFIC,[
442 +AC_DEFUN([MYSQL_CHECK_PTHREAD_GETSPECIFIC],[
443 # Check definition of pthread_getspecific
444 AC_CACHE_CHECK("args to pthread_getspecific", mysql_cv_getspecific_args,
450 -AC_DEFUN(MYSQL_TYPE_ACCEPT,
451 +AC_DEFUN([MYSQL_TYPE_ACCEPT],
452 [ac_save_CXXFLAGS="$CXXFLAGS"
453 AC_CACHE_CHECK([base type of last arg to accept], mysql_cv_btype_last_arg_accept,
458 dnl Find type of qsort
459 -AC_DEFUN(MYSQL_TYPE_QSORT,
460 +AC_DEFUN([MYSQL_TYPE_QSORT],
461 [AC_CACHE_CHECK([return type of qsort], mysql_cv_type_qsort,
462 [AC_TRY_COMPILE([#include <stdlib.h>
467 #---START: Used in for client configure
468 -AC_DEFUN(MYSQL_CHECK_ULONG,
469 +AC_DEFUN([MYSQL_CHECK_ULONG],
470 [AC_MSG_CHECKING(for type ulong)
471 AC_CACHE_VAL(ac_cv_ulong,
472 [AC_TRY_RUN([#include <stdio.h>
477 -AC_DEFUN(MYSQL_CHECK_UCHAR,
478 +AC_DEFUN([MYSQL_CHECK_UCHAR],
479 [AC_MSG_CHECKING(for type uchar)
480 AC_CACHE_VAL(ac_cv_uchar,
481 [AC_TRY_RUN([#include <stdio.h>
486 -AC_DEFUN(MYSQL_CHECK_UINT,
487 +AC_DEFUN([MYSQL_CHECK_UINT],
488 [AC_MSG_CHECKING(for type uint)
489 AC_CACHE_VAL(ac_cv_uint,
490 [AC_TRY_RUN([#include <stdio.h>
495 -AC_DEFUN(MYSQL_CHECK_USHORT,
496 +AC_DEFUN([MYSQL_CHECK_USHORT],
497 [AC_MSG_CHECKING(for type ushort)
498 AC_CACHE_VAL(ac_cv_ushort,
499 [AC_TRY_RUN([#include <stdio.h>
504 -AC_DEFUN(MYSQL_CHECK_INT_8_16_32,
505 +AC_DEFUN([MYSQL_CHECK_INT_8_16_32],
506 [AC_MSG_CHECKING([for int8])
507 AC_CACHE_VAL(ac_cv_int8,
513 -AC_DEFUN(MYSQL_HEADER_CHECKS,[
514 +AC_DEFUN([MYSQL_HEADER_CHECKS],[
516 AC_CHECK_HEADERS(sgtty.h sys/ioctl.h \
517 fcntl.h float.h floatingpoint.h ieeefp.h limits.h \
519 unistd.h utime.h sys/utime.h termio.h termios.h sched.h crypt.h alloca.h)
522 -AC_DEFUN(MYSQL_TYPE_CHECKS,[
523 +AC_DEFUN([MYSQL_TYPE_CHECKS],[
525 AC_REQUIRE([AC_C_CONST])
526 AC_REQUIRE([AC_C_INLINE])
527 --- php-4.3.6/ext/mysql/libmysql/mysql.m4~autotools.patch 2002-03-07 09:19:29.000000000 -0500
528 +++ php-4.3.6/ext/mysql/libmysql/mysql.m4 2004-06-04 18:21:54.896678755 -0400
530 -AC_DEFUN(MYSQL_CHECKS,[
531 +AC_DEFUN([MYSQL_CHECKS],[
533 AC_REQUIRE([AC_PROG_CC])
534 AC_REQUIRE([AC_PROG_LN_S])
535 --- php-4.3.6/ext/oci8/config.m4~autotools.patch 2004-02-03 09:22:34.000000000 -0500
536 +++ php-4.3.6/ext/oci8/config.m4 2004-06-04 18:21:54.896678755 -0400
538 dnl $Id: config.m4,v 1.37.2.9 2004/02/03 14:22:34 tony2001 Exp $
541 -AC_DEFUN(PHP_OCI_IF_DEFINED,[
542 +AC_DEFUN([PHP_OCI_IF_DEFINED],[
543 old_CPPFLAGS=$CPPFLAGS
550 -AC_DEFUN(AC_OCI8_VERSION,[
551 +AC_DEFUN([AC_OCI8_VERSION],[
552 AC_MSG_CHECKING([Oracle version])
553 if test -s "$OCI8_DIR/orainst/unix.rgs"; then
554 OCI8_VERSION=`grep '"ocommon"' $OCI8_DIR/orainst/unix.rgs | sed 's/[ ][ ]*/:/g' | cut -d: -f 6 | cut -c 2-4`
555 --- php-4.3.6/ext/odbc/config.m4~autotools.patch 2003-11-25 03:08:30.000000000 -0500
556 +++ php-4.3.6/ext/odbc/config.m4 2004-06-04 18:21:54.896678755 -0400
559 dnl Figure out which library file to link with for the Solid support.
561 -AC_DEFUN(AC_FIND_SOLID_LIBS,[
562 +AC_DEFUN([AC_FIND_SOLID_LIBS],[
563 AC_MSG_CHECKING([Solid library file])
564 ac_solid_uname_r=`uname -r 2>/dev/null`
565 ac_solid_uname_s=`uname -s 2>/dev/null`
568 dnl Figure out which library file to link with for the Empress support.
570 -AC_DEFUN(AC_FIND_EMPRESS_LIBS,[
571 +AC_DEFUN([AC_FIND_EMPRESS_LIBS],[
572 AC_MSG_CHECKING([Empress library file])
573 ODBC_LIBS=`echo $1/libempodbccl.so | cut -d' ' -f1`
574 if test ! -f $ODBC_LIBS; then
576 AC_MSG_RESULT(`echo $ODBC_LIBS | sed -e 's!.*/!!'`)
579 -AC_DEFUN(AC_FIND_EMPRESS_BCS_LIBS,[
580 +AC_DEFUN([AC_FIND_EMPRESS_BCS_LIBS],[
581 AC_MSG_CHECKING([Empress local access library file])
582 ODBCBCS_LIBS=`echo $1/libempodbcbcs.a | cut -d' ' -f1`
583 if test ! -f $ODBCBCS_LIBS; then
584 --- php-4.3.6/ext/oracle/config.m4~autotools.patch 2003-10-03 01:25:41.000000000 -0400
585 +++ php-4.3.6/ext/oracle/config.m4 2004-06-04 18:21:54.896678755 -0400
587 dnl $Id: config.m4,v 1.29.4.1 2003/10/03 05:25:41 sniper Exp $
590 -AC_DEFUN(AC_ORACLE_VERSION,[
591 +AC_DEFUN([AC_ORACLE_VERSION],[
592 AC_MSG_CHECKING([Oracle version])
593 if test -s "$ORACLE_DIR/orainst/unix.rgs"; then
594 ORACLE_VERSION=`grep '"ocommon"' $ORACLE_DIR/orainst/unix.rgs | sed 's/[ ][ ]*/:/g' | cut -d: -f 6 | cut -c 2-4`
595 --- php-4.3.6/ext/pgsql/config.m4~autotools.patch 2002-06-26 09:07:40.000000000 -0400
596 +++ php-4.3.6/ext/pgsql/config.m4 2004-06-04 18:21:54.896678755 -0400
598 dnl $Id: config.m4,v 1.34 2002/06/26 13:07:40 derick Exp $
601 -AC_DEFUN(PHP_PGSQL_CHECK_FUNCTIONS,[
602 +AC_DEFUN([PHP_PGSQL_CHECK_FUNCTIONS],[
605 PHP_ARG_WITH(pgsql,for PostgreSQL support,
606 --- php-4.3.6/ext/standard/config.m4~autotools.patch 2004-04-04 08:31:38.000000000 -0400
607 +++ php-4.3.6/ext/standard/config.m4 2004-06-04 18:21:54.897678515 -0400
610 dnl Check if flush should be called explicitly after buffered io
612 -AC_DEFUN(AC_FLUSH_IO,[
613 +AC_DEFUN([AC_FLUSH_IO],[
614 AC_CACHE_CHECK([whether flush should be called explicitly after a buffered io], ac_cv_flush_io,[
619 dnl Check for crypt() capabilities
621 -AC_DEFUN(AC_CRYPT_CAP,[
622 +AC_DEFUN([AC_CRYPT_CAP],[
624 if test "$ac_cv_func_crypt" = "no"; then
625 AC_CHECK_LIB(crypt, crypt, [
626 --- php-4.3.6/ext/xmlrpc/libxmlrpc/acinclude.m4~autotools.patch 2001-09-06 05:36:57.000000000 -0400
627 +++ php-4.3.6/ext/xmlrpc/libxmlrpc/acinclude.m4 2004-06-04 18:21:54.897678515 -0400
629 # Local macros for automake & autoconf
631 -AC_DEFUN(XMLRPC_FUNCTION_CHECKS,[
632 +AC_DEFUN([XMLRPC_FUNCTION_CHECKS],[
634 # Standard XMLRPC list
640 -AC_DEFUN(XMLRPC_HEADER_CHECKS,[
641 +AC_DEFUN([XMLRPC_HEADER_CHECKS],[
643 AC_CHECK_HEADERS(xmlparse.h xmltok.h stdlib.h strings.h string.h)
646 -AC_DEFUN(XMLRPC_TYPE_CHECKS,[
647 +AC_DEFUN([XMLRPC_TYPE_CHECKS],[
649 AC_REQUIRE([AC_C_CONST])
650 AC_REQUIRE([AC_C_INLINE])
651 --- php-4.3.6/ext/xmlrpc/libxmlrpc/xmlrpc.m4~autotools.patch 2002-03-07 09:19:43.000000000 -0500
652 +++ php-4.3.6/ext/xmlrpc/libxmlrpc/xmlrpc.m4 2004-06-04 18:21:54.897678515 -0400
654 -AC_DEFUN(XMLRPC_CHECKS,[
655 +AC_DEFUN([XMLRPC_CHECKS],[
657 AC_REQUIRE([AC_PROG_CC])
658 AC_REQUIRE([AC_PROG_LN_S])
659 --- php-4.3.6/sapi/cgi/config9.m4~autotools.patch 2003-12-01 11:12:38.000000000 -0500
660 +++ php-4.3.6/sapi/cgi/config9.m4 2004-06-04 18:21:54.897678515 -0400
662 PHP_ENABLE_PATHINFO_CHECK=yes
665 -AC_DEFUN(PHP_TEST_WRITE_STDOUT,[
666 +AC_DEFUN([PHP_TEST_WRITE_STDOUT],[
667 AC_CACHE_CHECK(whether writing to stdout works,ac_cv_write_stdout,[
670 --- php-4.3.6/sapi/cgi/libfcgi/acinclude.m4~autotools.patch 2002-12-02 00:25:55.000000000 -0500
671 +++ php-4.3.6/sapi/cgi/libfcgi/acinclude.m4 2004-06-04 18:21:54.897678515 -0400
673 dnl $Id: acinclude.m4,v 1.1.2.2 2002/12/02 05:25:55 shane Exp $
675 -AC_DEFUN(FCGI_COMMON_CHECKS, [
676 +AC_DEFUN([FCGI_COMMON_CHECKS], [
677 AC_MSG_CHECKING([for sun_len in sys/un.h])
678 AC_EGREP_HEADER([sun_len], [sys/un.h],
679 [AC_MSG_RESULT([yes])
680 --- php-4.3.6/scripts/phpize.m4~autotools.patch 2003-09-03 04:07:51.000000000 -0400
681 +++ php-4.3.6/scripts/phpize.m4 2004-06-04 18:21:54.897678515 -0400
684 PHP_INIT_BUILD_SYSTEM
686 -AC_DEFUN(PHP_WITH_PHP_CONFIG,[
687 +AC_DEFUN([PHP_WITH_PHP_CONFIG],[
688 AC_ARG_WITH(php-config,
689 [ --with-php-config=PATH],[
692 AC_MSG_RESULT($EXTENSION_DIR)
695 -AC_DEFUN(PHP_EXT_BUILDDIR,[.])dnl
696 -AC_DEFUN(PHP_EXT_DIR,[""])dnl
697 -AC_DEFUN(PHP_EXT_SRCDIR,[$abs_srcdir])dnl
698 -AC_DEFUN(PHP_ALWAYS_SHARED,[
699 +AC_DEFUN([PHP_EXT_BUILDDIR],[.])dnl
700 +AC_DEFUN([PHP_EXT_DIR],[""])dnl
701 +AC_DEFUN([PHP_EXT_SRCDIR],[$abs_srcdir])dnl
702 +AC_DEFUN([PHP_ALWAYS_SHARED],[
703 ext_output="yes, shared"
705 test "[$]$1" = "no" && $1=yes
706 --- php-4.3.6/TSRM/acinclude.m4~autotools.patch 1999-10-04 11:22:18.000000000 -0400
707 +++ php-4.3.6/TSRM/acinclude.m4 2004-06-04 18:21:54.898678276 -0400
710 -AC_DEFUN(AM_SET_LIBTOOL_VARIABLE,[
711 - LIBTOOL='$(SHELL) $(top_builddir)/libtool $1'
713 +dnl Set libtool variable
715 +AC_DEFUN([PHP_SET_LIBTOOL_VARIABLE],[
716 + if test -z "$LIBTOOL"; then
717 + LIBTOOL='$(SHELL) $(top_builddir)/libtool $1'
719 + LIBTOOL="$LIBTOOL $1"
723 --- php-4.3.6/TSRM/threads.m4~autotools.patch 2002-10-05 07:26:17.000000000 -0400
724 +++ php-4.3.6/TSRM/threads.m4 2004-06-04 18:21:54.898678276 -0400
727 dnl Set some magic defines to achieve POSIX threads conformance
729 -AC_DEFUN(PTHREADS_FLAGS,[
730 +AC_DEFUN([PTHREADS_FLAGS],[
731 if test -z "$host_alias" && test -n "$host"; then
736 dnl Check whether the current setup can use POSIX threads calls
738 -AC_DEFUN(PTHREADS_CHECK_COMPILE, [
739 +AC_DEFUN([PTHREADS_CHECK_COMPILE], [
744 dnl -qthreaded AIX cc V5
745 dnl -threads gcc (HP-UX)
747 -AC_DEFUN(PTHREADS_CHECK,[
748 +AC_DEFUN([PTHREADS_CHECK],[
750 if test "$beos_threads" = "1"; then
751 pthreads_working="yes"
756 -AC_DEFUN(PTHREADS_ASSIGN_VARS,[
757 +AC_DEFUN([PTHREADS_ASSIGN_VARS],[
758 if test -n "$ac_cv_pthreads_lib"; then
759 LIBS="$LIBS -l$ac_cv_pthreads_lib"
761 --- php-4.3.6/TSRM/tsrm.m4~autotools.patch 2003-10-03 01:25:30.000000000 -0400
762 +++ php-4.3.6/TSRM/tsrm.m4 2004-06-04 18:21:54.898678276 -0400
765 dnl TSRM_CHECK_GCC_ARG(ARG, ACTION-IF-FOUND, ACTION-IF-NOT_FOUND)
766 -AC_DEFUN(TSRM_CHECK_GCC_ARG,[
767 +AC_DEFUN([TSRM_CHECK_GCC_ARG],[
768 gcc_arg_name=[ac_cv_gcc_arg]translit($1,A-Z-,a-z_)
769 AC_CACHE_CHECK([whether $CC supports $1], [ac_cv_gcc_arg]translit($1,A-Z-,a-z_), [
770 echo 'void somefunc() { };' > conftest.c
775 -AC_DEFUN(TSRM_BASIC_CHECKS,[
776 +AC_DEFUN([TSRM_BASIC_CHECKS],[
778 AC_REQUIRE([AC_PROG_CC])dnl
779 dnl AC_REQUIRE([AM_PROG_CC_STDC])dnl
784 -AC_DEFUN(TSRM_CHECK_PTH,[
785 +AC_DEFUN([TSRM_CHECK_PTH],[
787 AC_MSG_CHECKING(for GNU Pth)
788 PTH_PREFIX="`$1 --prefix`"
793 -AC_DEFUN(TSRM_CHECK_ST,[
794 +AC_DEFUN([TSRM_CHECK_ST],[
795 if test -r "$1/include/st.h"; then
796 CPPFLAGS="$CPPFLAGS -I$1/include"
797 LDFLAGS="$LDFLAGS -L$1/lib"
802 -sinclude(TSRM/threads.m4)
804 -AC_DEFUN(TSRM_CHECK_PTHREADS,[
805 +AC_DEFUN([TSRM_CHECK_PTHREADS],[
813 -AC_DEFUN(TSRM_THREADS_CHECKS,[
814 +AC_DEFUN([TSRM_THREADS_CHECKS],[
816 dnl For the thread implementations, we always use --with-*
817 dnl to maintain consistency
818 --- php-4.3.6/Zend/acinclude.m4~autotools.patch 2000-06-18 12:51:41.000000000 -0400
819 +++ php-4.3.6/Zend/acinclude.m4 2004-06-04 18:21:54.898678276 -0400
822 dnl This file contains local autoconf functions.
824 -AC_DEFUN(ZEND_FP_EXCEPT,[
825 +AC_DEFUN([ZEND_FP_EXCEPT],[
826 AC_CACHE_CHECK(whether fp_except is defined, ac_cv_type_fp_except,[
828 #include <floatingpoint.h>
831 dnl Check for broken sprintf()
833 -AC_DEFUN(AC_ZEND_BROKEN_SPRINTF,[
834 +AC_DEFUN([AC_ZEND_BROKEN_SPRINTF],[
835 AC_CACHE_CHECK(whether sprintf is broken, ac_cv_broken_sprintf,[
836 AC_TRY_RUN([main() {char buf[20];exit(sprintf(buf,"testing 123")!=11); }],[
837 ac_cv_broken_sprintf=no
839 AC_DEFINE_UNQUOTED(ZEND_BROKEN_SPRINTF, $ac_result, [Whether sprintf is broken])
842 -AC_DEFUN(AM_SET_LIBTOOL_VARIABLE,[
843 +AC_DEFUN([AM_SET_LIBTOOL_VARIABLE],[
844 LIBTOOL='$(SHELL) $(top_builddir)/libtool $1'
847 --- php-4.3.6/Zend/Zend.m4~autotools.patch 2003-10-07 18:49:27.000000000 -0400
848 +++ php-4.3.6/Zend/Zend.m4 2004-06-04 18:21:54.898678276 -0400
850 dnl This file contains Zend specific autoconf functions.
853 -AC_DEFUN(LIBZEND_BISON_CHECK,[
854 +AC_DEFUN([LIBZEND_BISON_CHECK],[
856 if test "$YACC" != "bison -y"; then
857 AC_MSG_WARN(You will need bison if you want to regenerate the Zend parser.)
862 -AC_DEFUN(LIBZEND_BASIC_CHECKS,[
863 +AC_DEFUN([LIBZEND_BASIC_CHECKS],[
865 AC_REQUIRE([AC_PROG_YACC])
866 AC_REQUIRE([AC_PROG_CC])
871 -AC_DEFUN(LIBZEND_LIBDL_CHECKS,[
872 +AC_DEFUN([LIBZEND_LIBDL_CHECKS],[
873 AC_CHECK_LIB(dl, dlopen, [LIBS="-ldl $LIBS"])
874 AC_CHECK_FUNC(dlopen,[AC_DEFINE(HAVE_LIBDL, 1,[ ])])
877 -AC_DEFUN(LIBZEND_DLSYM_CHECK,[
878 +AC_DEFUN([LIBZEND_DLSYM_CHECK],[
880 dnl Ugly hack to check if dlsym() requires a leading underscore in symbol name.
886 -AC_DEFUN(LIBZEND_ENABLE_DEBUG,[
887 +AC_DEFUN([LIBZEND_ENABLE_DEBUG],[
890 [ --enable-debug Compile with debugging symbols],[
895 -AC_DEFUN(LIBZEND_OTHER_CHECKS,[
896 +AC_DEFUN([LIBZEND_OTHER_CHECKS],[
898 AC_ARG_ENABLE(experimental-zts,
899 [ --enable-experimental-zts
904 -AC_DEFUN(LIBZEND_CPLUSPLUS_CHECKS,[
905 +AC_DEFUN([LIBZEND_CPLUSPLUS_CHECKS],[
908 --- php-4.3.6/configure.in~autotools.patch 2004-04-14 11:00:35.000000000 -0400
909 +++ php-4.3.6/configure.in 2004-06-04 18:21:54.899678036 -0400
911 VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION"
913 dnl Define where extension directories are located in the configure context
914 -AC_DEFUN(PHP_EXT_BUILDDIR,[ext/$1])dnl
915 -AC_DEFUN(PHP_EXT_DIR,[ext/$1])dnl
916 -AC_DEFUN(PHP_EXT_SRCDIR,[$abs_srcdir/ext/$1])dnl
917 -AC_DEFUN(PHP_ALWAYS_SHARED,[])dnl
918 +AC_DEFUN([PHP_EXT_BUILDDIR],[ext/$1])dnl
919 +AC_DEFUN([PHP_EXT_DIR],[ext/$1])dnl
920 +AC_DEFUN([PHP_EXT_SRCDIR],[$abs_srcdir/ext/$1])dnl
921 +AC_DEFUN([PHP_ALWAYS_SHARED],[])dnl
923 dnl Setting up the PHP version based on the information above.
924 dnl -------------------------------------------------------------------------
925 --- php-4.3.6/TSRM/configure.in~autotools.patch 2001-08-08 06:26:21.000000000 -0400
926 +++ php-4.3.6/TSRM/configure.in 2004-06-04 18:21:54.899678036 -0400
930 if test "$enable_debug" != "yes"; then
931 - AM_SET_LIBTOOL_VARIABLE([--silent])
932 + PHP_SET_LIBTOOL_VARIABLE([--silent])