krax

Untitled

Mar 29th, 2011
236
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. ++++++ php5-autoconf-2.65.patch ++++++
  2. Index: scripts/phpize.m4
  3. ===================================================================
  4. --- scripts/phpize.m4.orig
  5. +++ scripts/phpize.m4
  6. @@ -1,6 +1,6 @@
  7. dnl This file becomes configure.in for self-contained extensions.
  8.  
  9. -divert(1)
  10. +divert(1001)
  11.  
  12. AC_PREREQ(2.13)
  13. AC_INIT(config.m4)
  14. Index: ext/standard/config.m4
  15. ===================================================================
  16. --- ext/standard/config.m4.orig
  17. +++ ext/standard/config.m4
  18. @@ -1,6 +1,6 @@
  19. dnl $Id: config.m4,v 1.80.2.3.2.3.2.8 2009/01/11 23:37:16 scottmac Exp $ -*-
  20. autoconf -*-
  21.  
  22. -divert(3)dnl
  23. +divert(1003)dnl
  24.  
  25. dnl
  26. dnl Check if flush should be called explicitly after buffered io
  27. @@ -220,21 +220,21 @@ dnl
  28. AC_CHECK_FUNCS(getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice
  29. fpclass isinf isnan)
  30. AC_FUNC_FNMATCH
  31.  
  32. -divert(5)dnl
  33. +divert(1005)dnl
  34.  
  35. dnl
  36. dnl Check if there is a support means of creating a new process
  37. dnl and defining which handles it receives
  38. dnl
  39. -AC_CACHE_VAL(php_can_support_proc_open,[
  40. +AC_CACHE_VAL(php_cv_can_support_proc_open,[
  41. AC_CHECK_FUNCS(fork CreateProcess, [
  42. - php_can_support_proc_open=yes
  43. + php_cv_can_support_proc_open=yes
  44. break
  45. ],[
  46. - php_can_support_proc_open=no
  47. + php_cv_can_support_proc_open=no
  48. ])])
  49. AC_MSG_CHECKING([if your OS can spawn processes with inherited handles])
  50. -if test "$php_can_support_proc_open" = "yes"; then
  51. +if test "$php_cv_can_support_proc_open" = "yes"; then
  52. AC_MSG_RESULT(yes)
  53. AC_DEFINE(PHP_CAN_SUPPORT_PROC_OPEN,1, [Define if your system has
  54. fork/vfork/CreateProcess])
  55. else
  56. Index: ext/pdo_oci/config.m4
  57. ===================================================================
  58. --- ext/pdo_oci/config.m4.orig
  59. +++ ext/pdo_oci/config.m4
  60. @@ -199,18 +199,18 @@ You need to tell me where to find your O
  61. ],[
  62. AC_MSG_CHECKING([for PDO includes])
  63. if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
  64. - pdo_inc_path=$abs_srcdir/ext
  65. + pdo_cv_inc_path=$abs_srcdir/ext
  66. elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
  67. - pdo_inc_path=$abs_srcdir/ext
  68. + pdo_cv_inc_path=$abs_srcdir/ext
  69. elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
  70. - pdo_inc_path=$prefix/include/php/ext
  71. + pdo_cv_inc_path=$prefix/include/php/ext
  72. else
  73. AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
  74. fi
  75. - AC_MSG_RESULT($pdo_inc_path)
  76. + AC_MSG_RESULT($pdo_cv_inc_path)
  77. ])
  78.  
  79. - PHP_NEW_EXTENSION(pdo_oci, pdo_oci.c oci_driver.c oci_statement.c,
  80. $ext_shared,,-I$pdo_inc_path)
  81. + PHP_NEW_EXTENSION(pdo_oci, pdo_oci.c oci_driver.c oci_statement.c,
  82. $ext_shared,,-I$pdo_cv_inc_path)
  83.  
  84. PHP_SUBST_OLD(PDO_OCI_SHARED_LIBADD)
  85. PHP_SUBST_OLD(PDO_OCI_DIR)
  86. Index: ext/pdo_dblib/config.m4
  87. ===================================================================
  88. --- ext/pdo_dblib/config.m4.orig
  89. +++ ext/pdo_dblib/config.m4
  90. @@ -59,19 +59,19 @@ if test "$PHP_PDO_DBLIB" != "no"; then
  91. ],[
  92. AC_MSG_CHECKING([for PDO includes])
  93. if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
  94. - pdo_inc_path=$abs_srcdir/ext
  95. + pdo_cv_inc_path=$abs_srcdir/ext
  96. elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
  97. - pdo_inc_path=$abs_srcdir/ext
  98. + pdo_cv_inc_path=$abs_srcdir/ext
  99. elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
  100. - pdo_inc_path=$prefix/include/php/ext
  101. + pdo_cv_inc_path=$prefix/include/php/ext
  102. else
  103. AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
  104. fi
  105. - AC_MSG_RESULT($pdo_inc_path)
  106. + AC_MSG_RESULT($pdo_cv_inc_path)
  107. ])
  108.  
  109. PDO_DBLIB_DEFS="-DPDO_DBLIB_FLAVOUR=\\\"freetds\\\""
  110. - PHP_NEW_EXTENSION(pdo_dblib, pdo_dblib.c dblib_driver.c dblib_stmt.c,
  111. $ext_shared,,-I$pdo_inc_path $PDO_DBLIB_DEFS)
  112. + PHP_NEW_EXTENSION(pdo_dblib, pdo_dblib.c dblib_driver.c dblib_stmt.c,
  113. $ext_shared,,-I$pdo_cv_inc_path $PDO_DBLIB_DEFS)
  114. AC_CHECK_LIB(dnet_stub, dnet_addr,
  115. [ PHP_ADD_LIBRARY_WITH_PATH(dnet_stub,,PDO_DBLIB_SHARED_LIBADD)
  116. AC_DEFINE(HAVE_LIBDNET_STUB,1,[ ])
  117. Index: ext/sqlite/config.m4
  118. ===================================================================
  119. --- ext/sqlite/config.m4.orig
  120. +++ ext/sqlite/config.m4
  121. @@ -48,9 +48,9 @@ AC_DEFUN([PHP_PROG_LEMON],[
  122. if test "$PHP_SQLITE" != "no"; then
  123. if test "$PHP_PDO" != "no"; then
  124. PHP_CHECK_PDO_INCLUDES([], [AC_MSG_WARN([Cannot find php_pdo_driver.h.])])
  125. - if test -n "$pdo_inc_path"; then
  126. + if test -n "$pdo_cv_inc_path"; then
  127. AC_DEFINE([PHP_SQLITE2_HAVE_PDO], [1], [Have PDO])
  128. - pdo_inc_path="-I$pdo_inc_path"
  129. + pdo_cv_inc_path="-I$pdo_cv_inc_path"
  130. fi
  131. fi
  132.  
  133. @@ -83,13 +83,13 @@ if test "$PHP_SQLITE" != "no"; then
  134. -L$SQLITE_DIR/$PHP_LIBDIR -lm
  135. ])
  136. SQLITE_MODULE_TYPE=external
  137. - PHP_SQLITE_CFLAGS=$pdo_inc_path
  138. + PHP_SQLITE_CFLAGS=$pdo_cv_inc_path
  139. sqlite_extra_sources="libsqlite/src/encode.c"
  140. else
  141. # use bundled library
  142. PHP_PROG_LEMON
  143. SQLITE_MODULE_TYPE=builtin
  144. - PHP_SQLITE_CFLAGS="-I@ext_srcdir@/libsqlite/src
  145. -I@ext_builddir@/libsqlite/src $pdo_inc_path"
  146. + PHP_SQLITE_CFLAGS="-I@ext_srcdir@/libsqlite/src
  147. -I@ext_builddir@/libsqlite/src $pdo_cv_inc_path"
  148. sqlite_extra_sources="libsqlite/src/opcodes.c \
  149. libsqlite/src/parse.c libsqlite/src/encode.c \
  150. libsqlite/src/auth.c libsqlite/src/btree.c libsqlite/src/build.c \
  151. Index: ext/pdo_sqlite/config.m4
  152. ===================================================================
  153. --- ext/pdo_sqlite/config.m4.orig
  154. +++ ext/pdo_sqlite/config.m4
  155. @@ -19,15 +19,15 @@ if test "$PHP_PDO_SQLITE" != "no"; then
  156. ],[
  157. AC_MSG_CHECKING([for PDO includes])
  158. if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
  159. - pdo_inc_path=$abs_srcdir/ext
  160. + pdo_cv_inc_path=$abs_srcdir/ext
  161. elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
  162. - pdo_inc_path=$abs_srcdir/ext
  163. + pdo_cv_inc_path=$abs_srcdir/ext
  164. elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
  165. - pdo_inc_path=$prefix/include/php/ext
  166. + pdo_cv_inc_path=$prefix/include/php/ext
  167. else
  168. AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
  169. fi
  170. - AC_MSG_RESULT($pdo_inc_path)
  171. + AC_MSG_RESULT($pdo_cv_inc_path)
  172. ])
  173.  
  174. php_pdo_sqlite_sources_core="pdo_sqlite.c sqlite_driver.c sqlite_statement.c"
  175. @@ -70,7 +70,7 @@ if test "$PHP_PDO_SQLITE" != "no"; then
  176. ])
  177.  
  178. PHP_SUBST(PDO_SQLITE_SHARED_LIBADD)
  179. - PHP_NEW_EXTENSION(pdo_sqlite, $php_pdo_sqlite_sources_core,
  180. $ext_shared,,-I$pdo_inc_path)
  181. + PHP_NEW_EXTENSION(pdo_sqlite, $php_pdo_sqlite_sources_core,
  182. $ext_shared,,-I$pdo_cv_inc_path)
  183. else
  184. # use bundled libs
  185. if test "$enable_maintainer_zts" = "yes"; then
  186. @@ -92,7 +92,7 @@ if test "$PHP_PDO_SQLITE" != "no"; then
  187.  
  188. PHP_NEW_EXTENSION(pdo_sqlite,
  189. $php_pdo_sqlite_sources_core,
  190. - $ext_shared,,-DPDO_SQLITE_BUNDLED=1 $other_flags $threadsafe_flags
  191. -I$pdo_inc_path)
  192. + $ext_shared,,-DPDO_SQLITE_BUNDLED=1 $other_flags $threadsafe_flags
  193. -I$pdo_cv_inc_path)
  194.  
  195. PHP_SUBST(PDO_SQLITE_SHARED_LIBADD)
  196. PHP_ADD_EXTENSION_DEP(pdo_sqlite, sqlite3)
  197. Index: ext/pdo_mysql/config.m4
  198. ===================================================================
  199. --- ext/pdo_mysql/config.m4.orig
  200. +++ ext/pdo_mysql/config.m4
  201. @@ -148,20 +148,20 @@ if test "$PHP_PDO_MYSQL" != "no"; then
  202. ],[
  203. AC_MSG_CHECKING([for PDO includes])
  204. if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
  205. - pdo_inc_path=$abs_srcdir/ext
  206. + pdo_cv_inc_path=$abs_srcdir/ext
  207. elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
  208. - pdo_inc_path=$abs_srcdir/ext
  209. + pdo_cv_inc_path=$abs_srcdir/ext
  210. elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
  211. - pdo_inc_path=$prefix/include/php/ext
  212. + pdo_cv_inc_path=$prefix/include/php/ext
  213. else
  214. AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
  215. fi
  216. - AC_MSG_RESULT($pdo_inc_path)
  217. + AC_MSG_RESULT($pdo_cv_inc_path)
  218. ])
  219.  
  220.  
  221. dnl fix after renaming to pdo_mysql
  222. - PHP_NEW_EXTENSION(pdo_mysql, pdo_mysql.c mysql_driver.c mysql_statement.c,
  223. $ext_shared,,-I$pdo_inc_path -I)
  224. + PHP_NEW_EXTENSION(pdo_mysql, pdo_mysql.c mysql_driver.c mysql_statement.c,
  225. $ext_shared,,-I$pdo_cv_inc_path -I)
  226. ifdef([PHP_ADD_EXTENSION_DEP],
  227. [
  228. PHP_ADD_EXTENSION_DEP(pdo_mysql, pdo)
  229. Index: ext/pdo_firebird/config.m4
  230. ===================================================================
  231. --- ext/pdo_firebird/config.m4.orig
  232. +++ ext/pdo_firebird/config.m4
  233. @@ -50,7 +50,7 @@ if test "$PHP_PDO_FIREBIRD" != "no"; the
  234. PHP_ADD_LIBRARY_WITH_PATH($FIREBIRD_LIBNAME, $FIREBIRD_LIBDIR,
  235. PDO_FIREBIRD_SHARED_LIBADD)
  236. PHP_ADD_INCLUDE($FIREBIRD_INCDIR)
  237. AC_DEFINE(HAVE_PDO_FIREBIRD,1,[ ])
  238. - PHP_NEW_EXTENSION(pdo_firebird, pdo_firebird.c firebird_driver.c
  239. firebird_statement.c, $ext_shared,,-I$pdo_inc_path)
  240. + PHP_NEW_EXTENSION(pdo_firebird, pdo_firebird.c firebird_driver.c
  241. firebird_statement.c, $ext_shared,,-I$pdo_cv_inc_path)
  242. PHP_SUBST(PDO_FIREBIRD_SHARED_LIBADD)
  243. PHP_ADD_EXTENSION_DEP(pdo_firebird, pdo)
  244. fi
  245. Index: ext/mbstring/config.m4
  246. ===================================================================
  247. --- ext/mbstring/config.m4.orig
  248. +++ ext/mbstring/config.m4
  249. @@ -74,7 +74,7 @@ AC_DEFUN([PHP_MBSTRING_SETUP_MBREGEX], [
  250. AC_DEFINE([USE_COMBINATION_EXPLOSION_CHECK],1,[whether to check
  251. multibyte regex backtrack])
  252. fi
  253.  
  254. - AC_CACHE_CHECK(for variable length prototypes and stdarg.h,
  255. cv_php_mbstring_stdarg, [
  256. + AC_CACHE_CHECK(for variable length prototypes and stdarg.h,
  257. php_cv_mbstring_stdarg, [
  258. AC_TRY_RUN([
  259. #include <stdarg.h>
  260. int foo(int x, ...) {
  261. @@ -86,14 +86,14 @@ int foo(int x, ...) {
  262. return 0;
  263. }
  264. int main() { return foo(10, "", 3.14); }
  265. - ], [cv_php_mbstring_stdarg=yes], [cv_php_mbstring_stdarg=no], [
  266. + ], [php_cv_mbstring_stdarg=yes], [php_cv_mbstring_stdarg=no], [
  267. dnl cross-compile needs something here
  268. case $host_alias in
  269. *netware*)
  270. - cv_php_mbstring_stdarg=yes
  271. + php_cv_mbstring_stdarg=yes
  272. ;;
  273. *)
  274. - cv_php_mbstring_stdarg=no
  275. + php_cv_mbstring_stdarg=no
  276. ;;
  277. esac
  278. ])
  279. Index: ext/pdo_pgsql/config.m4
  280. ===================================================================
  281. --- ext/pdo_pgsql/config.m4.orig
  282. +++ ext/pdo_pgsql/config.m4
  283. @@ -109,18 +109,18 @@ if test "$PHP_PDO_PGSQL" != "no"; then
  284. ],[
  285. AC_MSG_CHECKING([for PDO includes])
  286. if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
  287. - pdo_inc_path=$abs_srcdir/ext
  288. + pdo_cv_inc_path=$abs_srcdir/ext
  289. elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
  290. - pdo_inc_path=$abs_srcdir/ext
  291. + pdo_cv_inc_path=$abs_srcdir/ext
  292. elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
  293. - pdo_inc_path=$prefix/include/php/ext
  294. + pdo_cv_inc_path=$prefix/include/php/ext
  295. else
  296. AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
  297. fi
  298. - AC_MSG_RESULT($pdo_inc_path)
  299. + AC_MSG_RESULT($pdo_cv_inc_path)
  300. ])
  301.  
  302. - PHP_NEW_EXTENSION(pdo_pgsql, pdo_pgsql.c pgsql_driver.c pgsql_statement.c,
  303. $ext_shared,,-I$pdo_inc_path $PDO_PGSQL_CFLAGS)
  304. + PHP_NEW_EXTENSION(pdo_pgsql, pdo_pgsql.c pgsql_driver.c pgsql_statement.c,
  305. $ext_shared,,-I$pdo_cv_inc_path $PDO_PGSQL_CFLAGS)
  306. ifdef([PHP_ADD_EXTENSION_DEP],
  307. [
  308. PHP_ADD_EXTENSION_DEP(pdo_pgsql, pdo)
  309. Index: ext/pdo_odbc/config.m4
  310. ===================================================================
  311. --- ext/pdo_odbc/config.m4.orig
  312. +++ ext/pdo_odbc/config.m4
  313. @@ -47,15 +47,15 @@ if test "$PHP_PDO_ODBC" != "no"; then
  314. ],[
  315. AC_MSG_CHECKING([for PDO includes])
  316. if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
  317. - pdo_inc_path=$abs_srcdir/ext
  318. + pdo_cv_inc_path=$abs_srcdir/ext
  319. elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
  320. - pdo_inc_path=$abs_srcdir/ext
  321. + pdo_cv_inc_path=$abs_srcdir/ext
  322. elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
  323. - pdo_inc_path=$prefix/include/php/ext
  324. + pdo_cv_inc_path=$prefix/include/php/ext
  325. else
  326. AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
  327. fi
  328. - AC_MSG_RESULT($pdo_inc_path)
  329. + AC_MSG_RESULT($pdo_cv_inc_path)
  330. ])
  331.  
  332. AC_MSG_CHECKING([for selected PDO ODBC flavour])
  333. @@ -165,7 +165,7 @@ functions required for PDO support.
  334. AC_MSG_ERROR([Your ODBC library does not exist or there was an error.
  335. Check config.log for more information])
  336. ], $PDO_ODBC_LDFLAGS)
  337.  
  338. - PHP_NEW_EXTENSION(pdo_odbc, pdo_odbc.c odbc_driver.c odbc_stmt.c,
  339. $ext_shared,,-I$pdo_inc_path $PDO_ODBC_INCLUDE)
  340. + PHP_NEW_EXTENSION(pdo_odbc, pdo_odbc.c odbc_driver.c odbc_stmt.c,
  341. $ext_shared,,-I$pdo_cv_inc_path $PDO_ODBC_INCLUDE)
  342. PHP_SUBST(PDO_ODBC_SHARED_LIBADD)
  343. ifdef([PHP_ADD_EXTENSION_DEP],
  344. [
  345. Index: configure.in
  346. ===================================================================
  347. --- configure.in.orig
  348. +++ configure.in
  349. @@ -1,7 +1,7 @@
  350. ## $Id: configure.in,v 1.579.2.52.2.77.2.58 2009/06/26 15:44:18 johannes Exp $
  351. -*- autoconf -*-
  352. dnl ## Process this file with autoconf to produce a configure script.
  353.  
  354. -divert(1)
  355. +divert(1001)
  356.  
  357. dnl ## Diversion 1 is the autoconf + automake setup phase. We also
  358. dnl ## set the PHP version, deal with platform-specific compile
  359. @@ -308,7 +308,7 @@ sinclude(TSRM/threads.m4)
  360. sinclude(TSRM/tsrm.m4)
  361.  
  362.  
  363. -divert(2)
  364. +divert(1002)
  365.  
  366. dnl ## Diversion 2 is where we set PHP-specific options and come up
  367. dnl ## with reasonable default values for them. We check for pthreads here
  368. @@ -347,7 +347,7 @@ if test "$enable_maintainer_zts" = "yes"
  369. PTHREADS_FLAGS
  370. fi
  371.  
  372. -divert(3)
  373. +divert(1003)
  374.  
  375. dnl ## In diversion 3 we check for compile-time options to the PHP
  376. dnl ## core and how to deal with different system dependencies.
  377. @@ -702,7 +702,7 @@ if test "x$php_crypt_r" = "x1"; then
  378. PHP_CRYPT_R_STYLE
  379. fi
  380.  
  381. -divert(4)
  382. +divert(1004)
  383.  
  384. dnl ## In diversion 4 we check user-configurable general settings.
  385.  
  386. @@ -943,7 +943,7 @@ else
  387. AC_MSG_RESULT([using system default])
  388. fi
  389.  
  390. -divert(5)
  391. +divert(1005)
  392.  
  393. dnl ## In diversion 5 we check which extensions should be compiled.
  394. dnl ## All of these are normally in the extension directories.
  395. Index: acinclude.m4
  396. ===================================================================
  397. --- acinclude.m4.orig
  398. +++ acinclude.m4
  399. @@ -1688,7 +1688,7 @@ dnl PHP_BROKEN_GLIBC_FOPEN_APPEND
  400. dnl
  401. AC_DEFUN([PHP_BROKEN_GLIBC_FOPEN_APPEND], [
  402. AC_MSG_CHECKING([for broken libc stdio])
  403. - AC_CACHE_VAL(have_broken_glibc_fopen_append,[
  404. + AC_CACHE_VAL(_cv_have_broken_glibc_fopen_append,[
  405. AC_TRY_RUN([
  406. #include <stdio.h>
  407. int main(int argc, char *argv[])
  408. @@ -1714,8 +1714,8 @@ int main(int argc, char *argv[])
  409. return 0;
  410. }
  411. ],
  412. -[have_broken_glibc_fopen_append=no],
  413. -[have_broken_glibc_fopen_append=yes ],
  414. +[_cv_have_broken_glibc_fopen_append=no],
  415. +[_cv_have_broken_glibc_fopen_append=yes ],
  416. AC_TRY_COMPILE([
  417. #include <features.h>
  418. ],[
  419. @@ -1723,11 +1723,11 @@ AC_TRY_COMPILE([
  420. choke me
  421. #endif
  422. ],
  423. -[have_broken_glibc_fopen_append=yes],
  424. -[have_broken_glibc_fopen_append=no ])
  425. +[_cv_have_broken_glibc_fopen_append=yes],
  426. +[_cv_have_broken_glibc_fopen_append=no ])
  427. )])
  428.  
  429. - if test "$have_broken_glibc_fopen_append" = "yes"; then
  430. + if test "$_cv_have_broken_glibc_fopen_append" = "yes"; then
  431. AC_MSG_RESULT(yes)
  432. AC_DEFINE(HAVE_BROKEN_GLIBC_FOPEN_APPEND,1, [Define if your glibc borks on
  433. fopen with mode a+])
  434. else
  435. @@ -2736,17 +2736,17 @@ dnl
  436. dnl PHP_CHECK_PDO_INCLUDES([found [, not-found]])
  437. dnl
  438. AC_DEFUN([PHP_CHECK_PDO_INCLUDES],[
  439. - AC_CACHE_CHECK([for PDO includes], pdo_inc_path, [
  440. + AC_CACHE_CHECK([for PDO includes], pdo_cv_inc_path, [
  441. AC_MSG_CHECKING([for PDO includes])
  442. if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
  443. - pdo_inc_path=$abs_srcdir/ext
  444. + pdo_cv_inc_path=$abs_srcdir/ext
  445. elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
  446. - pdo_inc_path=$abs_srcdir/ext
  447. + pdo_cv_inc_path=$abs_srcdir/ext
  448. elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
  449. - pdo_inc_path=$prefix/include/php/ext
  450. + pdo_cv_inc_path=$prefix/include/php/ext
  451. fi
  452. ])
  453. - if test -n "$pdo_inc_path"; then
  454. + if test -n "$pdo_cv_inc_path"; then
  455. ifelse([$1],[],:,[$1])
  456. else
  457. ifelse([$2],[],[AC_MSG_ERROR([Cannot find php_pdo_driver.h.])],[$2])
  458. ++++++ php5-bug51224.patch ++++++
  459. Index: php-5.3.0/ext/pdo_odbc/odbc_driver.c
  460. ===================================================================
  461. --- php-5.3.0.orig/ext/pdo_odbc/odbc_driver.c
  462. +++ php-5.3.0/ext/pdo_odbc/odbc_driver.c
  463. @@ -346,7 +346,7 @@ static int odbc_handle_set_attr(pdo_dbh_
  464. default:
  465. strcpy(H->einfo.last_err_msg, "Unknown Attribute");
  466. H->einfo.what = "setAttribute";
  467. - strcpy(H->einfo.last_state, "IM0001");
  468. + strcpy(H->einfo.last_state, "IM001");
  469. return -1;
  470. }
  471. }
  472. Index: php-5.3.0/ext/pdo_odbc/odbc_stmt.c
  473. ===================================================================
  474. --- php-5.3.0.orig/ext/pdo_odbc/odbc_stmt.c
  475. +++ php-5.3.0/ext/pdo_odbc/odbc_stmt.c
  476. @@ -763,7 +763,7 @@ static int odbc_stmt_set_param(pdo_stmt_
  477. default:
  478. strcpy(S->einfo.last_err_msg, "Unknown Attribute");
  479. S->einfo.what = "setAttribute";
  480. - strcpy(S->einfo.last_state, "IM0001");
  481. + strcpy(S->einfo.last_state, "IM001");
  482. return -1;
  483. }
  484. }
  485. @@ -795,7 +795,7 @@ static int odbc_stmt_get_attr(pdo_stmt_t
  486. default:
  487. strcpy(S->einfo.last_err_msg, "Unknown Attribute");
  488. S->einfo.what = "getAttribute";
  489. - strcpy(S->einfo.last_state, "IM0001");
  490. + strcpy(S->einfo.last_state, "IM001");
  491. return -1;
  492. }
  493. }
RAW Paste Data