summarylogtreecommitdiffstats
path: root/recode-php5.4.patch
blob: 10a5d83e2e52a6e055e2a42d6859fb283fa57c3d (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
--- a/ext/recode/config9.m4
+++ b/ext/recode/config9.m4
@@ -13,6 +13,6 @@
   fi
 
   if test -n "$recode_conflict"; then
-    AC_MSG_ERROR([recode extension can not be configured together with:$recode_conflict])
+    AC_MSG_WARN([recode extension can not be configured together with:$recode_conflict])
   fi
 fi
--- php-5.6.40/configure
+++ php-5.6.40/configure
@@ -104651,10 +104651,6 @@
 fi
 
   fi
-
-  if test -n "$recode_conflict"; then
-    as_fn_error $? "recode extension can not be configured together with:$recode_conflict" "$LINENO" 5
-  fi
 fi