@@ -29,7 +29,6 @@ if test "$PHP_ICONV" != "no"; then
29
29
30
30
CFLAGS="-I$PHP_ICONV_PREFIX/include $CFLAGS"
31
31
LDFLAGS="-L$PHP_ICONV_PREFIX/$PHP_LIBDIR $LDFLAGS"
32
- PHP_ICONV_H_PATH="$PHP_ICONV_PREFIX/include/iconv.h"
33
32
34
33
AC_MSG_CHECKING ( [ if iconv is glibc's] )
35
34
AC_LINK_IFELSE ( [ AC_LANG_PROGRAM ( [ [ #include <gnu/libc-version.h>] ] , [ [ gnu_get_libc_version();] ] ) ] ,[
@@ -44,7 +43,7 @@ if test "$PHP_ICONV" != "no"; then
44
43
php_iconv_old_ld="$LDFLAGS"
45
44
LDFLAGS="-liconv $LDFLAGS"
46
45
AC_RUN_IFELSE ( [ AC_LANG_SOURCE ( [ [
47
- #include <$PHP_ICONV_H_PATH >
46
+ #include <iconv.h >
48
47
int main() {
49
48
printf("%d", _libiconv_version);
50
49
return 0;
@@ -108,7 +107,7 @@ int main() {
108
107
109
108
AC_MSG_CHECKING ( [ if iconv supports errno] )
110
109
AC_RUN_IFELSE ( [ AC_LANG_SOURCE ( [ [
111
- #include <$PHP_ICONV_H_PATH >
110
+ #include <iconv.h >
112
111
#include <errno.h>
113
112
114
113
int main() {
@@ -135,7 +134,7 @@ int main() {
135
134
136
135
AC_MSG_CHECKING ( [ if iconv supports //IGNORE] )
137
136
AC_RUN_IFELSE ( [ AC_LANG_SOURCE ( [ [
138
- #include <$PHP_ICONV_H_PATH >
137
+ #include <iconv.h >
139
138
#include <stdlib.h>
140
139
141
140
int main() {
@@ -166,11 +165,10 @@ int main() {
166
165
167
166
AC_MSG_CHECKING ( [ if your cpp allows macro usage in include lines] )
168
167
AC_COMPILE_IFELSE ( [ AC_LANG_PROGRAM ( [ [
169
- #define FOO <$PHP_ICONV_H_PATH >
168
+ #define FOO <iconv.h >
170
169
#include FOO
171
170
] ] , [ ] ) ] , [
172
171
AC_MSG_RESULT ( [ yes] )
173
- AC_DEFINE_UNQUOTED ( [ PHP_ICONV_H_PATH] , [ <$PHP_ICONV_H_PATH>] , [ Path to iconv.h] )
174
172
] , [
175
173
AC_MSG_RESULT ( [ no] )
176
174
] )
0 commit comments