1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-21 00:25:50 +00:00

Merge a patch from lang/php5 to fix build breakage.

Requested by:	George L. Yermulnik <yz@yz.kiev.ua>
This commit is contained in:
Florian Smeets 2014-07-16 20:36:14 +00:00
parent 570600660f
commit 63994e431e
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=362109

View File

@ -0,0 +1,23 @@
--- config.m4.orig 2014-05-15 08:00:57.801291749 +0000
+++ config.m4 2014-05-15 08:01:40.161014307 +0000
@@ -61,11 +61,9 @@
fi
fi
- dnl if iconv is shared or missing then we should build iconv ourselves
- if test "$PHP_ICONV_SHARED" = "yes" || test "$PHP_ICONV" = "no"; then
-
if test "$PHP_ICONV_DIR" != "no"; then
PHP_ICONV=$PHP_ICONV_DIR
+ PHP_ADD_INCLUDE($PHP_ICONV_DIR/include)
fi
if test -z "$PHP_ICONV" || test "$PHP_ICONV" = "no"; then
@@ -75,7 +73,6 @@
PHP_SETUP_ICONV(XMLRPC_SHARED_LIBADD, [], [
AC_MSG_ERROR([iconv not found, in order to build xmlrpc you need the iconv library])
])
- fi
fi
if test "$PHP_XMLRPC" = "yes"; then