Attachment 9569 Details for Bug 10369 – patch to build without dmapi from me

[patch] patch to build without dmapi from me

patch_fix_without_dmapi (text/plain), 3.38 KB, created by Chan Min Wai on 2014-01-10 20:53:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chan Min Wai

Created: 2014-01-10 20:53:14 UTC

Size: 3.38 KB

patch

obsolete

>index 501707b..2ff5be2 100644
>--- a/source3/wscript
>+++ b/source3/wscript
>@@ -194,27 +194,28 @@ main() {
>             Logs.warn('no suitable FAM library found')
>
>     # check for DMAPI libs
>-    Logs.info("Checking for DMAPI library existence")
>-    conf.env['dmapi_lib'] = ''
>-    samba_dmapi_lib = ''
>-    if conf.CHECK_FUNCS_IN('dm_get_eventlist', 'dm'):
>-        samba_dmapi_lib = 'dm'
>-    else:
>-        if conf.CHECK_FUNCS_IN('dm_get_eventlist', 'jfsdm'):
>-            samba_dmapi_lib = 'jfsdm'
>-        else:
>-            if conf.CHECK_FUNCS_IN('dm_get_eventlist', 'dmapi'):
>-                samba_dmapi_lib = 'dmapi'
>-            else:
>-                if conf.CHECK_FUNCS_IN('dm_get_eventlist', 'xdsm'):
>-                    samba_dmapi_lib = 'xdsm'
>-    # only bother to test headers and compilation when a candidate
>-    # library has been found
>-    if Options.options.with_dmapi == True and samba_dmapi_lib == '':
>-        conf.fatal('DMAPI support requested, but no suitable DMAPI library found')
>-    else:
>-        conf.CHECK_HEADERS('sys/dmi.h xfs/dmapi.h sys/jfsdmapi.h sys/dmapi.h dmapi.h')
>-        conf.CHECK_CODE('''
>+    if Options.options.with_dmapi != False:
>+           Logs.info("Checking for DMAPI library existence")
>+           conf.env['dmapi_lib'] = ''
>+           samba_dmapi_lib = ''
>+           if conf.CHECK_FUNCS_IN('dm_get_eventlist', 'dm'):
>+               samba_dmapi_lib = 'dm'
>+           else:
>+               if conf.CHECK_FUNCS_IN('dm_get_eventlist', 'jfsdm'):
>+                   samba_dmapi_lib = 'jfsdm'
>+               else:
>+                   if conf.CHECK_FUNCS_IN('dm_get_eventlist', 'dmapi'):
>+                       samba_dmapi_lib = 'dmapi'
>+                   else:
>+                       if conf.CHECK_FUNCS_IN('dm_get_eventlist', 'xdsm'):
>+                           samba_dmapi_lib = 'xdsm'
>+           # only bother to test headers and compilation when a candidate
>+           # library has been found
>+           if Options.options.with_dmapi == True and samba_dmapi_lib == '':
>+               conf.fatal('DMAPI support requested, but no suitable DMAPI library found')
>+           else:
>+               conf.CHECK_HEADERS('sys/dmi.h xfs/dmapi.h sys/jfsdmapi.h sys/dmapi.h dmapi.h')
>+               conf.CHECK_CODE('''
> #include <time.h>      /* needed by Tru64 */
> #include <sys/types.h> /* needed by AIX */
> #ifdef HAVE_XFS_DMAPI_H
>@@ -245,16 +246,16 @@ int main(int argc, char **argv)
> }
> ''',
>         'USE_DMAPI',
>-        addmain=False,
>-        execute=False,
>-        lib=samba_dmapi_lib,
>-        msg='Checking whether DMAPI lib '+samba_dmapi_lib+' can be used')
>-
>-        if conf.CONFIG_SET('USE_DMAPI'):
>-            conf.env['dmapi_lib'] = samba_dmapi_lib
>-        else:
>-            if Options.options.with_dmapi == True:
>-                conf.fatal('DMAPI support requested but not found');
>+               addmain=False,
>+               execute=False,
>+               lib=samba_dmapi_lib,
>+               msg='Checking whether DMAPI lib '+samba_dmapi_lib+' can be used')
>+
>+               if conf.CONFIG_SET('USE_DMAPI'):
>+                   conf.env['dmapi_lib'] = samba_dmapi_lib
>+               else:
>+                   if Options.options.with_dmapi == True:
>+                       conf.fatal('DMAPI support requested but not found');
>
>     # Check for various members of the stat structure
>     conf.CHECK_STRUCTURE_MEMBER('struct stat', 'st_blocks', define='HAVE_STAT_ST_BLOCKS',

Actions: View

Attachments on bug 10369: 9568 | 9569 | 10203 | 10204