From f1c308e434082b1b08ea8e8b983aefd6bebe5e4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karl=20Lind=C3=A9n?= Date: Wed, 8 Apr 2015 23:44:14 +0200 Subject: [PATCH] use pkg-config to find expat and drop explicit HAVE_EXPAT and LIB_EXPAT since they are set by check_cfg --- dbus/wscript | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dbus/wscript b/dbus/wscript index 24a77729..e9849218 100644 --- a/dbus/wscript +++ b/dbus/wscript @@ -29,11 +29,7 @@ def configure(conf): else: 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 conf.is_defined('HAVE_EXPAT'): - conf.env['LIB_EXPAT'] = ['expat'] - else: + if not conf.check_cfg(package='expat', args='--cflags --libs', mandatory=False): print(Logs.colors.RED + 'WARNING !! jackdbus will not be built because of expat is missing' + Logs.colors.NORMAL) return