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)

diff --git a/source4/include/system/config.m4 b/source4/include/system/config.m4
index 2c62b571e029171a1655e43654d7ab704abecacb..8e7448bbe49e1b0e0473a1b0a071d3c01c19b147 100644 (file)
--- a/source4/include/system/config.m4
+++ b/source4/include/system/config.m4
@@ -30,7 +30,7 @@ AC_CHECK_HEADERS(sys/capability.h)
 # passwd
 AC_CHECK_HEADERS(grp.h sys/id.h compat.h shadow.h sys/priv.h pwd.h sys/security.h)
 
-# iconv
+# locale
 AC_CHECK_HEADERS(ctype.h locale.h)
 
 # glob

diff --git a/source4/include/system/iconv.h b/source4/include/system/iconv.h
index d9111bb07ecb0665cc81f9cc72cbdb97dac22c16..96500dbfacd1ffab0399392dd7598d15e734e8ce 100644 (file)
--- a/source4/include/system/iconv.h
+++ b/source4/include/system/iconv.h
@@ -27,14 +27,6 @@
 #include <giconv.h>
 #endif
 
-#ifdef HAVE_CTYPE_H
-#include <ctype.h>
-#endif
-
-#ifdef HAVE_LOCALE_H
-#include <locale.h>
-#endif
-
 /* needed for some systems without iconv. Doesn't really matter
    what error code we use */
 #ifndef EILSEQ

diff --git a/source4/include/system/locale.h b/source4/include/system/locale.h
new file mode 100644 (file)
index 0000000..e4be4a1
--- /dev/null
+++ b/source4/include/system/locale.h
@@ -0,0 +1,29 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   locale include wrappers
+
+   Copyright (C) Andrew Tridgell 2004
+   
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifdef HAVE_CTYPE_H
+#include <ctype.h>
+#endif
+
+#ifdef HAVE_LOCALE_H
+#include <locale.h>
+#endif

diff --git a/source4/kdc/hdb-ldb.c b/source4/kdc/hdb-ldb.c
index 217afab40ac97f2b2954be574fef998bc22e3dad..c1ed262f7d4fd122b6fc4a0f36aec2dc848c8259 100644 (file)
--- a/source4/kdc/hdb-ldb.c
+++ b/source4/kdc/hdb-ldb.c
@@ -38,7 +38,6 @@
 #include "hdb.h"
 #include "lib/ldb/include/ldb.h"
 #include "lib/ldb/include/ldb_errors.h"
-#include "system/iconv.h"
 #include "librpc/gen_ndr/netlogon.h"
 #include "auth/auth.h"
 #include "auth/auth_sam.h"

diff --git a/source4/lib/charset/util_unistr.c b/source4/lib/charset/util_unistr.c
index 1eb198d6f9cffe02f651bb287d41a95f0aa1c08c..80c1d3b125b9c6e2d487ede8bd5ca6b74ab1e0b9 100644 (file)
--- 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 26309df381b4b3b74370d566cc0eff3788f5fa1a..827290342fb5119085c7b38f4484e63dc9c20536 100644 (file)
--- 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 415ea2f129db5828e2b59fc129ad6cfffbf799a0..337a54f24ff67acae1598c3c50478ff53aceab0e 100644 (file)
--- 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 13b21ed21feb33ebbe04a843690ce366b754fff9..0860c36e1fad365340d85d173183822302305b04 100644 (file)
--- 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 e6c52966d98d288ad6188c18e758c09941c0d682..acba763371f07b201106c52186ffbcae88adeb2b 100644 (file)
--- 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 80f1448d9ca4242496762509a5a465a11325bd7b..148a3c90f5646e7ee6ddd75b52c24ddb78d1537c 100644 (file)
--- 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 8e57ca5aff162e8da019ed746188497771466f5f..dcad89e3a97059dd0440248c9ef507cae7f15a6f 100644 (file)
--- 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 9122551a0a347c9b38ac1c57d51dfe5ee5c8bda0..74ba64fdd978eac94d4a96705c0cfc4b31dfcb3e 100644 (file)
--- 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 5bdf1f7e088b40c2e63bfff9afe9bc5c6ffce0da..8424ad8fd760c61750f8f2e4f836d4b84188c944 100644 (file)
--- 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 c674ed23b4379b507122eb78440ec73b93cd8db0..5948cd7ecb721a1a455f6de25b84c1c4e1b4ac95 100644 (file)
--- 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 ec6a1cbbead4c0a5a78f9486801066d134e61781..62869198c3997636d613922bf7ed3b9e310b3ac1 100644 (file)
--- 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

