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

source/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

source/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

source/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

source/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"

source/lib/charset/util_unistr.c

@@ -20,7 +20,7 @@
 */
 
 #include "includes.h"
-#include "system/iconv.h"
+#include "system/locale.h"
 
 /**
  * @file

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

source/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) {}

source/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"

source/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. */
 

source/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"

source/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)

source/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

source/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

source/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

source/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

source/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"
 

source/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"

source/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

source/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;

source/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

source/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"

source/param/params.c

@@ -80,7 +80,7 @@
  */
 
 #include "includes.h"
-#include "system/iconv.h"
+#include "system/locale.h"
 
 /* -------------------------------------------------------------------------- **
  * Constants...

source/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"
 
 /**

source/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"

source/torture/local/config.mk

@@ -21,6 +21,7 @@ PUBLIC_DEPENDENCIES = \
 		RPC_NDR_ECHO \
 		LIBCLI_SMB \
 		MESSAGING \
+		ICONV \
 		registry
 # End SUBSYSTEM TORTURE_LOCAL
 #################################

source/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"
 

source/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"