gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 09:04:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix finding libiconv via cross.config.

Browse source
This commit is contained in:
Frederik Seiffert 2020-06-03 16:53:28 +02:00
parent a1d5d020b3
commit 0b689d4df4
2 changed files with 40 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
configure vendored
View file

@ -10985,7 +10985,15 @@ if test $enable_iconv = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking iconv support" >&5
$as_echo_n "checking iconv support... " >&6; }
if test "$cross_compiling" = yes; then :
found_iconv="$cross_found_iconv_libc"
found_iconv="$cross_found_iconv_libc";
if test "$found_iconv" = "yes"; then
$as_echo "#define HAVE_ICONV 1" >>confdefs.h
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, in libc (via cross.config)" >&5
$as_echo "yes, in libc (via cross.config)" >&6; }
fi
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@ -11041,7 +11049,13 @@ esac
LIBS="-liconv $LIBS"
if test "$cross_compiling" = yes; then :
found_iconv="$cross_found_iconv_liconv";
if test "$found_iconv" = "no"; then
if test "$found_iconv" = "yes"; then
$as_echo "#define HAVE_ICONV 1" >>confdefs.h
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, -liconv (via cross.config)" >&5
$as_echo "yes, -liconv (via cross.config)" >&6; }
else
LIBS="$old_LIBS"
fi
@ -11080,7 +11094,16 @@ if test $found_iconv = no ; then
LIBS="-lgiconv $LIBS"
if test "$cross_compiling" = yes; then :
found_iconv="$cross_found_iconv_lgiconv";
if test "$found_iconv" = "no"; then
if test "$found_iconv" = "yes"; then
$as_echo "#define HAVE_ICONV 1" >>confdefs.h
$as_echo "#define HAVE_GICONV 1" >>confdefs.h
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, -lgiconv (via cross.config)" >&5
$as_echo "yes, -lgiconv (via cross.config)" >&6; }
else
LIBS="$old_LIBS"
fi

17
configure.ac
View file

@ -2996,7 +2996,11 @@ int main(int argc,char **argv)
,
found_iconv=no
,
found_iconv="$cross_found_iconv_libc",
found_iconv="$cross_found_iconv_libc";
if test "$found_iconv" = "yes"; then
AC_DEFINE(HAVE_ICONV,1, [Define if you have this function])
AC_MSG_RESULT([[yes, in libc (via cross.config)]])
fi
)
if test $found_iconv = no ; then
@ -3025,7 +3029,10 @@ if test $found_iconv = no ; then
LIBS="$old_LIBS"
,
found_iconv="$cross_found_iconv_liconv";
if test "$found_iconv" = "no"; then
if test "$found_iconv" = "yes"; then
AC_DEFINE(HAVE_ICONV,1, [Define if you have this function])
AC_MSG_RESULT([[yes, -liconv (via cross.config)]])
else
LIBS="$old_LIBS"
fi
)
@ -3049,7 +3056,11 @@ if test $found_iconv = no ; then
LIBS="$old_LIBS"
,
found_iconv="$cross_found_iconv_lgiconv";
if test "$found_iconv" = "no"; then
if test "$found_iconv" = "yes"; then
AC_DEFINE(HAVE_ICONV,1, [Define if you have this function])
AC_DEFINE(HAVE_GICONV,1, [Define if you have this function])
AC_MSG_RESULT([[yes, -lgiconv (via cross.config)]])
else
LIBS="$old_LIBS"
fi
)