70 lines
2.2 KiB
Diff
70 lines
2.2 KiB
Diff
From 1357df0196806d5697b1f84497ef72aab5faa8a3 Mon Sep 17 00:00:00 2001
|
|
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
|
Date: Tue, 9 Aug 2016 11:50:49 +0200
|
|
Subject: [PATCH] iconv: tweak iconv detection
|
|
|
|
Tweak PHP_SETUP_ICONV from aclocal/acinclude.m4 to not
|
|
PHP_ADD_INCLUDE $ICONV_DIR/include since the tests use
|
|
test instead of AC_TRY_LINK to find headers which is bad,
|
|
specially when adding /usr and /usr/local to the mix.
|
|
Do basically the same with ext/iconv/config.m4 by tweaking
|
|
PHP_ICONV_H_PATH which, again, uses test and absolute paths.
|
|
|
|
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
|
[Gustavo: convert to nice m4 instead of patching configure]
|
|
[Gustavo: update for 5.6.10]
|
|
---
|
|
acinclude.m4 | 2 +-
|
|
ext/iconv/config.m4 | 22 ----------------------
|
|
2 files changed, 1 insertion(+), 23 deletions(-)
|
|
|
|
diff --git a/acinclude.m4 b/acinclude.m4
|
|
index af4aa06..1bd2652 100644
|
|
--- a/acinclude.m4
|
|
+++ b/acinclude.m4
|
|
@@ -2471,7 +2471,7 @@ AC_DEFUN([PHP_SETUP_ICONV], [
|
|
dnl
|
|
if test "$found_iconv" = "no"; then
|
|
|
|
- for i in $PHP_ICONV /usr/local /usr; do
|
|
+ for i in $PHP_ICONV; do
|
|
if test -r $i/include/giconv.h; then
|
|
AC_DEFINE(HAVE_GICONV_H, 1, [ ])
|
|
ICONV_DIR=$i
|
|
diff --git a/ext/iconv/config.m4 b/ext/iconv/config.m4
|
|
index 6a05697..694fcb8 100644
|
|
--- a/ext/iconv/config.m4
|
|
+++ b/ext/iconv/config.m4
|
|
@@ -14,28 +14,6 @@ if test "$PHP_ICONV" != "no"; then
|
|
])
|
|
|
|
if test "$iconv_avail" != "no"; then
|
|
- if test -z "$ICONV_DIR"; then
|
|
- for i in /usr/local /usr; do
|
|
- if test -f "$i/include/iconv.h" || test -f "$i/include/giconv.h"; then
|
|
- PHP_ICONV_PREFIX="$i"
|
|
- break
|
|
- fi
|
|
- done
|
|
- if test -z "$PHP_ICONV_PREFIX"; then
|
|
- PHP_ICONV_PREFIX="/usr"
|
|
- fi
|
|
- else
|
|
- PHP_ICONV_PREFIX="$ICONV_DIR"
|
|
- fi
|
|
-
|
|
- CFLAGS="-I$PHP_ICONV_PREFIX/include $CFLAGS"
|
|
- LDFLAGS="-L$PHP_ICONV_PREFIX/$PHP_LIBDIR $LDFLAGS"
|
|
-
|
|
- if test -r "$PHP_ICONV_PREFIX/include/giconv.h"; then
|
|
- PHP_ICONV_H_PATH="$PHP_ICONV_PREFIX/include/giconv.h"
|
|
- else
|
|
- PHP_ICONV_H_PATH="$PHP_ICONV_PREFIX/include/iconv.h"
|
|
- fi
|
|
|
|
AC_MSG_CHECKING([if iconv is glibc's])
|
|
AC_TRY_LINK([#include <gnu/libc-version.h>],[gnu_get_libc_version();],
|
|
--
|
|
2.7.4
|
|
|