[SCM] Samba Shared Repository - branch master updated

[Matthieu Patou]

The branch, master has been updated
       via  bf13d76 build: add more CFLAGS for aix
       via  617871e build: add a dependency on lib iconv for lib intl if we are not able to find it
      from  097075c build: On AIX we need _XOPEN_SOURCE >= 500 for CLOCK_REALTIME

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


- Log -----------------------------------------------------------------
commit bf13d76280ea583175a712d441dcc3c8c69e698b
Author: Matthieu Patou <mat at matws.net>
Date:   Sat Dec 11 19:20:51 2010 +0300

    build: add more CFLAGS for aix
    
    Autobuild-User: Matthieu Patou <mat at samba.org>
    Autobuild-Date: Sat Dec 11 18:09:23 CET 2010 on sn-devel-104

commit 617871ee28e925171462d4821f60aa9f79fab94e
Author: Matthieu Patou <mat at matws.net>
Date:   Sat Dec 11 18:50:51 2010 +0300

    build: add a dependency on lib iconv for lib intl if we are not able to find it
    
    This is due that on some platform lib intl depend on lib iconv, failling
    to provide this library cause waf to be unable to link with lib intl and
    makes it think that the library doesn't exists !

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

Summary of changes:
 buildtools/wafsamba/wscript |    4 +++-
 lib/replace/wscript         |   13 ++++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
index 2b73f7f..d4e103e 100644
--- a/buildtools/wafsamba/wscript
+++ b/buildtools/wafsamba/wscript
@@ -301,7 +301,9 @@ def configure(conf):
         conf.env.HAVE_LD_VERSION_SCRIPT = False
 
     if sys.platform == "aix5":
-        conf.DEFINE('_XOPEN_SOURCE', 500, add_to_cflags=True)
+        conf.DEFINE('_ALL_SOURCE', 1, add_to_cflags=True)
+        # Might not be needed if ALL_SOURCE is defined
+        # conf.DEFINE('_XOPEN_SOURCE', 600, add_to_cflags=True)
 
     # we should use the PIC options in waf instead
     # Some compilo didn't support -fPIC but just print a warning
diff --git a/lib/replace/wscript b/lib/replace/wscript
index 8b59807..86a4bdb 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -210,7 +210,18 @@ def configure(conf):
     conf.CHECK_FUNCS_IN('res_search', 'resolv', checklibc=True,
                         headers='netinet/in.h arpa/nameser.h resolv.h')
 
-    conf.CHECK_FUNCS_IN('gettext', 'intl', checklibc=True, headers='libintl.h')
+
+    if not conf.CHECK_FUNCS_IN('gettext', 'intl', checklibc=True, headers='libintl.h'):
+    # Some hosts need lib iconv for linking with lib intl
+    # So we try with flags just in case it helps.
+        oldflags = conf.env['LDFLAGS_INTL']
+        conf.env['LDFLAGS_INTL'] = "-liconv"
+        if not conf.CHECK_LIB('intl'):
+            conf.env['LDFLAGS_INTL'] = oldflags
+        else:
+            conf.CHECK_FUNCS_IN('gettext', 'intl', checklibc=True, headers='libintl.h')
+
+    conf.CHECK_FUNCS_IN('dgettext gettext', 'intl', headers='libintl.h')
     conf.CHECK_FUNCS_IN('pthread_create', 'pthread', checklibc=True, headers='pthread.h')
 
     conf.CHECK_FUNCS_IN('crypt', 'crypt', checklibc=True)


-- 
Samba Shared Repository