mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-08-05 13:27:09 +02:00
4272e802a1
There two main reasons for this change: * Active support of PHP 5.x ended on January 2017, security support will end on December 2018. Packages in the main repository should be supported for at least 2 years, this means until first quarter of 2019 for the upcoming v3.6. * php7 and its extensions are currently in the community repository, so we can't use single abuild for both php5-* and php7-* packages (as we do for Python and Lua packages). This change was suggested by @vakartel, approved by @ncopa, @kaniini, and @jirutka.
46 lines
1.4 KiB
Diff
46 lines
1.4 KiB
Diff
diff --git a/ext/gd/config.m4 b/ext/gd/config.m4
|
|
index e643e52..fc41ab9 100644
|
|
--- a/ext/gd/config.m4
|
|
+++ b/ext/gd/config.m4
|
|
@@ -6,6 +6,9 @@ dnl
|
|
dnl Configure options
|
|
dnl
|
|
|
|
+PHP_ARG_WITH(iconv-dir, iconv dir for GD and XMLRPC-EPI,
|
|
+[ --with-iconv-dir=DIR GD/XMLRPC-EPI: iconv dir for GD/XMLRPC-EPI],no,no)
|
|
+
|
|
PHP_ARG_WITH(gd, for GD support,
|
|
[ --with-gd[=DIR] Include GD support. DIR is the GD library base
|
|
install directory [BUNDLED]])
|
|
@@ -329,6 +332,18 @@ dnl enable the support in bundled GD library
|
|
GDLIB_CFLAGS="$GDLIB_CFLAGS -DJISX0208"
|
|
fi
|
|
|
|
+ dnl link to iconv if needed
|
|
+ if test "$PHP_ICONV_DIR" != "no"; then
|
|
+ PHP_ICONV=$PHP_ICONV_DIR
|
|
+ fi
|
|
+
|
|
+ if test -z "$PHP_ICONV" || test "$PHP_ICONV" = "no"; then
|
|
+ PHP_ICONV=yes
|
|
+ fi
|
|
+
|
|
+ PHP_SETUP_ICONV(GD_SHARED_LIBADD, [], [
|
|
+ AC_MSG_ERROR([iconv not found, in order to build gd you need the iconv library])
|
|
+ ])
|
|
else
|
|
|
|
if test "$PHP_GD" != "no"; then
|
|
--- a/ext/xmlrpc/config.m4
|
|
+++ b/ext/xmlrpc/config.m4
|
|
@@ -18,9 +18,6 @@
|
|
PHP_ARG_WITH(libexpat-dir, libexpat dir for XMLRPC-EPI,
|
|
[ --with-libexpat-dir=DIR XMLRPC-EPI: libexpat dir for XMLRPC-EPI (deprecated)],no,no)
|
|
|
|
-PHP_ARG_WITH(iconv-dir, iconv dir for XMLRPC-EPI,
|
|
-[ --with-iconv-dir=DIR XMLRPC-EPI: iconv dir for XMLRPC-EPI],no,no)
|
|
-
|
|
if test "$PHP_XMLRPC" != "no"; then
|
|
|
|
PHP_ADD_EXTENSION_DEP(xmlrpc, libxml)
|