66 lines
2.0 KiB
Diff
66 lines
2.0 KiB
Diff
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.
|
|
And all this directly in configure since autoreconf isn't
|
|
happy with php.
|
|
|
|
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
|
|
|
diff -Nura php-5.5.11.orig/configure php-5.5.11/configure
|
|
--- php-5.5.11.orig/configure 2014-04-16 14:55:52.300838499 -0300
|
|
+++ php-5.5.11/configure 2014-04-22 21:54:01.499097295 -0300
|
|
@@ -45751,12 +45751,6 @@
|
|
if test -n "$unique" && test "`eval $cmd`" = "" ; then
|
|
eval "INCLUDEPATH$unique=set"
|
|
|
|
- if test ""; then
|
|
- INCLUDES="-I$ai_p $INCLUDES"
|
|
- else
|
|
- INCLUDES="$INCLUDES -I$ai_p"
|
|
- fi
|
|
-
|
|
fi
|
|
|
|
fi
|
|
@@ -45786,14 +45780,7 @@
|
|
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
|
|
+ PHP_ICONV_H_PATH="iconv.h"
|
|
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if iconv is glibc's" >&5
|
|
$as_echo_n "checking if iconv is glibc's... " >&6; }
|
|
@@ -46191,8 +46178,6 @@
|
|
ext_builddir=ext/iconv
|
|
ext_srcdir=$abs_srcdir/ext/iconv
|
|
|
|
- ac_extra=`echo "-I\"$PHP_ICONV_PREFIX/include\""|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
|
|
-
|
|
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
|
|
PHP_ICONV_SHARED=no
|
|
|
|
@@ -97419,12 +97404,6 @@
|
|
if test -n "$unique" && test "`eval $cmd`" = "" ; then
|
|
eval "INCLUDEPATH$unique=set"
|
|
|
|
- if test ""; then
|
|
- INCLUDES="-I$ai_p $INCLUDES"
|
|
- else
|
|
- INCLUDES="$INCLUDES -I$ai_p"
|
|
- fi
|
|
-
|
|
fi
|
|
|
|
fi
|