summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorAlexander Bokovoy <ab@samba.org>2003-02-19 13:24:06 +0000
committerAlexander Bokovoy <ab@samba.org>2003-02-19 13:24:06 +0000
commit02cb49bffae34d0f373f5d400077a7a8b7e809b2 (patch)
tree1bad8bc6d6773e7cd8a9b1bc62720ebdc2b73cca /source3/include
parent6540693fea3a61795801cfccd988b5552b8b307f (diff)
downloadsamba-02cb49bffae34d0f373f5d400077a7a8b7e809b2.tar.gz
samba-02cb49bffae34d0f373f5d400077a7a8b7e809b2.tar.bz2
samba-02cb49bffae34d0f373f5d400077a7a8b7e809b2.zip
Improve detection of iconv(3) for various platforms. M4 code is similar to what I use in Midgard for past few years, modified for Samba needs.
(This used to be commit 747d2d70a9eb4d9222d7b63e5fcec269eda76672)
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/includes.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 731d94996c..0d1c72cf1c 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -393,8 +393,13 @@
#endif /* HAVE_SYS_SHM_H */
#ifdef HAVE_NATIVE_ICONV
+#ifdef HAVE_ICONV
#include <iconv.h>
#endif
+#ifdef HAVE_GICONV
+#include <giconv.h>
+#endif
+#endif
#if HAVE_KRB5_H
#include <krb5.h>