From ca61b4f3b557b5505d9825fad81f6a22860cc716 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 24 May 2006 17:57:54 +0000
Subject: 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)

---
 source4/include/system/iconv.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'source4/include')

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 */
-- 
cgit