diff --git a/source4/libcli/ldap/ldap.c b/source4/libcli/ldap/ldap.c
index c1fc461b5f69ece9f8519172ce3f9106af0b9433..6f475478b1404356ba97ef96fcf41b0bf5a6317c 100644 (file)
--- a/source4/libcli/ldap/ldap.c
+++ b/source4/libcli/ldap/ldap.c
@@ -24,7 +24,6 @@
 */
 
 #include "includes.h"
-#include "system/iconv.h"
 #include "libcli/util/asn_1.h"
 #include "libcli/ldap/ldap.h"
 

diff --git a/source4/libcli/ldap/ldap_controls.c b/source4/libcli/ldap/ldap_controls.c
index f4f54ec2e2ad1cf05121cfc00f6e10cdfecfd7ee..ee8f9d4bb131c30f35bae761d0d76ea55879f020 100644 (file)
--- a/source4/libcli/ldap/ldap_controls.c
+++ b/source4/libcli/ldap/ldap_controls.c
@@ -21,7 +21,6 @@
 */
 
 #include "includes.h"
-#include "system/iconv.h"
 #include "libcli/util/asn_1.h"
 #include "libcli/ldap/ldap.h"
 #include "lib/ldb/include/ldb.h"

diff --git a/source4/libcli/nbt/nbtname.c b/source4/libcli/nbt/nbtname.c
index 25fd6697893218c042ebfec8d6a78af558f6c4f2..871e29794d59395fc71ec55f04aefa2b16152cf6 100644 (file)
--- a/source4/libcli/nbt/nbtname.c
+++ b/source4/libcli/nbt/nbtname.c
@@ -25,9 +25,9 @@
 */
 
 #include "includes.h"
-#include "system/iconv.h"
 #include "librpc/gen_ndr/ndr_nbt.h"
 #include "librpc/gen_ndr/ndr_misc.h"
+#include "system/locale.h"
 
 /* don't allow an unlimited number of name components */
 #define MAX_COMPONENTS 10

diff --git a/source4/libcli/security/sddl.c b/source4/libcli/security/sddl.c
index 97e811f15102941ebde569d08897ff6bc97d0a31..14dd7e0917cecf49abdf3d9ff4f13bf71dbb60ef 100644 (file)
--- a/source4/libcli/security/sddl.c
+++ b/source4/libcli/security/sddl.c
@@ -21,9 +21,9 @@
 */
 
 #include "includes.h"
-#include "system/iconv.h"
 #include "libcli/security/security.h"
 #include "librpc/gen_ndr/ndr_misc.h"
