r15573: Fix build of systems that have iconv headers in non-standard locations

Split of system/locale.h header from system/iconv.h

Previously, iconv wasn't being used on these systems
(This used to be commit aa6d66fda69779d1c2948a1aca85dbd5208f1cba)

11 files changed, 8 insertions, 11 deletions

diff --git a/source4/lib/charset/util_unistr.c b/source4/lib/charset/util_unistr.c
index 1eb198d6f9..80c1d3b125 100644
--- a/source4/lib/charset/util_unistr.c
+++ b/source4/lib/charset/util_unistr.c
@@ -20,7 +20,7 @@
 */
 
 #include "includes.h"
-#include "system/iconv.h"
+#include "system/locale.h"
 
 /**
  * @file
diff --git a/source4/lib/ldb/include/includes.h b/source4/lib/ldb/include/includes.h
index 26309df381..827290342f 100644
--- a/source4/lib/ldb/include/includes.h
+++ b/source4/lib/ldb/include/includes.h
@@ -7,7 +7,7 @@
 #ifdef _SAMBA_BUILD_
 
 #include "system/filesys.h"
-#include "system/iconv.h"
+#include "system/locale.h"
 #include "system/time.h"
 
 /* tell ldb we have the internal ldap code */
diff --git a/source4/lib/replace/replace.c b/source4/lib/replace/replace.c
index 415ea2f129..337a54f24f 100644
--- a/source4/lib/replace/replace.c
+++ b/source4/lib/replace/replace.c
@@ -23,7 +23,6 @@
 #include "system/time.h"
 #include "system/network.h"
 #include "system/filesys.h"
-#include "system/iconv.h"
 
  void replace_dummy(void);
  void replace_dummy(void) {}
diff --git a/source4/lib/samba3/group.c b/source4/lib/samba3/group.c
index 13b21ed21f..0860c36e1f 100644
--- a/source4/lib/samba3/group.c
+++ b/source4/lib/samba3/group.c
@@ -20,7 +20,6 @@
  */
 
 #include "includes.h"
-#include "system/iconv.h"
 #include "lib/samba3/samba3.h"
 #include "lib/tdb/include/tdbutil.h"
 #include "system/filesys.h"
diff --git a/source4/lib/samba3/smbpasswd.c b/source4/lib/samba3/smbpasswd.c
index e6c52966d9..acba763371 100644
--- a/source4/lib/samba3/smbpasswd.c
+++ b/source4/lib/samba3/smbpasswd.c
@@ -54,8 +54,8 @@
 */
 
 #include "includes.h"
+#include "system/locale.h"
 #include "lib/samba3/samba3.h"
-#include "system/iconv.h"
 
 /*! Convert 32 hex characters into a 16 byte array. */
 
diff --git a/source4/lib/samba3/tdbsam.c b/source4/lib/samba3/tdbsam.c
index 80f1448d9c..148a3c90f5 100644
--- a/source4/lib/samba3/tdbsam.c
+++ b/source4/lib/samba3/tdbsam.c
@@ -21,7 +21,6 @@
 */
 
 #include "includes.h"
-#include "system/iconv.h"
 #include "system/filesys.h"
 #include "lib/tdb/include/tdbutil.h"
 #include "lib/samba3/samba3.h"
diff --git a/source4/lib/socket/access.c b/source4/lib/socket/access.c
index 8e57ca5aff..dcad89e3a9 100644
--- a/source4/lib/socket/access.c
+++ b/source4/lib/socket/access.c
@@ -33,8 +33,8 @@
 
 #include "includes.h"
 #include "system/network.h"
-#include "system/iconv.h"
 #include "lib/socket/socket.h"
+#include "system/locale.h"
 
 #define	FAIL		(-1)
 #define ALLONES  ((uint32_t)0xFFFFFFFF)
diff --git a/source4/lib/tdb/tools/tdbdump.c b/source4/lib/tdb/tools/tdbdump.c
index 9122551a0a..74ba64fdd9 100644
--- a/source4/lib/tdb/tools/tdbdump.c
+++ b/source4/lib/tdb/tools/tdbdump.c
@@ -38,7 +38,7 @@
 
 #include "includes.h"
 #include "lib/tdb/include/tdb.h"
-#include "system/iconv.h"
+#include "system/locale.h"
 #include "system/filesys.h"
 
 #endif
diff --git a/source4/lib/util/genrand.c b/source4/lib/util/genrand.c
index 5bdf1f7e08..8424ad8fd7 100644
--- a/source4/lib/util/genrand.c
+++ b/source4/lib/util/genrand.c
@@ -21,9 +21,9 @@
 */
 
 #include "includes.h"
-#include "system/iconv.h"
 #include "system/filesys.h"
 #include "lib/crypto/crypto.h"
+#include "system/locale.h"
 
 /**
  * @file
diff --git a/source4/lib/util/util.c b/source4/lib/util/util.c
index c674ed23b4..5948cd7ecb 100644
--- a/source4/lib/util/util.c
+++ b/source4/lib/util/util.c
@@ -24,8 +24,8 @@
 
 #include "includes.h"
 #include "system/network.h"
-#include "system/iconv.h"
 #include "system/filesys.h"
+#include "system/locale.h"
 
 /**
  * @file
diff --git a/source4/lib/util/util_str.c b/source4/lib/util/util_str.c
index ec6a1cbbea..62869198c3 100644
--- a/source4/lib/util/util_str.c
+++ b/source4/lib/util/util_str.c
@@ -26,7 +26,7 @@
 #include "smb.h"
 #include "pstring.h"
 #include "lib/ldb/include/ldb.h"
-#include "system/iconv.h"
+#include "system/locale.h"
 
 /**
  * @file