Kévin Le Gouguec <legouguec@adacore.com> writes:

> Hello!
>
> Do I understand correctly that this patch, committed as
>
>   2023-11-15 "Finalized intl-update patches" (862776f26a5)
>
> specifically the bits quoted below, remove the support for in-tree
> libiconv introduced in
>
>   2015-08-24 "Missing parts of fixes for in-tree libiconv" (cfe101c6a82)
>
> ?  If so, was this intentional?

It was not.  I did not realize that the in-tree iconv.m4 was modified,
and simply updated it.

Bruno, should these modifications just be restored, or do you think
there's some preferable way to add sibling libiconv discovery?  I am
fine with either.

> Arsen Arsenović <arsen@aarsen.me> writes:
>
>> […]
>> config/ChangeLog:
>>
>> 	* intlmacosx.m4: Import from gettext-0.22 (serial 8).
>> 	* gettext.m4: Sync with gettext-0.22 (serial 77).
>> 	* gettext-sister.m4 (ZW_GNU_GETTEXT_SISTER_DIR): Load gettext's
>> 	uninstalled-config.sh, or call AM_GNU_GETTEXT if missing.
>> 	* iconv.m4: Sync with gettext-0.22 (serial 26).
>> […]
>> diff --git a/config/iconv.m4 b/config/iconv.m4
>> index f1e54c5aedc..ff5d5261139 100644
>> --- a/config/iconv.m4
>> +++ b/config/iconv.m4
>> […]
>> -    CPPFLAGS="$am_save_CPPFLAGS"
>> -
>> -    if test "$am_cv_func_iconv" != yes && test -d ../libiconv; then
>> -      for _libs in .libs _libs; do
>> -        am_save_CPPFLAGS="$CPPFLAGS"
>> -        am_save_LIBS="$LIBS"
>> -        CPPFLAGS="$CPPFLAGS -I../libiconv/include"
>> -        LIBS="$LIBS ../libiconv/lib/$_libs/libiconv.a"
>> -        AC_TRY_LINK([#include <stdlib.h>
>> -#include <iconv.h>],
>> -          [iconv_t cd = iconv_open("","");
>> +    AC_LINK_IFELSE(
>> +      [AC_LANG_PROGRAM(
>> +         [[
>> +#include <stdlib.h>
>> +#include <iconv.h>
>> +         ]],
>> +         [[iconv_t cd = iconv_open("","");
>>             iconv(cd,NULL,NULL,NULL,NULL);
>> -           iconv_close(cd);],
>> -          INCICONV="-I../libiconv/include"
>> -          LIBICONV='${top_builddir}'/../libiconv/lib/$_libs/libiconv.a
>> -          LTLIBICONV='${top_builddir}'/../libiconv/lib/libiconv.la
>> -          am_cv_lib_iconv=yes
>> -          am_cv_func_iconv=yes)
>> -        CPPFLAGS="$am_save_CPPFLAGS"
>> -        LIBS="$am_save_LIBS"
>> -        if test "$am_cv_func_iconv" = "yes"; then
>> -          break
>> -        fi
>> -      done
>> -    fi
>> -
>> […]


-- 
Arsen Arsenović