diff options
| author | Herb Lewis <herb@samba.org> | 2007-02-16 19:49:12 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:18:02 -0500 |
| commit | 2b302791695fe29af369c3c17dc740f45d3cadd9 (patch) | |
| tree | f33ba9f90570d21138c0115b6a923ee1be6f6065 /source3/aclocal.m4 | |
| parent | 4a18f37f22f7bfbfecd479d5e5363427c8e9a7ca (diff) | |
| download | samba-2b302791695fe29af369c3c17dc740f45d3cadd9.tar.gz samba-2b302791695fe29af369c3c17dc740f45d3cadd9.tar.bz2 samba-2b302791695fe29af369c3c17dc740f45d3cadd9.zip | |
r21396: fix wbinfo --lookup-rids command
allow detection of libbiconv if all others fail - need for FreeBSD
(This used to be commit 7acc9421b0643cb04bff1f1d98ecb899f9b09601)
Diffstat (limited to 'source3/aclocal.m4')
| -rw-r--r-- | source3/aclocal.m4 | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/source3/aclocal.m4 b/source3/aclocal.m4 index b66a1c253e..00c57bacee 100644 --- a/source3/aclocal.m4 +++ b/source3/aclocal.m4 @@ -362,6 +362,23 @@ AC_DEFUN(jm_ICONV, jm_cv_func_iconv=yes jm_cv_lib_iconv="iconv") LIBS="$jm_save_LIBS" + + if test "$jm_cv_lib_iconv" != yes; then + jm_save_LIBS="$LIBS" + LIBS="$LIBS -lbiconv" + AC_TRY_LINK([#include <stdlib.h> +#include <biconv.h>], + [iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd);], + jm_cv_lib_iconv=yes + jm_cv_func_iconv=yes + jm_cv_include="biconv.h" + jm_cv_biconv=yes + jm_cv_lib_iconv="biconv") + + LIBS="$jm_save_LIBS" + fi fi fi fi |