From 089cbd4a8e8108306ba92b01746ecd261e9fdd7c Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 13 May 2006 17:13:46 +0000
Subject: r15568: Simplify detection of iconv libraries a fair bit and fix it
 to work on FreeBSD.

Based very loosely on a patch by Timur Bakevey

Fixes #3688
(This used to be commit ea7b28572b453da8eced565a49e4c10e7ebd2e28)
---
 source4/include/system/iconv.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'source4/include')

diff --git a/source4/include/system/iconv.h b/source4/include/system/iconv.h
index a0c1c18fa2..d9111bb07e 100644
--- a/source4/include/system/iconv.h
+++ b/source4/include/system/iconv.h
@@ -20,14 +20,12 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#ifdef HAVE_NATIVE_ICONV
-#ifdef HAVE_ICONV
+#ifdef HAVE_ICONV_H
 #include <iconv.h>
 #endif
-#ifdef HAVE_GICONV
+#ifdef HAVE_GICONV_H
 #include <giconv.h>
 #endif
-#endif
 
 #ifdef HAVE_CTYPE_H
 #include <ctype.h>
-- 
cgit