diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-05-24 17:57:54 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:08:35 -0500 |
| commit | ca61b4f3b557b5505d9825fad81f6a22860cc716 (patch) | |
| tree | 76ffd8cd7da02bb15951fc5fc063114e7b6764df /source4/include | |
| parent | 70afbd50908ab2c2bffbceebd1af30b2fbf1e4f0 (diff) | |
| download | samba-ca61b4f3b557b5505d9825fad81f6a22860cc716.tar.gz samba-ca61b4f3b557b5505d9825fad81f6a22860cc716.tar.bz2 samba-ca61b4f3b557b5505d9825fad81f6a22860cc716.zip | |
r15870: Improve detection of iconv - should prevent HAVE_ICONV_H being
defined when the installed iconv library doesn't match our criteria as
well as some other minor fixes.
(This used to be commit 7937932615434a59c84d8a1b81e368f6a5f8e429)
Diffstat (limited to 'source4/include')
| -rw-r--r-- | source4/include/system/iconv.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source4/include/system/iconv.h b/source4/include/system/iconv.h index 96500dbfac..d5cbe84d8f 100644 --- a/source4/include/system/iconv.h +++ b/source4/include/system/iconv.h @@ -20,12 +20,14 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#ifdef HAVE_NATIVE_ICONV #ifdef HAVE_ICONV_H #include <iconv.h> #endif #ifdef HAVE_GICONV_H #include <giconv.h> #endif +#endif /* needed for some systems without iconv. Doesn't really matter what error code we use */ |