+#include "system/locale.h"
 
 struct flag_map {
        const char *name;

diff --git a/source4/ntvfs/posix/pvfs_shortname.c b/source4/ntvfs/posix/pvfs_shortname.c
index eb797dc7aa0c3b03e15c2c7448b27bfe39fcf113..8e26db3ed5e01f8735f6f5374f66b904dfc7a577 100644 (file)
--- a/source4/ntvfs/posix/pvfs_shortname.c
+++ b/source4/ntvfs/posix/pvfs_shortname.c
@@ -21,8 +21,8 @@
 */
 
 #include "includes.h"
+#include "system/locale.h"
 #include "vfs_posix.h"
-#include "system/iconv.h"
 
 /*
   this mangling scheme uses the following format

diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index b6dec9be9de0f025491716e9c2476974754c0289..c46cf51f4b6aa3ce633404dce867813429a16cfd 100644 (file)
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -58,7 +58,7 @@
 #include "dynconfig.h"
 #include "pstring.h"
 #include "system/time.h"
-#include "system/iconv.h"
+#include "system/locale.h"
 #include "librpc/gen_ndr/svcctl.h"
 #include "librpc/gen_ndr/samr.h"
 #include "smb_server/smb_server.h"

diff --git a/source4/param/params.c b/source4/param/params.c
index 0ce416c00a0bc79060de12cec3ba38f5344fc784..1680df4e4f6546c636058667ddbfc5c26faea656 100644 (file)
--- a/source4/param/params.c
+++ b/source4/param/params.c
@@ -80,7 +80,7 @@
  */
 
 #include "includes.h"
-#include "system/iconv.h"
+#include "system/locale.h"
 
 /* -------------------------------------------------------------------------- **
  * Constants...

diff --git a/source4/param/util.c b/source4/param/util.c
index dc605191fe46212edf447a825b3b402d41c9016f..af97903277f70c15a8606c10ed817dd3af4578c4 100644 (file)
--- a/source4/param/util.c
+++ b/source4/param/util.c
@@ -25,7 +25,6 @@
 #include "includes.h"
 #include "dynconfig.h"
 #include "system/network.h"
-#include "system/iconv.h"
 #include "system/filesys.h"
 
 /**

diff --git a/source4/torture/basic/utable.c b/source4/torture/basic/utable.c
index 9e8ee6ced85369d9d271864ec8f2706cbaf55dc6..7a2b3874e01dc39a72165111bff022cec94275b1 100644 (file)
--- a/source4/torture/basic/utable.c
+++ b/source4/torture/basic/utable.c
@@ -20,8 +20,8 @@
 
 #include "includes.h"
 #include "torture/torture.h"
-#include "system/iconv.h"
 #include "system/filesys.h"
+#include "system/locale.h"
 #include "libcli/libcli.h"
 #include "torture/util.h"
 #include "pstring.h"

diff --git a/source4/torture/local/config.mk b/source4/torture/local/config.mk
index 28d231ebe5dfed905a7f9030e986f4bdd36f13fa..b98c3b351629ffac9d11a8fbbbab199ea6795695 100644 (file)
--- a/source4/torture/local/config.mk
+++ b/source4/torture/local/config.mk
@@ -21,6 +21,7 @@ PUBLIC_DEPENDENCIES = \
                RPC_NDR_ECHO \
                LIBCLI_SMB \
                MESSAGING \
+               ICONV \
                registry
 # End SUBSYSTEM TORTURE_LOCAL
 #################################

diff --git a/source4/utils/ndrdump.c b/source4/utils/ndrdump.c
index 117029b6bc575d6938a0d0c673286d91f5c3ed15..86a32e9d5b11600d30f194b76fc62b0710ac511f 100644 (file)
--- a/source4/utils/ndrdump.c
+++ b/source4/utils/ndrdump.c
@@ -20,8 +20,8 @@
 
 #include "includes.h"
 #include "lib/cmdline/popt_common.h"
-#include "system/iconv.h"
 #include "system/filesys.h"
+#include "system/locale.h"
 #include "librpc/rpc/dcerpc.h"
 #include "librpc/rpc/dcerpc_table.h"
 

diff --git a/source4/utils/nmblookup.c b/source4/utils/nmblookup.c
index 400201f08344ebc7607e15af91ee274d6aaf5ab6..b9057d493463fb13d14f515300ec5169f74fecc9 100644 (file)
--- a/source4/utils/nmblookup.c
+++ b/source4/utils/nmblookup.c
@@ -24,9 +24,9 @@
 
 #include "includes.h"
 #include "lib/cmdline/popt_common.h"
-#include "system/iconv.h"
 #include "lib/socket/socket.h"
 #include "system/network.h"
+#include "system/locale.h"
 #include "netif/netif.h"
 #include "librpc/gen_ndr/nbt.h"
 #include "libcli/nbt/libnbt.h"