[SCM] Samba Shared Repository - branch master updated

Matthieu Patou mat at samba.org
Wed Dec 8 15:20:01 MST 2010


The branch, master has been updated
       via  c4e795c build: Cope with broken libiconv
      from  461d100 dcerpc.idl: fix typo 0x800000000 => 0x80000000

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit c4e795c6bfc2d168ec5934786a4bd521a9fe12a1
Author: Matthieu Patou <mat at matws.net>
Date:   Thu Dec 9 00:17:37 2010 +0300

    build: Cope with broken libiconv
    
    library iconv needs mbrtowc but some system didn't provide it (ie.
    HP-UX 11.0)
    
    Autobuild-User: Matthieu Patou <mat at samba.org>
    Autobuild-Date: Wed Dec  8 23:19:19 CET 2010 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 lib/util/charset/wscript_configure |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/util/charset/wscript_configure b/lib/util/charset/wscript_configure
index e54bfcc..346d585 100644
--- a/lib/util/charset/wscript_configure
+++ b/lib/util/charset/wscript_configure
@@ -12,4 +12,8 @@ conf.CHECK_LIB(libs="iconv", shlib=True)
 
 if (conf.CHECK_FUNCS_IN('iconv_open', 'iconv', checklibc=False, headers='iconv.h') or
     conf.CHECK_FUNCS('iconv_open', headers='iconv.h')):
-    conf.DEFINE('HAVE_NATIVE_ICONV', 1)
+    if conf.env['HAVE_LIBICONV']:
+        if conf.CHECK_FUNCS('mbrtowc', headers='wchar.h'):
+            conf.DEFINE('HAVE_NATIVE_ICONV', 1)
+    else:
+        conf.DEFINE('HAVE_NATIVE_ICONV', 1)


-- 
Samba Shared Repository


More information about the samba-cvs mailing list