summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorRichard Sharpe <sharpe@samba.org>2003-07-10 17:39:05 +0000
committerRichard Sharpe <sharpe@samba.org>2003-07-10 17:39:05 +0000
commitc56bf515ce37d975bfbd9d5d0dca8780ecc79ea8 (patch)
tree9e9923b1d79ef1f32b1734b00e41f2bbb39e4dc9 /source3
parentd2d1bd3d7c41de86d489ebec110aa1e1400bb94e (diff)
downloadsamba-c56bf515ce37d975bfbd9d5d0dca8780ecc79ea8.tar.gz
samba-c56bf515ce37d975bfbd9d5d0dca8780ecc79ea8.tar.bz2
samba-c56bf515ce37d975bfbd9d5d0dca8780ecc79ea8.zip
Final piece of support needed to find iconv libraries on FreeBSD.
This has been tested on RedHat 9.0 with libiconv built in as well as FreeBSD 4.6.2 with iconv-2.0.3 and biconv.g/libbiconv. We should perhaps also check for other conversions that just ASCII<-->UCS-2LE especially because those two names do not appear in charset.aliases for iconv-2.0.3. (This used to be commit 53d953da10dbfaf778907f19115e127c5aac1da8)
Diffstat (limited to 'source3')
-rw-r--r--source3/configure.in5
1 files changed, 4 insertions, 1 deletions
diff --git a/source3/configure.in b/source3/configure.in
index 231a884acf..489d655190 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -1536,9 +1536,11 @@ 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 <iconv.h>
+#include <$jm_cv_include>
main() {
iconv_t cd = iconv_open("ASCII", "UCS-2LE");
if (cd == 0 || cd == (iconv_t)-1) return -1;
@@ -1549,6 +1551,7 @@ samba_cv_HAVE_NATIVE_ICONV=yes,samba_cv_HAVE_NATIVE_ICONV=no,samba_cv_HAVE_NATIV
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.