sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-13 13:18:06 +03:00
Code

Hoist the code for checking whether or not iconv actually works up into the

Browse Source 
loop that looks for iconv, because we might have more than one version
of iconv available and the first version might not work like we want, so
we have to keep looking.

We have yet to look for other character conversions as well, but for now,
let's see what the build farm makes of the changes.
This commit is contained in:
Richard Sharpe 0001-01-01 00:00:00 +00:00
parent d14253752f
commit 13be2ca51a
1 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
source/configure.in
View File

@ -1558,32 +1558,35 @@ dnl Try to find iconv(3)
LIBS="$save_LIBS $LIBS"
ICONV_LOCATION=$i
export LDFLAGS LIBS CPPFLAGS
break
else
LDFLAGS=$save_LDFLAGS
LIBS=$save_LIBS
export LDFLAGS LIBS CPPFLAGS
dnl Now, check for a working iconv ... we want to do it here because
dnl there might be a working iconv further down the list of LOOK_DIRS
############
# check for iconv in libc
ic_save_LIBS="$LIBS"
LIBS="$LIBS -L$ICONV_LOCATION/lib"
AC_CACHE_CHECK([for working iconv],samba_cv_HAVE_NATIVE_ICONV,[
AC_TRY_RUN([
#include <$jm_cv_include>
main(){
iconv_t cd = iconv_open("ASCII", "UCS-2LE");
if (cd == 0 || cd == (iconv_t)-1) return -1;
return 0;
}
],
samba_cv_HAVE_NATIVE_ICONV=yes,samba_cv_HAVE_NATIVE_ICONV=no,samba_cv_HAVE_NATIVE_ICONV=cross)])
LIBS="$ic_save_LIBS"
if test x"$samba_cv_HAVE_NATIVE_ICONV" = x"yes"; then
AC_DEFINE(HAVE_NATIVE_ICONV,1,[Whether to use native iconv])
break
fi
dnl We didn't find a working iconv, so keep going
fi
LDFLAGS=$save_LDFLAGS
LIBS=$save_LIBS
export LDFLAGS LIBS CPPFLAGS
done
############
# check for iconv in libc
ic_save_LIBS="$LIBS"
LIBS="$LIBS -L$ICONV_LOCATION/lib"
AC_CACHE_CHECK([for working iconv],samba_cv_HAVE_NATIVE_ICONV,[
AC_TRY_RUN([
#include <$jm_cv_include>
main() {
iconv_t cd = iconv_open("ASCII", "UCS-2LE");
if (cd == 0 || cd == (iconv_t)-1) return -1;
return 0;
}
],
samba_cv_HAVE_NATIVE_ICONV=yes,samba_cv_HAVE_NATIVE_ICONV=no,samba_cv_HAVE_NATIVE_ICONV=cross)])
if test x"$samba_cv_HAVE_NATIVE_ICONV" = x"yes"; then
AC_DEFINE(HAVE_NATIVE_ICONV,1,[Whether to use native iconv])
fi
LIBS="$ic_save_LIBS"
if test x"$ICONV_FOUND" = x"no" -o x"$samba_cv_HAVE_NATIVE_ICONV" != x"yes" ; then
AC_MSG_WARN([Sufficient support for iconv function was not found.