change searched name from _ss_family to __ss_family

[metze/samba/wip.git] / lib / replace / wscript

diff --git a/lib/replace/wscript b/lib/replace/wscript
index b2fe5bc2deb9c0bf20ec75bbd39e00f669a9eb77..c6c4fe1fdf808b1ec6cd1549c1d83d9394383cd0 100644 (file)
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -73,8 +73,10 @@ def configure(conf):
 
     conf.CHECK_TYPES('"long long" intptr_t uintptr_t ptrdiff_t comparison_fn_t')
     conf.CHECK_TYPE('_Bool', define='HAVE__Bool')
+    conf.CHECK_TYPE('bool', define='HAVE_BOOL')
 
     conf.CHECK_TYPE('int8_t', 'char')
+    conf.CHECK_TYPE('uint8_t', 'unsigned char')
     conf.CHECK_TYPE('int16_t', 'short')
     conf.CHECK_TYPE('uint16_t', 'unsigned short')
     conf.CHECK_TYPE('int32_t', 'int')
@@ -85,11 +87,15 @@ def configure(conf):
     conf.CHECK_TYPE('ssize_t', 'int')
     conf.CHECK_TYPE('ino_t', 'unsigned')
     conf.CHECK_TYPE('loff_t', 'off_t')
-    conf.CHECK_TYPE('bool', 'off_t')
     conf.CHECK_TYPE('offset_t', 'loff_t')
     conf.CHECK_TYPE('volatile int', define='HAVE_VOLATILE')
     conf.CHECK_TYPE('uint_t', 'unsigned int')
 
+    conf.CHECK_SIZEOF('bool char int "long long" long short size_t ssize_t')
+    conf.CHECK_SIZEOF('int8_t uint8_t int16_t uint16_t int32_t uint32_t int64_t uint64_t')
+    conf.CHECK_SIZEOF('void*', define='SIZEOF_VOID_P')
+    conf.CHECK_SIZEOF('off_t dev_t ino_t time_t')
+
     conf.CHECK_TYPES('socklen_t', headers='sys/socket.h')
     conf.CHECK_TYPE_IN('struct ifaddrs', 'ifaddrs.h')
     conf.CHECK_TYPE_IN('struct addrinfo', 'netdb.h')
@@ -133,7 +139,7 @@ def configure(conf):
                        int s = socket(AF_INET6, SOCK_STREAM, 0);
                        int ret = getaddrinfo(NULL, NULL, NULL, &ai);
                        if (ret != 0) {
-                         const char *es = gai_strerror(ret);
+                           const char *es = gai_strerror(ret);
                        }
                        freeaddrinfo(ai);
                        {
@@ -204,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)
@@ -218,15 +235,11 @@ def configure(conf):
     conf.CHECK_DECLS('environ getgrent_r getpwent_r', reverse=True, headers='pwd.h grp.h')
     conf.CHECK_DECLS('pread pwrite setenv setresgid setresuid', reverse=True)
 
-    conf.CHECK_SIZEOF('char int "long long" long off_t short size_t ssize_t')
-    conf.CHECK_SIZEOF('dev_t ino_t time_t')
-    conf.CHECK_SIZEOF('void*', define='SIZEOF_VOID_P')
-
     if conf.CONFIG_SET('HAVE_EPOLL_CREATE') and conf.CONFIG_SET('HAVE_SYS_EPOLL_H'):
         conf.DEFINE('HAVE_EPOLL', 1)
 
     if not conf.CHECK_CODE('''#define LIBREPLACE_CONFIGURE_TEST_STRPTIME
-                      #include "test/strptime.c"''',
+                           #include "test/strptime.c"''',
                            define='HAVE_STRPTIME',
                            addmain=False,
                            msg='Checking for working strptime'):
@@ -270,7 +283,7 @@ def configure(conf):
     conf.SAMBA_BUILD_ENV()
 
     conf.CHECK_CODE('''
-                   typedef struct {unsigned x;} FOOBAR;
+                    typedef struct {unsigned x;} FOOBAR;
                     #define X_FOOBAR(x) ((FOOBAR) { x })
                     #define FOO_ONE X_FOOBAR(1)
                     FOOBAR f = FOO_ONE;
@@ -295,6 +308,8 @@ def configure(conf):
                                 headers='sys/stat.h')
     conf.CHECK_STRUCTURE_MEMBER('struct sockaddr_storage', 'ss_family',
                                 headers='sys/socket.h netinet/in.h')
+    conf.CHECK_STRUCTURE_MEMBER('struct sockaddr_storage', '__ss_family',
+                                headers='sys/socket.h netinet/in.h')
 
 
     if conf.CHECK_STRUCTURE_MEMBER('struct sockaddr', 'sa_len',
@@ -401,11 +416,11 @@ def build(bld):
     bld.SAMBA_LIBRARY('replace',
                       source=REPLACE_SOURCE,
                       group='base_libraries',
-                                         # FIXME: Ideally symbols should be hidden here so they 
-                                         # don't appear in the global namespace when Samba 
-                                         # libraries are loaded, but this doesn't appear to work 
-                                         # at the moment:
-                                         # hide_symbols=bld.BUILTIN_LIBRARY('replace'),
+                      # FIXME: Ideally symbols should be hidden here so they 
+                      # don't appear in the global namespace when Samba 
+                      # libraries are loaded, but this doesn't appear to work 
+                      # at the moment:
+                      # hide_symbols=bld.BUILTIN_LIBRARY('replace'),
                       private_library=True,
                       deps='crypt dl nsl socket rt')