Skip to content

Commit 8bc505c

Browse files
committed
Remove some duplicate iconv path logic
PHP_SETUP_ICONV already adds the include path to INCLUDES and the library path to SHARED_LIBADD.
1 parent 7bd1d70 commit 8bc505c

File tree

1 file changed

+7
-34
lines changed

1 file changed

+7
-34
lines changed

ext/iconv/config.m4

Lines changed: 7 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,10 @@ if test "$PHP_ICONV" != "no"; then
1313
])
1414

1515
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"
3220

3321
AC_MSG_CHECKING([if iconv is glibc's])
3422
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
4028

4129
if test -z "$iconv_impl_name"; then
4230
AC_MSG_CHECKING([if using GNU libiconv])
43-
php_iconv_old_ld="$LDFLAGS"
44-
LDFLAGS="-liconv $LDFLAGS"
4531
AC_RUN_IFELSE([AC_LANG_SOURCE([[
4632
#include <iconv.h>
4733
int main() {
@@ -53,10 +39,8 @@ int main() {
5339
iconv_impl_name="gnu_libiconv"
5440
],[
5541
AC_MSG_RESULT(no)
56-
LDFLAGS="$php_iconv_old_ld"
5742
],[
5843
AC_MSG_RESULT([no, cross-compiling])
59-
LDFLAGS="$php_iconv_old_ld"
6044
])
6145
fi
6246

@@ -72,22 +56,18 @@ int main() {
7256

7357
if test -z "$iconv_impl_name"; then
7458
AC_MSG_CHECKING([if using IBM iconv])
75-
php_iconv_old_ld="$LDFLAGS"
76-
LDFLAGS="-liconv $LDFLAGS"
7759
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <iconv.h>]], [[cstoccsid("");]])],[
7860
AC_MSG_RESULT(yes)
7961
iconv_impl_name="ibm"
8062
],[
8163
AC_MSG_RESULT(no)
82-
LDFLAGS="$php_iconv_old_ld"
8364
])
8465
fi
8566

8667
case "$iconv_impl_name" in
8768
gnu_libiconv [)]
8869
AC_DEFINE([PHP_ICONV_IMPL],["libiconv"],[Which iconv implementation to use])
8970
AC_DEFINE([HAVE_LIBICONV],1,[Whether libiconv is used])
90-
PHP_ADD_LIBRARY_WITH_PATH(iconv, "$PHP_ICONV_PREFIX/$PHP_LIBDIR", ICONV_SHARED_LIBADD)
9171
;;
9272

9373
bsd [)]
@@ -163,17 +143,10 @@ int main() {
163143
AC_DEFINE([ICONV_BROKEN_IGNORE],0,[Whether iconv supports IGNORE])
164144
])
165145

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"
175148

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])
177150
PHP_SUBST(ICONV_SHARED_LIBADD)
178151
PHP_INSTALL_HEADERS([ext/iconv/])
179152
else

0 commit comments

Comments
 (0)