Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 474492 | Differences between
and this patch

Collapse All | Expand All

(-)a/source3/wscript (-22 / +22 lines)
Lines 193-220 Link Here
193
        elif check_for_fam:
193
        elif check_for_fam:
194
            Logs.warn('no suitable FAM library found')
194
            Logs.warn('no suitable FAM library found')
195
195
196
    # check for DMAPI libs
196
    if Options.options.with_dmapi == True:
197
    Logs.info("Checking for DMAPI library existence")
197
        # check for DMAPI libs
198
    conf.env['dmapi_lib'] = ''
198
        Logs.info("Checking for DMAPI library existence")
199
    samba_dmapi_lib = ''
199
        conf.env['dmapi_lib'] = ''
200
    if conf.CHECK_FUNCS_IN('dm_get_eventlist', 'dm'):
200
        samba_dmapi_lib = ''
201
        samba_dmapi_lib = 'dm'
201
        if conf.CHECK_FUNCS_IN('dm_get_eventlist', 'dm'):
202
    else:
202
            samba_dmapi_lib = 'dm'
203
        if conf.CHECK_FUNCS_IN('dm_get_eventlist', 'jfsdm'):
204
            samba_dmapi_lib = 'jfsdm'
205
        else:
203
        else:
206
            if conf.CHECK_FUNCS_IN('dm_get_eventlist', 'dmapi'):
204
            if conf.CHECK_FUNCS_IN('dm_get_eventlist', 'jfsdm'):
207
                samba_dmapi_lib = 'dmapi'
205
                samba_dmapi_lib = 'jfsdm'
208
            else:
206
            else:
209
                if conf.CHECK_FUNCS_IN('dm_get_eventlist', 'xdsm'):
207
                if conf.CHECK_FUNCS_IN('dm_get_eventlist', 'dmapi'):
210
                    samba_dmapi_lib = 'xdsm'
208
                    samba_dmapi_lib = 'dmapi'
211
    # only bother to test headers and compilation when a candidate
209
                else:
212
    # library has been found
210
                    if conf.CHECK_FUNCS_IN('dm_get_eventlist', 'xdsm'):
213
    if Options.options.with_dmapi == True and samba_dmapi_lib == '':
211
                        samba_dmapi_lib = 'xdsm'
214
        conf.fatal('DMAPI support requested, but no suitable DMAPI library found')
212
        # only bother to test headers and compilation when a candidate
215
    else:
213
        # library has been found
216
        conf.CHECK_HEADERS('sys/dmi.h xfs/dmapi.h sys/jfsdmapi.h sys/dmapi.h dmapi.h')
214
        if samba_dmapi_lib == '':
217
        conf.CHECK_CODE('''
215
            conf.fatal('DMAPI support requested, but no suitable DMAPI library found')
216
        else:
217
            conf.CHECK_HEADERS('sys/dmi.h xfs/dmapi.h sys/jfsdmapi.h sys/dmapi.h dmapi.h')
218
            conf.CHECK_CODE('''
218
#include <time.h>      /* needed by Tru64 */
219
#include <time.h>      /* needed by Tru64 */
219
#include <sys/types.h> /* needed by AIX */
220
#include <sys/types.h> /* needed by AIX */
220
#ifdef HAVE_XFS_DMAPI_H
221
#ifdef HAVE_XFS_DMAPI_H
Lines 253-260 Link Here
253
        if conf.CONFIG_SET('USE_DMAPI'):
254
        if conf.CONFIG_SET('USE_DMAPI'):
254
            conf.env['dmapi_lib'] = samba_dmapi_lib
255
            conf.env['dmapi_lib'] = samba_dmapi_lib
255
        else:
256
        else:
256
            if Options.options.with_dmapi == True:
257
            conf.fatal('DMAPI support requested but not found');
257
                conf.fatal('DMAPI support requested but not found');
258
258
259
    # Check for various members of the stat structure
259
    # Check for various members of the stat structure
260
    conf.CHECK_STRUCTURE_MEMBER('struct stat', 'st_blocks', define='HAVE_STAT_ST_BLOCKS',
260
    conf.CHECK_STRUCTURE_MEMBER('struct stat', 'st_blocks', define='HAVE_STAT_ST_BLOCKS',

Return to bug 474492