From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 6 Oct 2006 11:01:05 +0000 (+0000)
Subject: r19122: merge from samba3:
X-Git-Tag: samba-4.0.0alpha6~801^3~4572
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2210d51e4e6f554d5c97e1a918db7353b2c74606;p=thirdparty%2Fsamba.git

r19122: merge from samba3:

sync system/iconv.h

metze
(This used to be commit 9c74964b619fd0754d3b72c21fe2cef4d24e7ad5)
---

diff --git a/source4/lib/replace/system/iconv.h b/source4/lib/replace/system/iconv.h
index 75ee1d83ba3..abc2d6f4e1b 100644
--- a/source4/lib/replace/system/iconv.h
+++ b/source4/lib/replace/system/iconv.h
@@ -22,14 +22,27 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#if !defined(HAVE_ICONV) && defined(HAVE_ICONV_H)
+#define HAVE_ICONV
+#endif
+
+#if !defined(HAVE_GICONV) && defined(HAVE_GICONV_H)
+#define HAVE_GICONV
+#endif
+
+#if !defined(HAVE_BICONV) && defined(HAVE_BICONV_H)
+#define HAVE_BICONV
+#endif
+
 #ifdef HAVE_NATIVE_ICONV
-#ifdef HAVE_ICONV_H
+#if defined(HAVE_ICONV)
 #include <iconv.h>
-#endif
-#ifdef HAVE_GICONV_H
+#elif defined(HAVE_GICONV)
 #include <giconv.h>
+#elif defined(HAVE_BICONV)
+#include <biconv.h>
 #endif
-#endif
+#endif /* HAVE_NATIVE_ICONV */
 
 /* needed for some systems without iconv. Doesn't really matter
    what error code we use */