use pkg-config to find expat and drop explicit HAVE_EXPAT and LIB_EXPAT since they are set by check_cfg
This commit is contained in:
parent
ca66dd1c90
commit
f1c308e434
|
@ -29,11 +29,7 @@ def configure(conf):
|
||||||
else:
|
else:
|
||||||
conf.env['DBUS_SERVICES_DIR'] = os.path.normpath(conf.env['PREFIX'] + '/share/dbus-1/services')
|
conf.env['DBUS_SERVICES_DIR'] = os.path.normpath(conf.env['PREFIX'] + '/share/dbus-1/services')
|
||||||
|
|
||||||
conf.check(header_name='expat.h', define_name="HAVE_EXPAT", mandatory=False)
|
if not conf.check_cfg(package='expat', args='--cflags --libs', mandatory=False):
|
||||||
|
|
||||||
if conf.is_defined('HAVE_EXPAT'):
|
|
||||||
conf.env['LIB_EXPAT'] = ['expat']
|
|
||||||
else:
|
|
||||||
print(Logs.colors.RED + 'WARNING !! jackdbus will not be built because of expat is missing' + Logs.colors.NORMAL)
|
print(Logs.colors.RED + 'WARNING !! jackdbus will not be built because of expat is missing' + Logs.colors.NORMAL)
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue