Skip to content

Autotools: Refactor iconv implementation checks #15357

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 12, 2024
Merged

Autotools: Refactor iconv implementation checks #15357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 12 additions & 15 deletions build/php.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1844,24 +1844,20 @@ AC_DEFUN([PHP_SETUP_ICONV], [
[Define to 1 if you have the 'libiconv' function.])

dnl Check libc first if no path is provided in --with-iconv.
if test "$PHP_ICONV" = "yes"; then
AS_VAR_IF([PHP_ICONV], [yes], [
dnl Reset LIBS temporarily as it may have already been included -liconv in.
LIBS_save="$LIBS"
LIBS_save=$LIBS
LIBS=
AC_CHECK_FUNC([iconv], [
found_iconv=yes
],[
AC_CHECK_FUNC([libiconv], [
AC_CHECK_FUNC([iconv], [found_iconv=yes],
[AC_CHECK_FUNC([libiconv], [
AC_DEFINE([HAVE_LIBICONV], [1])
found_iconv=yes
])])
LIBS=$LIBS_save
])
])
LIBS="$LIBS_save"
fi

dnl Check external libs for iconv funcs.
if test "$found_iconv" = "no"; then

AS_VAR_IF([found_iconv], [no], [
for i in $PHP_ICONV /usr/local /usr; do
if test -r $i/include/gnu-libiconv/iconv.h; then
ICONV_DIR=$i
Expand All @@ -1876,9 +1872,10 @@ AC_DEFUN([PHP_SETUP_ICONV], [
fi
done

if test -z "$ICONV_DIR"; then
AC_MSG_ERROR([Please specify the install prefix of iconv with --with-iconv=<DIR>])
fi
AS_VAR_IF([ICONV_DIR],,
[AC_MSG_ERROR(m4_text_wrap([
Please specify the install prefix of iconv with --with-iconv=<DIR>
]))])

if test -f $ICONV_DIR/$PHP_LIBDIR/lib$iconv_lib_name.a ||
test -f $ICONV_DIR/$PHP_LIBDIR/lib$iconv_lib_name.$SHLIB_SUFFIX_NAME ||
Expand All @@ -1896,7 +1893,7 @@ AC_DEFUN([PHP_SETUP_ICONV], [
[-L$ICONV_DIR/$PHP_LIBDIR])],
[-L$ICONV_DIR/$PHP_LIBDIR])
fi
fi
])

if test "$found_iconv" = "yes"; then
if test -n "$ICONV_DIR"; then
Expand Down
75 changes: 31 additions & 44 deletions ext/iconv/config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,58 +13,46 @@ if test "$PHP_ICONV" != "no"; then
LDFLAGS="$ICONV_SHARED_LIBADD $LDFLAGS"
CFLAGS="$INCLUDES $CFLAGS"

AC_MSG_CHECKING([if iconv is glibc's])
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <gnu/libc-version.h>]], [[gnu_get_libc_version();]])],[
AC_MSG_RESULT([yes])
iconv_impl_name="glibc"
],[
AC_MSG_RESULT([no])
AC_CACHE_CHECK([for iconv implementation], [php_cv_iconv_implementation], [
AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <gnu/libc-version.h>],
[gnu_get_libc_version();])],
[php_cv_iconv_implementation=glibc],
[php_cv_iconv_implementation=unknown])

AS_VAR_IF([php_cv_iconv_implementation], [unknown],
[AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <iconv.h>],
[(void) _libiconv_version])],
[php_cv_iconv_implementation="GNU libiconv"],
[php_cv_iconv_implementation=unknown])])

dnl BSD iconv by Konstantin Chuguev.
AS_VAR_IF([php_cv_iconv_implementation], [unknown],
[AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <iconv.h>],
[iconv_ccs_init(NULL, NULL);])],
[php_cv_iconv_implementation=BSD],
[php_cv_iconv_implementation=unknown])])

AS_VAR_IF([php_cv_iconv_implementation], [unknown],
[AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <iconv.h>],
[cstoccsid("");])],
[php_cv_iconv_implementation=IBM],
[php_cv_iconv_implementation=unknown])])
])

if test -z "$iconv_impl_name"; then
AC_MSG_CHECKING([if using GNU libiconv])
AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <iconv.h>], [(void) _libiconv_version])],[
AC_MSG_RESULT([yes])
iconv_impl_name="gnu_libiconv"
],[
AC_MSG_RESULT([no])
])
fi

if test -z "$iconv_impl_name"; then
AC_MSG_CHECKING([if iconv is Konstantin Chuguev's])
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <iconv.h>]], [[iconv_ccs_init(NULL, NULL);]])],[
AC_MSG_RESULT([yes])
iconv_impl_name="bsd"
],[
AC_MSG_RESULT([no])
])
fi

if test -z "$iconv_impl_name"; then
AC_MSG_CHECKING([if using IBM iconv])
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <iconv.h>]], [[cstoccsid("");]])],[
AC_MSG_RESULT([yes])
iconv_impl_name="ibm"
],[
AC_MSG_RESULT([no])
])
fi

AH_TEMPLATE([PHP_ICONV_IMPL], [The iconv implementation.])

AS_CASE([$iconv_impl_name],
[gnu_libiconv], [
AC_DEFINE([PHP_ICONV_IMPL], ["libiconv"])
AC_DEFINE([HAVE_LIBICONV], [1])
],
[bsd], [AC_DEFINE([PHP_ICONV_IMPL], ["BSD iconv"])],
AS_CASE([$php_cv_iconv_implementation],
[glibc], [
AC_DEFINE([HAVE_GLIBC_ICONV], [1],
[Define to 1 if iconv implementation is glibc.])
AC_DEFINE([PHP_ICONV_IMPL], ["glibc"])
],
[ibm], [
["GNU libiconv"], [
AC_DEFINE([PHP_ICONV_IMPL], ["libiconv"])
AC_DEFINE([HAVE_LIBICONV], [1])
],
[BSD], [AC_DEFINE([PHP_ICONV_IMPL], ["BSD iconv"])],
[IBM], [
AC_DEFINE([HAVE_IBM_ICONV], [1],
[Define to 1 if iconv implementation is IBM.])
AC_DEFINE([PHP_ICONV_IMPL], ["IBM iconv"])
Expand Down Expand Up @@ -119,7 +107,6 @@ int main(void) {
[php_cv_iconv_ignore=yes],
[php_cv_iconv_ignore=no],
[php_cv_iconv_ignore=no])])

AS_VAR_IF([php_cv_iconv_ignore], [no],
[AC_DEFINE([ICONV_BROKEN_IGNORE], [1],
[Define to 1 if iconv has broken IGNORE.])])
Expand Down
Loading