From d98679caad3895bbce7c1fa58b4de4f775b38a16 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fr=C3=A9d=C3=A9ric-Emmanuel=20PICCA?= Date: Fri, 17 Apr 2009 10:02:58 +0200 Subject: [PATCH] * add the LIBPATH_TANGO and CPPPATH_TANGO environment variable to use it do it like this. LIBPATH_TANGO='-L/usr/lib' CPPPATH_TANGO='-I/usr/include' ./waf configure then to build ./waf --- wscript | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/wscript b/wscript index 67d51b4..ed13e51 100644 --- a/wscript +++ b/wscript @@ -18,6 +18,8 @@ def set_options(opt): def configure(conf): conf.check_tool('compiler_cxx') + conf.add_os_flags('LIBPATH_TANGO') + conf.add_os_flags('CPPPATH_TANGO') if Options.options.soleil: conf.env['LIB_HKL'] = ['hkl', 'GSL', 'GSLcblas'] #conf.env['LIBPATH_HKL'] = '${SOLEIL_ROOT}/sw-support/HKL/lib' @@ -36,7 +38,12 @@ def configure(conf): else: conf.check_cfg(atleast_pkgconfig_version='0.0.0') conf.check_cfg(package='hkl', args='--cflags --libs') - conf.check_cfg(package='tango', args='--cflags --libs') + + #tango < 7.0.0 do not have a pkgconfig file + if conf.env['LIBPATH_TANGO'] or conf.env['CPPPATH_TANGO']: + conf.env['LIB_TANGO'] = ['log4tango', 'tango'] + else: + conf.check_cfg(package='tango', args='--cflags --libs') def build(bld): bld.add_subdirs('src') -- 2.11.4.GIT