@@ -13,22 +13,10 @@ if test "$PHP_ICONV" != "no"; then
13
13
] )
14
14
15
15
if test "$iconv_avail" != "no"; then
16
- if test -z "$ICONV_DIR"; then
17
- for i in /usr/local /usr; do
18
- if test -f "$i/include/iconv.h"; then
19
- PHP_ICONV_PREFIX="$i"
20
- break
21
- fi
22
- done
23
- if test -z "$PHP_ICONV_PREFIX"; then
24
- PHP_ICONV_PREFIX="/usr"
25
- fi
26
- else
27
- PHP_ICONV_PREFIX="$ICONV_DIR"
28
- fi
29
-
30
- CFLAGS="-I$PHP_ICONV_PREFIX/include $CFLAGS"
31
- LDFLAGS="-L$PHP_ICONV_PREFIX/$PHP_LIBDIR $LDFLAGS"
16
+ save_LDFLAGS="$LDFLAGS"
17
+ save_CFLAGS="$CFLAGS"
18
+ LDFLAGS="$ICONV_SHARED_LIBADD $LDFLAGS"
19
+ CFLAGS="$INCLUDES $CFLAGS"
32
20
33
21
AC_MSG_CHECKING ( [ if iconv is glibc's] )
34
22
AC_LINK_IFELSE ( [ AC_LANG_PROGRAM ( [ [ #include <gnu/libc-version.h>] ] , [ [ gnu_get_libc_version();] ] ) ] ,[
@@ -40,8 +28,6 @@ if test "$PHP_ICONV" != "no"; then
40
28
41
29
if test -z "$iconv_impl_name"; then
42
30
AC_MSG_CHECKING ( [ if using GNU libiconv] )
43
- php_iconv_old_ld="$LDFLAGS"
44
- LDFLAGS="-liconv $LDFLAGS"
45
31
AC_RUN_IFELSE ( [ AC_LANG_SOURCE ( [ [
46
32
#include <iconv.h>
47
33
int main() {
@@ -53,10 +39,8 @@ int main() {
53
39
iconv_impl_name="gnu_libiconv"
54
40
] ,[
55
41
AC_MSG_RESULT ( no )
56
- LDFLAGS="$php_iconv_old_ld"
57
42
] ,[
58
43
AC_MSG_RESULT ( [ no, cross-compiling] )
59
- LDFLAGS="$php_iconv_old_ld"
60
44
] )
61
45
fi
62
46
@@ -72,22 +56,18 @@ int main() {
72
56
73
57
if test -z "$iconv_impl_name"; then
74
58
AC_MSG_CHECKING ( [ if using IBM iconv] )
75
- php_iconv_old_ld="$LDFLAGS"
76
- LDFLAGS="-liconv $LDFLAGS"
77
59
AC_LINK_IFELSE ( [ AC_LANG_PROGRAM ( [ [ #include <iconv.h>] ] , [ [ cstoccsid("");] ] ) ] ,[
78
60
AC_MSG_RESULT ( yes )
79
61
iconv_impl_name="ibm"
80
62
] ,[
81
63
AC_MSG_RESULT ( no )
82
- LDFLAGS="$php_iconv_old_ld"
83
64
] )
84
65
fi
85
66
86
67
case "$iconv_impl_name" in
87
68
gnu_libiconv [ )]
88
69
AC_DEFINE ( [ PHP_ICONV_IMPL] ,[ "libiconv"] ,[ Which iconv implementation to use] )
89
70
AC_DEFINE ( [ HAVE_LIBICONV] ,1 ,[ Whether libiconv is used] )
90
- PHP_ADD_LIBRARY_WITH_PATH(iconv, "$PHP_ICONV_PREFIX/$PHP_LIBDIR", ICONV_SHARED_LIBADD)
91
71
;;
92
72
93
73
bsd [ )]
@@ -163,17 +143,10 @@ int main() {
163
143
AC_DEFINE ( [ ICONV_BROKEN_IGNORE] ,0 ,[ Whether iconv supports IGNORE] )
164
144
] )
165
145
166
- AC_MSG_CHECKING ( [ if your cpp allows macro usage in include lines] )
167
- AC_COMPILE_IFELSE ( [ AC_LANG_PROGRAM ( [ [
168
- #define FOO <iconv.h>
169
- #include FOO
170
- ] ] , [ ] ) ] , [
171
- AC_MSG_RESULT ( [ yes] )
172
- ] , [
173
- AC_MSG_RESULT ( [ no] )
174
- ] )
146
+ LDFLAGS="$save_LDFLAGS"
147
+ CFLAGS="$save_CFLAGS"
175
148
176
- PHP_NEW_EXTENSION(iconv, iconv.c, $ext_shared,, [ -I\"$PHP_ICONV_PREFIX/include\" - DZEND_ENABLE_STATIC_TSRMLS_CACHE=1] )
149
+ PHP_NEW_EXTENSION(iconv, iconv.c, $ext_shared,, [ -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1] )
177
150
PHP_SUBST(ICONV_SHARED_LIBADD)
178
151
PHP_INSTALL_HEADERS([ ext/iconv/] )
179
152
else
0 commit comments