18 lines
727 B
Diff
18 lines
727 B
Diff
|
diff -up php-5.3.0beta1/ext/recode/config9.m4.recode php-5.3.0beta1/ext/recode/config9.m4
|
||
|
|
--- php-5.3.0beta1/ext/recode/config9.m4.recode 2008-12-02 00:30:21.000000000 +0100
|
||
|
|
+++ php-5.3.0beta1/ext/recode/config9.m4 2009-02-28 09:46:50.000000000 +0100
|
||
|
|
@@ -4,13 +4,6 @@ dnl
|
||
|
|
|
||
|
|
dnl Check for extensions with which Recode can not work
|
||
|
|
if test "$PHP_RECODE" != "no"; then
|
||
|
|
- test "$PHP_IMAP" != "no" && recode_conflict="$recode_conflict imap"
|
||
|
|
-
|
||
|
|
- if test -n "$MYSQL_LIBNAME"; then
|
||
|
|
- PHP_CHECK_LIBRARY($MYSQL_LIBNAME, hash_insert, [
|
||
|
|
- recode_conflict="$recode_conflict mysql"
|
||
|
|
- ])
|
||
|
|
- fi
|
||
|
|
|
||
|
|
if test -n "$recode_conflict"; then
|
||
|
|
AC_MSG_ERROR([recode extension can not be configured together with:$recode_conflict])
|